aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorTino Calancha2016-11-17 00:39:43 +0900
committerTino Calancha2016-11-17 00:39:43 +0900
commit5ffdbe0a5ebcb3437356f60102b8e622cc608294 (patch)
treeb2884cdac50dcaa6d7193d9f9997b8f142ac8e61 /lisp
parent36b99556dea23f17d5598bbed366e7201eec9fbb (diff)
downloademacs-5ffdbe0a5ebcb3437356f60102b8e622cc608294.tar.gz
emacs-5ffdbe0a5ebcb3437356f60102b8e622cc608294.zip
Update parameter :version to 26.1 in several defcustom
Following defcustom where added or modified for 25.2 release. In fact all these changes belong to 26.1 release. * lisp/battery.el (battery-linux-sysfs-regexp) * lisp/comint.el (comint-password-prompt-regexp) * lisp/dired.el (dired-always-read-filesystem) * lisp/image.el (image-scaling-factor) * lisp/ibuf-ext.el (ibuffer-never-search-content-name) (ibuffer-never-search-content-mode) * lisp/mouse.el (mouse-select-region-move-to-beginning) * lisp/net/net-utils.el (iwconfig-program, iwconfig-program-options) (netstat-program, route-program, route-program-options) * lisp/net/sieve-manage.el (sieve-manage-default-stream) * lisp/progmodes/grep.el (grep-save-buffers) * lisp/vc/add-log.el (change-log-directory-files) * lisp/url/url-vars.el (url-user-agent) * lisp/vc/vc-hg.el (vc-hg-symbolic-revision-styles) (vc-hg-use-file-version-for-mode-line-version) (vc-hg-parse-hg-data-structures) * lisp/wdired.el (wdired-create-parent-directories) * lisp/faces.el (homoglyph, nobreak-hyphen, read-multiple-choice-face) * lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol) (gnus-button-url-regexp) * lisp/window.el (switch-to-buffer-preserve-window-point) * lisp/ibuffer.el (ibuffer-formats, ibuffer-locked-char) (ibuffer-locked-buffer) * lisp/textmodes/flyspell.el (flyspell-sort-corrections-function) * lisp/emacs-lisp/edebug.el (edebug-sit-on-break) * lisp/gnus/message.el (message-user-fqdn) * lisp/simple.el (shell-command-dont-erase-buffer) (extended-command-suggest-shorter) * lisp/net/shr.el (shr-use-fonts) * lisp/files.el (mounted-file-systems, kill-emacs-query-functions)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/battery.el2
-rw-r--r--lisp/comint.el2
-rw-r--r--lisp/dired.el2
-rw-r--r--lisp/emacs-lisp/edebug.el2
-rw-r--r--lisp/faces.el6
-rw-r--r--lisp/files.el4
-rw-r--r--lisp/gnus/gnus-art.el4
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/ibuf-ext.el4
-rw-r--r--lisp/ibuffer.el6
-rw-r--r--lisp/image.el2
-rw-r--r--lisp/mouse.el2
-rw-r--r--lisp/net/net-utils.el10
-rw-r--r--lisp/net/shr.el2
-rw-r--r--lisp/net/sieve-manage.el2
-rw-r--r--lisp/progmodes/grep.el2
-rw-r--r--lisp/simple.el4
-rw-r--r--lisp/textmodes/flyspell.el2
-rw-r--r--lisp/url/url-vars.el2
-rw-r--r--lisp/vc/add-log.el2
-rw-r--r--lisp/vc/vc-hg.el6
-rw-r--r--lisp/wdired.el2
-rw-r--r--lisp/window.el2
23 files changed, 37 insertions, 37 deletions
diff --git a/lisp/battery.el b/lisp/battery.el
index e6e79b06bab..10a34034019 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -41,7 +41,7 @@
41(defcustom battery-linux-sysfs-regexp "[bB][aA][tT][0-9]?$" 41(defcustom battery-linux-sysfs-regexp "[bB][aA][tT][0-9]?$"
42 "Regexp for folder names to be searched under 42 "Regexp for folder names to be searched under
43 /sys/class/power_supply/ that contain battery information." 43 /sys/class/power_supply/ that contain battery information."
44 :version "25.2" 44 :version "26.1"
45 :type 'regexp 45 :type 'regexp
46 :group 'battery) 46 :group 'battery)
47 47
diff --git a/lisp/comint.el b/lisp/comint.el
index 0319eeb80c7..919265fc332 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -354,7 +354,7 @@ This variable is buffer-local."
354 "\\(?: for .+\\)?[::៖]\\s *\\'") 354 "\\(?: for .+\\)?[::៖]\\s *\\'")
355 "Regexp matching prompts for passwords in the inferior process. 355 "Regexp matching prompts for passwords in the inferior process.
356This is used by `comint-watch-for-password-prompt'." 356This is used by `comint-watch-for-password-prompt'."
357 :version "25.2" 357 :version "26.1"
358 :type 'regexp 358 :type 'regexp
359 :group 'comint) 359 :group 'comint)
360 360
diff --git a/lisp/dired.el b/lisp/dired.el
index 7ead0876fc8..daa6d776a99 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -264,7 +264,7 @@ new Dired buffers."
264 them: the search is performed on the temporary buffer, the original 264 them: the search is performed on the temporary buffer, the original
265 buffer visiting the file is not modified." 265 buffer visiting the file is not modified."
266 :type 'boolean 266 :type 'boolean
267 :version "25.2" 267 :version "26.1"
268 :group 'dired) 268 :group 'dired)
269 269
270;; Internal variables 270;; Internal variables
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index db78d9475fe..66117b83316 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -237,7 +237,7 @@ If the result is non-nil, then break. Errors are ignored."
237 "Whether or not to pause for `edebug-sit-for-seconds' on reaching a break." 237 "Whether or not to pause for `edebug-sit-for-seconds' on reaching a break."
238 :type 'boolean 238 :type 'boolean
239 :group 'edebug 239 :group 'edebug
240 :version "25.2") 240 :version "26.1")
241 241
242;;; Form spec utilities. 242;;; Form spec utilities.
243 243
diff --git a/lisp/faces.el b/lisp/faces.el
index d6ec98b9782..6e3b08cb02b 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2476,7 +2476,7 @@ If you set `term-file-prefix' to nil, this function does nothing."
2476 (t :foreground "brown")) 2476 (t :foreground "brown"))
2477 "Face for lookalike characters." 2477 "Face for lookalike characters."
2478 :group 'basic-faces 2478 :group 'basic-faces
2479 :version "25.2") 2479 :version "26.1")
2480 2480
2481(defface nobreak-space 2481(defface nobreak-space
2482 '((((class color) (min-colors 88)) :inherit escape-glyph :underline t) 2482 '((((class color) (min-colors 88)) :inherit escape-glyph :underline t)
@@ -2492,7 +2492,7 @@ If you set `term-file-prefix' to nil, this function does nothing."
2492 (t :foreground "brown")) 2492 (t :foreground "brown"))
2493 "Face for displaying nobreak hyphens." 2493 "Face for displaying nobreak hyphens."
2494 :group 'basic-faces 2494 :group 'basic-faces
2495 :version "25.2") 2495 :version "26.1")
2496 2496
2497(defgroup mode-line-faces nil 2497(defgroup mode-line-faces nil
2498 "Faces used in the mode line." 2498 "Faces used in the mode line."
@@ -2759,7 +2759,7 @@ It is used for characters of no fonts too."
2759 :weight bold))) 2759 :weight bold)))
2760 "Face for the symbol name in `read-multiple-choice' output." 2760 "Face for the symbol name in `read-multiple-choice' output."
2761 :group 'basic-faces 2761 :group 'basic-faces
2762 :version "25.2") 2762 :version "26.1")
2763 2763
2764;; Faces for TTY menus. 2764;; Faces for TTY menus.
2765(defface tty-menu-enabled-face 2765(defface tty-menu-enabled-face
diff --git a/lisp/files.el b/lisp/files.el
index 7cfb20d46c6..c50e6aa4146 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1321,7 +1321,7 @@ Optional second argument FLAVOR controls the units and the display format:
1321 "^\\(?:/\\(?:afs/\\|m\\(?:edia/\\|nt\\)\\|\\(?:ne\\|tmp_mn\\)t/\\)\\)") 1321 "^\\(?:/\\(?:afs/\\|m\\(?:edia/\\|nt\\)\\|\\(?:ne\\|tmp_mn\\)t/\\)\\)")
1322 "File systems which ought to be mounted." 1322 "File systems which ought to be mounted."
1323 :group 'files 1323 :group 'files
1324 :version "25.2" 1324 :version "26.1"
1325 :require 'regexp-opt 1325 :require 'regexp-opt
1326 :type 'regexp) 1326 :type 'regexp)
1327 1327
@@ -6756,7 +6756,7 @@ If any of these functions returns nil, killing Emacs is canceled.
6756`save-buffers-kill-emacs' calls these functions, but `kill-emacs', 6756`save-buffers-kill-emacs' calls these functions, but `kill-emacs',
6757the low level primitive, does not. See also `kill-emacs-hook'." 6757the low level primitive, does not. See also `kill-emacs-hook'."
6758 :type 'hook 6758 :type 'hook
6759 :version "25.2" 6759 :version "26.1"
6760 :group 'convenience) 6760 :group 'convenience)
6761 6761
6762(defcustom confirm-kill-emacs nil 6762(defcustom confirm-kill-emacs nil
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 738adb553ed..0080b419f52 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1612,7 +1612,7 @@ It is a string, such as \"PGP\". If nil, ask user."
1612 1612
1613(defcustom gnus-use-idna t 1613(defcustom gnus-use-idna t
1614 "Whether IDNA decoding of headers is used when viewing messages." 1614 "Whether IDNA decoding of headers is used when viewing messages."
1615 :version "25.2" 1615 :version "26.1"
1616 :group 'gnus-article-headers 1616 :group 'gnus-article-headers
1617 :type 'boolean) 1617 :type 'boolean)
1618 1618
@@ -7368,7 +7368,7 @@ groups."
7368 7368
7369(defcustom gnus-button-valid-fqdn-regexp "\\([-A-Za-z0-9]+\\.\\)+[A-Za-z]+" 7369(defcustom gnus-button-valid-fqdn-regexp "\\([-A-Za-z0-9]+\\.\\)+[A-Za-z]+"
7370 "Regular expression that matches a valid FQDN." 7370 "Regular expression that matches a valid FQDN."
7371 :version "25.2" 7371 :version "26.1"
7372 :group 'gnus-article-buttons 7372 :group 'gnus-article-buttons
7373 :type 'regexp) 7373 :type 'regexp)
7374 7374
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index bdf1b156914..52eaff3b962 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1764,7 +1764,7 @@ no, only reply back to the author."
1764 1764
1765(defcustom message-use-idna t 1765(defcustom message-use-idna t
1766 "Whether to encode non-ASCII in domain names into ASCII according to IDNA." 1766 "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
1767 :version "25.2" 1767 :version "26.1"
1768 :group 'message-headers 1768 :group 'message-headers
1769 :link '(custom-manual "(message)IDNA") 1769 :link '(custom-manual "(message)IDNA")
1770 :type '(choice (const :tag "Ask" ask) 1770 :type '(choice (const :tag "Ask" ask)
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 1918ce8c5b6..b3d14522cbd 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -98,7 +98,7 @@ regardless of any active filters in this buffer."
98 (push (format "%s%s%s" beg str end) excluded))) 98 (push (format "%s%s%s" beg str end) excluded)))
99 "A list of regexps for buffers ignored by `ibuffer-mark-by-content-regexp'. 99 "A list of regexps for buffers ignored by `ibuffer-mark-by-content-regexp'.
100Buffers whose name matches a regexp in this list, are not searched." 100Buffers whose name matches a regexp in this list, are not searched."
101 :version "25.2" 101 :version "26.1"
102 :type '(repeat regexp) 102 :type '(repeat regexp)
103 :require 'ibuf-ext 103 :require 'ibuf-ext
104 :group 'ibuffer) 104 :group 'ibuffer)
@@ -106,7 +106,7 @@ Buffers whose name matches a regexp in this list, are not searched."
106(defcustom ibuffer-never-search-content-mode '(dired-mode) 106(defcustom ibuffer-never-search-content-mode '(dired-mode)
107 "A list of major modes ignored by `ibuffer-mark-by-content-regexp'. 107 "A list of major modes ignored by `ibuffer-mark-by-content-regexp'.
108Buffers whose major mode is in this list, are not searched." 108Buffers whose major mode is in this list, are not searched."
109 :version "25.2" 109 :version "26.1"
110 :type '(repeat regexp) 110 :type '(repeat regexp)
111 :require 'ibuf-ext 111 :require 'ibuf-ext
112 :group 'ibuffer) 112 :group 'ibuffer)
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 9becfc9fc78..b33c2e39014 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -138,7 +138,7 @@ value for this variable would be
138 138
139Using \\[ibuffer-switch-format], you can rotate the display between 139Using \\[ibuffer-switch-format], you can rotate the display between
140the specified formats in the list." 140the specified formats in the list."
141 :version "25.2" 141 :version "26.1"
142 :type '(repeat sexp) 142 :type '(repeat sexp)
143 :group 'ibuffer) 143 :group 'ibuffer)
144 144
@@ -285,7 +285,7 @@ Note that this specialized filtering occurs before real filtering."
285 285
286(defcustom ibuffer-locked-char ?L 286(defcustom ibuffer-locked-char ?L
287 "The character to display for locked buffers." 287 "The character to display for locked buffers."
288 :version "25.2" 288 :version "26.1"
289 :type 'character 289 :type 'character
290 :group 'ibuffer) 290 :group 'ibuffer)
291 291
@@ -1773,7 +1773,7 @@ If point is on a group name, this function operates on that group."
1773 '((((background dark)) (:foreground "RosyBrown")) 1773 '((((background dark)) (:foreground "RosyBrown"))
1774 (t (:foreground "brown4"))) 1774 (t (:foreground "brown4")))
1775 "*Face used for locked buffers in Ibuffer." 1775 "*Face used for locked buffers in Ibuffer."
1776 :version "25.2" 1776 :version "26.1"
1777 :group 'ibuffer 1777 :group 'ibuffer
1778 :group 'font-lock-highlighting-faces) 1778 :group 'font-lock-highlighting-faces)
1779(defvar ibuffer-locked-buffer 'ibuffer-locked-buffer) 1779(defvar ibuffer-locked-buffer 'ibuffer-locked-buffer)
diff --git a/lisp/image.el b/lisp/image.el
index e1f52de8be5..82e01624889 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -135,7 +135,7 @@ size), or the symbol `auto', which will compute a scaling factor
135based on the font pixel size." 135based on the font pixel size."
136 :type '(choice number 136 :type '(choice number
137 (const :tag "Automatically compute" auto)) 137 (const :tag "Automatically compute" auto))
138 :version "25.2") 138 :version "26.1")
139 139
140;; Map put into text properties on images. 140;; Map put into text properties on images.
141(defvar image-map 141(defvar image-map
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8c83f5e8f97..db9f13b2e6c 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -551,7 +551,7 @@ non-nil means move point to beginning of region."
551 :type '(choice (const :tag "Don't move point" nil) 551 :type '(choice (const :tag "Don't move point" nil)
552 (const :tag "Move point to beginning of region" t)) 552 (const :tag "Move point to beginning of region" t))
553 :group 'mouse 553 :group 'mouse
554 :version "25.2") 554 :version "26.1")
555 555
556(defun mouse-set-point (event &optional promote-to-region) 556(defun mouse-set-point (event &optional promote-to-region)
557 "Move point to the position clicked on with the mouse. 557 "Move point to the position clicked on with the mouse.
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 1547f5247aa..73d6ff4d61c 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -119,7 +119,7 @@ These options can be used to limit how many ICMP packets are emitted."
119 "Program to print wireless network configuration information." 119 "Program to print wireless network configuration information."
120 :group 'net-utils 120 :group 'net-utils
121 :type 'string 121 :type 'string
122 :version "25.2") 122 :version "26.1")
123 123
124(defcustom iwconfig-program-options 124(defcustom iwconfig-program-options
125 (cond ((string-match-p "iw\\'" iwconfig-program) (list "dev")) 125 (cond ((string-match-p "iw\\'" iwconfig-program) (list "dev"))
@@ -127,7 +127,7 @@ These options can be used to limit how many ICMP packets are emitted."
127 "Options for the iwconfig program." 127 "Options for the iwconfig program."
128 :group 'net-utils 128 :group 'net-utils
129 :type '(repeat string) 129 :type '(repeat string)
130 :version "25.2") 130 :version "26.1")
131 131
132(defcustom netstat-program 132(defcustom netstat-program
133 (cond ((executable-find "netstat") "netstat") 133 (cond ((executable-find "netstat") "netstat")
@@ -136,7 +136,7 @@ These options can be used to limit how many ICMP packets are emitted."
136 "Program to print network statistics." 136 "Program to print network statistics."
137 :group 'net-utils 137 :group 'net-utils
138 :type 'string 138 :type 'string
139 :version "25.2") 139 :version "26.1")
140 140
141(defcustom netstat-program-options 141(defcustom netstat-program-options
142 (list "-a") 142 (list "-a")
@@ -165,7 +165,7 @@ These options can be used to limit how many ICMP packets are emitted."
165 "Program to print routing tables." 165 "Program to print routing tables."
166 :group 'net-utils 166 :group 'net-utils
167 :type 'string 167 :type 'string
168 :version "25.2") 168 :version "26.1")
169 169
170(defcustom route-program-options 170(defcustom route-program-options
171 (cond ((eq system-type 'windows-nt) (list "print")) 171 (cond ((eq system-type 'windows-nt) (list "print"))
@@ -174,7 +174,7 @@ These options can be used to limit how many ICMP packets are emitted."
174 "Options for the route program." 174 "Options for the route program."
175 :group 'net-utils 175 :group 'net-utils
176 :type '(repeat string) 176 :type '(repeat string)
177 :version "25.2") 177 :version "26.1")
178 178
179(defcustom nslookup-program "nslookup" 179(defcustom nslookup-program "nslookup"
180 "Program to interactively query DNS information." 180 "Program to interactively query DNS information."
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 56603554b36..f1b0087f9be 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -68,7 +68,7 @@ fit these criteria."
68 68
69(defcustom shr-use-colors t 69(defcustom shr-use-colors t
70 "If non-nil, respect color specifications in the HTML." 70 "If non-nil, respect color specifications in the HTML."
71 :version "25.2" 71 :version "26.1"
72 :group 'shr 72 :group 'shr
73 :type 'boolean) 73 :type 'boolean)
74 74
diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el
index c8276e71d29..8f7bd449284 100644
--- a/lisp/net/sieve-manage.el
+++ b/lisp/net/sieve-manage.el
@@ -148,7 +148,7 @@ for doing the actual authentication."
148 148
149(defcustom sieve-manage-ignore-starttls nil 149(defcustom sieve-manage-ignore-starttls nil
150 "Ignore STARTTLS even if STARTTLS capability is provided." 150 "Ignore STARTTLS even if STARTTLS capability is provided."
151 :version "25.2" 151 :version "26.1"
152 :type 'boolean 152 :type 'boolean
153 :group 'sieve-manage) 153 :group 'sieve-manage)
154 154
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index f7f097b6beb..5112c6bd638 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -235,7 +235,7 @@ buffer should be saved or not. E.g., one can set this to
235 (lambda () 235 (lambda ()
236 (string-prefix-p my-grep-root (file-truename (buffer-file-name)))) 236 (string-prefix-p my-grep-root (file-truename (buffer-file-name))))
237to limit saving to files located under `my-grep-root'." 237to limit saving to files located under `my-grep-root'."
238 :version "25.2" 238 :version "26.1"
239 :type '(choice 239 :type '(choice
240 (const :tag "Ask before saving" ask) 240 (const :tag "Ask before saving" ask)
241 (const :tag "Don't save buffers" nil) 241 (const :tag "Don't save buffers" nil)
diff --git a/lisp/simple.el b/lisp/simple.el
index fe613255ab0..2506c4a59a8 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -50,7 +50,7 @@ restore the buffer position before the command."
50 (const :tag "Set point to end of last output" end-last-out) 50 (const :tag "Set point to end of last output" end-last-out)
51 (const :tag "Save point" save-point)) 51 (const :tag "Save point" save-point))
52 :group 'shell 52 :group 'shell
53 :version "25.2") 53 :version "26.1")
54 54
55(defvar shell-command-saved-pos nil 55(defvar shell-command-saved-pos nil
56 "Point position in the output buffer after command complete. 56 "Point position in the output buffer after command complete.
@@ -1659,7 +1659,7 @@ If the value is non-nil and not a number, we wait 2 seconds."
1659 "If non-nil, show a shorter M-x invocation when there is one." 1659 "If non-nil, show a shorter M-x invocation when there is one."
1660 :group 'keyboard 1660 :group 'keyboard
1661 :type 'boolean 1661 :type 'boolean
1662 :version "25.2") 1662 :version "26.1")
1663 1663
1664(defun execute-extended-command--shorter-1 (name length) 1664(defun execute-extended-command--shorter-1 (name length)
1665 (cond 1665 (cond
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 042b7d40edc..29aa2312521 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -102,7 +102,7 @@ This only happens if `flyspell-sort-corrections' is non-nil. The
102function takes three parameters -- the two correction candidates 102function takes three parameters -- the two correction candidates
103to be sorted, and the third parameter is the word that's being 103to be sorted, and the third parameter is the word that's being
104corrected." 104corrected."
105 :version "25.2" 105 :version "26.1"
106 :type 'function 106 :type 'function
107 :group 'flyspell) 107 :group 'flyspell)
108 108
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index f6aae21a838..1286d6cda98 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -373,7 +373,7 @@ Should be one of:
373 (const :tag "No User-Agent at all" :value nil) 373 (const :tag "No User-Agent at all" :value nil)
374 (const :tag "An string auto-generated according to `url-privacy-level'" 374 (const :tag "An string auto-generated according to `url-privacy-level'"
375 :value default)) 375 :value default))
376 :version "25.2" 376 :version "26.1"
377 :group 'url) 377 :group 'url)
378 378
379(defvar url-setup-done nil "Has setup configuration been done?") 379(defvar url-setup-done nil "Has setup configuration been done?")
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index b516b67b967..7124df03bc0 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -175,7 +175,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
175 "List of files that cause `find-change-log' to stop in containing directory. 175 "List of files that cause `find-change-log' to stop in containing directory.
176This applies if no pre-existing ChangeLog is found. If nil, then in such 176This applies if no pre-existing ChangeLog is found. If nil, then in such
177a case simply use the directory containing the changed file." 177a case simply use the directory containing the changed file."
178 :version "25.2" 178 :version "26.1"
179 :type '(repeat file) 179 :type '(repeat file)
180 :group 'change-log) 180 :group 'change-log)
181 181
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 78ff56c3ae3..cee01eeaf37 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -280,7 +280,7 @@ If no list entry produces a useful revision, return `nil'."
280 (const :tag "Active bookmark" 'bookmark) 280 (const :tag "Active bookmark" 'bookmark)
281 (string :tag "Hg template") 281 (string :tag "Hg template")
282 (function :tag "Custom"))) 282 (function :tag "Custom")))
283 :version "25.2" 283 :version "26.1"
284 :group 'vc-hg) 284 :group 'vc-hg)
285 285
286(defcustom vc-hg-use-file-version-for-mode-line-version nil 286(defcustom vc-hg-use-file-version-for-mode-line-version nil
@@ -289,7 +289,7 @@ When not, the revision in the modeline is for the repository
289working copy. `nil' is the much faster setting for 289working copy. `nil' is the much faster setting for
290large repositories." 290large repositories."
291 :type 'boolean 291 :type 'boolean
292 :version "25.2" 292 :version "26.1"
293 :group 'vc-hg) 293 :group 'vc-hg)
294 294
295(defun vc-hg--active-bookmark-internal (rev) 295(defun vc-hg--active-bookmark-internal (rev)
@@ -574,7 +574,7 @@ directly instead of always running Mercurial. We try to be safe
574against Mercurial data structure format changes and always fall 574against Mercurial data structure format changes and always fall
575back to running Mercurial directly." 575back to running Mercurial directly."
576 :type 'boolean 576 :type 'boolean
577 :version "25.2" 577 :version "26.1"
578 :group 'vc-hg) 578 :group 'vc-hg)
579 579
580(defsubst vc-hg--read-u8 () 580(defsubst vc-hg--read-u8 ()
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 5b23f843e0b..f059ab774a5 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -158,7 +158,7 @@ If non-nil, when you rename a file to a destination path within a
158nonexistent directory, wdired will create any parent directories 158nonexistent directory, wdired will create any parent directories
159necessary. When nil, attempts to rename a file into a 159necessary. When nil, attempts to rename a file into a
160nonexistent directory will fail." 160nonexistent directory will fail."
161 :version "25.2" 161 :version "26.1"
162 :type 'boolean 162 :type 'boolean
163 :group 'wdired) 163 :group 'wdired)
164 164
diff --git a/lisp/window.el b/lisp/window.el
index da3691e6261..5255905f457 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7519,7 +7519,7 @@ the selected window or never appeared in it before, or if
7519 (const :tag "If already displayed elsewhere" already-displayed) 7519 (const :tag "If already displayed elsewhere" already-displayed)
7520 (const :tag "Always" t)) 7520 (const :tag "Always" t))
7521 :group 'windows 7521 :group 'windows
7522 :version "25.2") 7522 :version "26.1")
7523 7523
7524(defcustom switch-to-buffer-in-dedicated-window nil 7524(defcustom switch-to-buffer-in-dedicated-window nil
7525 "Allow switching to buffer in strongly dedicated windows. 7525 "Allow switching to buffer in strongly dedicated windows.