Mercurial > vim

changeset 33729:9a846ba607bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runtime(wget): Update for Wget2 2.1.0 (#13497) Commit: https://github.com/vim/vim/commit/d56f15caf602a061f5f9f0a3c6a4537ab2dc6acc Author: dkearns <dougkearns@gmail.com> Date: Thu Nov 9 06:53:20 2023 +1100 runtime(wget): Update for Wget2 2.1.0 (https://github.com/vim/vim/issues/13497) Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Wed, 08 Nov 2023 21:00:08 +0100
parents 1370bf12e8bf
children 1a0886e98382
files runtime/ftplugin/wget.vim runtime/ftplugin/wget2.vim runtime/syntax/wget.vim runtime/syntax/wget2.vim
diffstat 4 files changed, 178 insertions(+), 180 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/ftplugin/wget.vim
+++ b/runtime/ftplugin/wget.vim
@@ -1,5 +1,5 @@
 " Vim filetype plugin file
-" Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
+" Language:	Wget configuration file (/etc/wgetrc ~/.wgetrc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2022 Apr 28
 
@@ -18,7 +18,7 @@ setlocal formatoptions-=t formatoptions+
 let b:undo_ftplugin = "setl fo< com< cms<"
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Wget Configuration File (wgetrc, .wgetrc)\twgetrc;.wgetrc\n" .
+  let b:browsefilter = "Wget Configuration File (wgetrc, .wgetrc)\twgetrc;.wgetrc\n" ..
 	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
--- a/runtime/ftplugin/wget2.vim
+++ b/runtime/ftplugin/wget2.vim
@@ -1,5 +1,5 @@
 " Vim filetype plugin file
-" Language:     Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
+" Language:	Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2022 Apr 28
 
@@ -18,7 +18,7 @@ setlocal formatoptions-=t formatoptions+
 let b:undo_ftplugin = "setl fo< com< cms<"
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Wget2 Configuration File (wget2rc, .wget2rc)\twget2rc;.wget2rc\n" .
+  let b:browsefilter = "Wget2 Configuration File (wget2rc, .wget2rc)\twget2rc;.wget2rc\n" ..
 	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
--- a/runtime/syntax/wget.vim
+++ b/runtime/syntax/wget.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
-" Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
+" Language:	Wget configuration file (/etc/wgetrc ~/.wgetrc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2022 Apr 28
+" Last Change:	2023 Nov 05
 
 " GNU Wget 1.21 built on linux-gnu.
 
@@ -12,7 +12,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match wgetComment "#.*$" contains=wgetTodo contained
+syn match wgetComment "#.*" contains=wgetTodo contained
 
 syn keyword wgetTodo TODO NOTE FIXME XXX contained
 
@@ -21,208 +21,206 @@ syn region wgetString start=+'+ skip=+\\
 
 syn case ignore
 
-syn keyword wgetBoolean on off yes no contained
-syn keyword wgetNumber	inf	      contained
-
-syn match wgetNumber "\<\d\+>"		  contained
-syn match wgetQuota  "\<\d\+[kmgt]\>"	  contained
-syn match wgetTime   "\<\d\+[smhdw]\>"	  contained
+syn keyword wgetBoolean on off yes no	 contained
+syn keyword wgetNumber	inf		 contained
+syn match   wgetNumber "\<\d\+>"	 contained
+syn match   wgetQuota  "\<\d\+[kmgt]\>"	 contained
+syn match   wgetTime   "\<\d\+[smhdw]\>" contained
 
 "{{{ Commands
 let s:commands =<< trim EOL
   accept
-  accept_regex
-  add_host_dir
-  adjust_extension
-  always_rest
-  ask_password
-  auth_no_challenge
+  accept-regex
+  add-host-dir
+  adjust-extension
+  always-rest
+  ask-password
+  auth-no-challenge
   background
-  backup_converted
+  backup-converted
   backups
   base
-  bind_address
-  bind_dns_address
-  body_data
-  body_file
-  ca_certificate
-  ca_directory
+  bind-address
+  bind-dns-address
+  body-data
+  body-file
+  ca-certificate
+  ca-directory
   cache
   certificate
-  certificate_type
-  check_certificate
-  choose_config
+  certificate-type
+  check-certificate
+  choose-config
   ciphers
   compression
-  connect_timeout
-  content_disposition
-  content_on_error
+  connect-timeout
+  content-disposition
+  content-on-error
   continue
-  convert_file_only
-  convert_links
+  convert-file-only
+  convert-links
   cookies
-  crl_file
-  cut_dirs
+  crl-file
+  cut-dirs
   debug
-  default_page
-  delete_after
-  dns_cache
-  dns_servers
-  dns_timeout
-  dir_prefix
-  dir_struct
+  default-page
+  delete-after
+  dns-cache
+  dns-servers
+  dns-timeout
+  dir-prefix
+  dir-struct
   domains
-  dot_bytes
-  dots_in_line
-  dot_spacing
-  dot_style
-  egd_file
-  exclude_directories
-  exclude_domains
-  follow_ftp
-  follow_tags
-  force_html
-  ftp_passwd
-  ftp_password
-  ftp_user
-  ftp_proxy
-  ftps_clear_data_connection
-  ftps_fallback_to_ftp
-  ftps_implicit
-  ftps_resume_ssl
+  dot-bytes
+  dots-in-line
+  dot-spacing
+  dot-style
+  egd-file
+  exclude-directories
+  exclude-domains
+  follow-ftp
+  follow-tags
+  force-html
+  ftp-passwd
+  ftp-password
+  ftp-user
+  ftp-proxy
+  ftps-clear-data-connection
+  ftps-fallback-to-ftp
+  ftps-implicit
+  ftps-resume-ssl
   hsts
-  hsts_file
-  ftp_stmlf
+  hsts-file
+  ftp-stmlf
   glob
   header
-  html_extension
+  html-extension
   htmlify
-  http_keep_alive
-  http_passwd
-  http_password
-  http_proxy
-  https_proxy
-  https_only
-  http_user
-  if_modified_since
-  ignore_case
-  ignore_length
-  ignore_tags
-  include_directories
-  inet4_only
-  inet6_only
+  http-keep-alive
+  http-passwd
+  http-password
+  http-proxy
+  https-proxy
+  https-only
+  http-user
+  if-modified-since
+  ignore-case
+  ignore-length
+  ignore-tags
+  include-directories
+  inet4-only
+  inet6-only
   input
-  input_meta_link
+  input-meta-link
   iri
-  keep_bad_hash
-  keep_session_cookies
-  kill_longer
-  limit_rate
-  load_cookies
+  keep-bad-hash
+  keep-session-cookies
+  kill-longer
+  limit-rate
+  load-cookies
   locale
-  local_encoding
+  local-encoding
   logfile
   login
-  max_redirect
-  metalink_index
-  metalink_over_http
+  max-redirect
+  metalink-index
+  metalink-over-http
   method
   mirror
   netrc
-  no_clobber
-  no_config
-  no_parent
-  no_proxy
+  no-clobber
+  no-config
+  no-parent
+  no-proxy
   numtries
-  output_document
-  page_requisites
-  passive_ftp
+  output-document
+  page-requisites
+  passive-ftp
   passwd
   password
-  pinned_pubkey
-  post_data
-  post_file
-  prefer_family
-  preferred_location
-  preserve_permissions
-  private_key
-  private_key_type
+  pinned-pubkey
+  post-data
+  post-file
+  prefer-family
+  preferred-location
+  preserve-permissions
+  private-key
+  private-key-type
   progress
-  protocol_directories
-  proxy_passwd
-  proxy_password
-  proxy_user
+  protocol-directories
+  proxy-passwd
+  proxy-password
+  proxy-user
   quiet
   quota
-  random_file
-  random_wait
-  read_timeout
-  rec_level
+  random-file
+  random-wait
+  read-timeout
+  rec-level
   recursive
   referer
-  regex_type
+  regex-type
   reject
-  rejected_log
-  reject_regex
-  relative_only
-  remote_encoding
-  remove_listing
-  report_speed
-  restrict_file_names
-  retr_symlinks
-  retry_connrefused
-  retry_on_host_error
-  retry_on_http_error
+  rejected-log
+  reject-regex
+  relative-only
+  remote-encoding
+  remove-listing
+  report-speed
+  restrict-file-names
+  retr-symlinks
+  retry-connrefused
+  retry-on-host-error
+  retry-on-http-error
   robots
-  save_cookies
-  save_headers
-  secure_protocol
-  server_response
-  show_all_dns_entries
-  show_progress
-  simple_host_check
-  span_hosts
+  save-cookies
+  save-headers
+  secure-protocol
+  server-response
+  show-all-dns-entries
+  show-progress
+  simple-host-check
+  span-hosts
   spider
-  start_pos
-  strict_comments
+  start-pos
+  strict-comments
   sslcertfile
   sslcertkey
   timeout
   timestamping
-  use_server_timestamps
+  use-server-timestamps
   tries
-  trust_server_names
+  trust-server-names
   unlink
-  use_askpass
+  use-askpass
   user
-  use_proxy
-  user_agent
+  use-proxy
+  user-agent
   verbose
   wait
-  wait_retry
-  warc_cdx
-  warc_cdx_dedup
-  warc_compression
-  warc_digests
-  warc_file
-  warc_header
-  warc_keep_log
-  warc_max_size
-  warc_temp_dir
+  wait-retry
+  warc-cdx
+  warc-cdx-dedup
+  warc-compression
+  warc-digests
+  warc-file
+  warc-header
+  warc-keep-log
+  warc-max-size
+  warc-temp-dir
   wdebug
   xattr
 EOL
 "}}}
 
-call map(s:commands, "substitute(v:val, '_', '[-_]\\\\=', 'g')")
-
 for cmd in s:commands
-  exe 'syn match wgetCommand "\<' . cmd . '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
+  exe 'syn match wgetCommand "\<' .. substitute(cmd, '-', '[-_]\\=', "g") .. '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
 endfor
+unlet s:commands
 
 syn case match
 
-syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
+syn match wgetLineStart		 "^" nextgroup=wgetCommand,wgetComment skipwhite
 syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
 
 hi def link wgetAssignmentOperator Special
--- a/runtime/syntax/wget2.vim
+++ b/runtime/syntax/wget2.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
-" Language:     Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
+" Language:	Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2022 Apr 28
+" Last Change:	2023 Nov 05
 
-" GNU Wget2 2.0.0 - multithreaded metalink/file/website downloader
+" GNU Wget2 2.1.0 - multithreaded metalink/file/website downloader
 
 if exists("b:current_syntax")
   finish
@@ -12,21 +12,20 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match wgetComment "#.*$" contains=wgetTodo contained
+syn match wget2Comment "#.*" contains=wget2Todo contained
 
-syn keyword wgetTodo TODO NOTE FIXME XXX contained
+syn keyword wget2Todo TODO NOTE FIXME XXX contained
 
-syn region wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
-syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
+syn region wget2String start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
+syn region wget2String start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
 
 syn case ignore
 
-syn keyword wgetBoolean on off yes no y n contained
-syn keyword wgetNumber	infinity inf	  contained
-
-syn match wgetNumber "\<\d\+>"		  contained
-syn match wgetQuota  "\<\d\+[kmgt]\>"	  contained
-syn match wgetTime   "\<\d\+[smhd]\>"	  contained
+syn keyword wget2Boolean on off yes no y n contained
+syn keyword wget2Number	 infinity inf	   contained
+syn match   wget2Number "\<\d\+>"	   contained
+syn match   wget2Quota	"\<\d\+[kmgt]\>"   contained
+syn match   wget2Time	"\<\d\+[smhd]\>"   contained
 
 "{{{ Commands
 let s:commands =<< trim EOL
@@ -67,6 +66,7 @@ let s:commands =<< trim EOL
   cut-dirs
   cut-file-get-vars
   cut-url-get-vars
+  dane
   debug
   default-http-port
   default-https-port
@@ -85,6 +85,7 @@ let s:commands =<< trim EOL
   execute
   filter-mime-type
   filter-urls
+  follow-sitemaps
   follow-tags
   force-atom
   force-css
@@ -221,28 +222,27 @@ let s:commands =<< trim EOL
 EOL
 "}}}
 
-call map(s:commands, "substitute(v:val, '_', '[-_]\\\\=', 'g')")
-
 for cmd in s:commands
-  exe 'syn match wgetCommand "\<' . cmd . '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
+  exe 'syn match wget2Command "\<' .. substitute(cmd, '-', '[-_]\\=', "g") .. '\>" nextgroup=wget2AssignmentOperator skipwhite contained'
 endfor
+unlet s:commands
 
 syn case match
 
-syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
-syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
+syn match wget2LineStart	  "^" nextgroup=wget2Command,wget2Comment skipwhite
+syn match wget2AssignmentOperator "=" nextgroup=wget2String,wget2Boolean,wget2Number,wget2Quota,wget2Time skipwhite contained
 
-hi def link wgetAssignmentOperator Special
-hi def link wgetBoolean		   Boolean
-hi def link wgetCommand		   Identifier
-hi def link wgetComment		   Comment
-hi def link wgetNumber		   Number
-hi def link wgetQuota		   Number
-hi def link wgetString		   String
-hi def link wgetTime		   Number
-hi def link wgetTodo		   Todo
+hi def link wget2AssignmentOperator Special
+hi def link wget2Boolean	    Boolean
+hi def link wget2Command	    Identifier
+hi def link wget2Comment	    Comment
+hi def link wget2Number		    Number
+hi def link wget2Quota		    Number
+hi def link wget2String		    String
+hi def link wget2Time		    Number
+hi def link wget2Todo		    Todo
 
-let b:current_syntax = "wget"
+let b:current_syntax = "wget2"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save