From 5ffdbe0a5ebcb3437356f60102b8e622cc608294 Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Thu, 17 Nov 2016 00:39:43 +0900
Subject: [PATCH] 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)
---
 lisp/battery.el            |  2 +-
 lisp/comint.el             |  2 +-
 lisp/dired.el              |  2 +-
 lisp/emacs-lisp/edebug.el  |  2 +-
 lisp/faces.el              |  6 +++---
 lisp/files.el              |  4 ++--
 lisp/gnus/gnus-art.el      |  4 ++--
 lisp/gnus/message.el       |  2 +-
 lisp/ibuf-ext.el           |  4 ++--
 lisp/ibuffer.el            |  6 +++---
 lisp/image.el              |  2 +-
 lisp/mouse.el              |  2 +-
 lisp/net/net-utils.el      | 10 +++++-----
 lisp/net/shr.el            |  2 +-
 lisp/net/sieve-manage.el   |  2 +-
 lisp/progmodes/grep.el     |  2 +-
 lisp/simple.el             |  4 ++--
 lisp/textmodes/flyspell.el |  2 +-
 lisp/url/url-vars.el       |  2 +-
 lisp/vc/add-log.el         |  2 +-
 lisp/vc/vc-hg.el           |  6 +++---
 lisp/wdired.el             |  2 +-
 lisp/window.el             |  2 +-
 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 @@
 (defcustom battery-linux-sysfs-regexp "[bB][aA][tT][0-9]?$"
   "Regexp for folder names to be searched under
   /sys/class/power_supply/ that contain battery information."
-  :version "25.2"
+  :version "26.1"
   :type 'regexp
   :group 'battery)
 
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."
    "\\(?: for .+\\)?[:：៖]\\s *\\'")
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
-  :version "25.2"
+  :version "26.1"
   :type 'regexp
   :group 'comint)
 
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."
  them: the search is performed on the temporary buffer, the original
  buffer visiting the file is not modified."
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :group 'dired)
 
 ;; 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."
   "Whether or not to pause for `edebug-sit-for-seconds' on reaching a break."
   :type 'boolean
   :group 'edebug
-  :version "25.2")
+  :version "26.1")
 
 ;;; Form spec utilities.
 
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."
     (t :foreground "brown"))
   "Face for lookalike characters."
   :group 'basic-faces
-  :version "25.2")
+  :version "26.1")
 
 (defface nobreak-space
   '((((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."
     (t :foreground "brown"))
   "Face for displaying nobreak hyphens."
   :group 'basic-faces
-  :version "25.2")
+  :version "26.1")
 
 (defgroup mode-line-faces nil
   "Faces used in the mode line."
@@ -2759,7 +2759,7 @@ It is used for characters of no fonts too."
         :weight bold)))
   "Face for the symbol name in `read-multiple-choice' output."
   :group 'basic-faces
-  :version "25.2")
+  :version "26.1")
 
 ;; Faces for TTY menus.
 (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:
     "^\\(?:/\\(?:afs/\\|m\\(?:edia/\\|nt\\)\\|\\(?:ne\\|tmp_mn\\)t/\\)\\)")
   "File systems which ought to be mounted."
   :group 'files
-  :version "25.2"
+  :version "26.1"
   :require 'regexp-opt
   :type 'regexp)
 
@@ -6756,7 +6756,7 @@ If any of these functions returns nil, killing Emacs is canceled.
 `save-buffers-kill-emacs' calls these functions, but `kill-emacs',
 the low level primitive, does not.  See also `kill-emacs-hook'."
   :type 'hook
-  :version "25.2"
+  :version "26.1"
   :group 'convenience)
 
 (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."
 
 (defcustom gnus-use-idna t
   "Whether IDNA decoding of headers is used when viewing messages."
-  :version "25.2"
+  :version "26.1"
   :group 'gnus-article-headers
   :type 'boolean)
 
@@ -7368,7 +7368,7 @@ groups."
 
 (defcustom gnus-button-valid-fqdn-regexp "\\([-A-Za-z0-9]+\\.\\)+[A-Za-z]+"
   "Regular expression that matches a valid FQDN."
-  :version "25.2"
+  :version "26.1"
   :group 'gnus-article-buttons
   :type 'regexp)
 
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."
 
 (defcustom message-use-idna t
   "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
-  :version "25.2"
+  :version "26.1"
   :group 'message-headers
   :link '(custom-manual "(message)IDNA")
   :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."
       (push (format "%s%s%s" beg str end) excluded)))
   "A list of regexps for buffers ignored by `ibuffer-mark-by-content-regexp'.
 Buffers whose name matches a regexp in this list, are not searched."
-  :version "25.2"
+  :version "26.1"
   :type '(repeat regexp)
   :require 'ibuf-ext
   :group 'ibuffer)
@@ -106,7 +106,7 @@ Buffers whose name matches a regexp in this list, are not searched."
 (defcustom ibuffer-never-search-content-mode '(dired-mode)
   "A list of major modes ignored by `ibuffer-mark-by-content-regexp'.
 Buffers whose major mode is in this list, are not searched."
-  :version "25.2"
+  :version "26.1"
   :type '(repeat regexp)
   :require 'ibuf-ext
   :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
 
 Using \\[ibuffer-switch-format], you can rotate the display between
 the specified formats in the list."
-  :version "25.2"
+  :version "26.1"
   :type '(repeat sexp)
   :group 'ibuffer)
 
@@ -285,7 +285,7 @@ Note that this specialized filtering occurs before real filtering."
 
 (defcustom ibuffer-locked-char ?L
   "The character to display for locked buffers."
-  :version "25.2"
+  :version "26.1"
   :type 'character
   :group 'ibuffer)
 
@@ -1773,7 +1773,7 @@ If point is on a group name, this function operates on that group."
   '((((background dark)) (:foreground "RosyBrown"))
     (t (:foreground "brown4")))
   "*Face used for locked buffers in Ibuffer."
-  :version "25.2"
+  :version "26.1"
   :group 'ibuffer
   :group 'font-lock-highlighting-faces)
 (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
 based on the font pixel size."
   :type '(choice number
                  (const :tag "Automatically compute" auto))
-  :version "25.2")
+  :version "26.1")
 
 ;; Map put into text properties on images.
 (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."
   :type '(choice (const :tag "Don't move point" nil)
 		 (const :tag "Move point to beginning of region" t))
   :group 'mouse
-  :version "25.2")
+  :version "26.1")
 
 (defun mouse-set-point (event &optional promote-to-region)
   "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."
   "Program to print wireless network configuration information."
   :group 'net-utils
   :type 'string
-  :version "25.2")
+  :version "26.1")
 
 (defcustom iwconfig-program-options
   (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."
  "Options for the iwconfig program."
  :group 'net-utils
  :type '(repeat string)
- :version "25.2")
+ :version "26.1")
 
 (defcustom netstat-program
   (cond ((executable-find "netstat") "netstat")
@@ -136,7 +136,7 @@ These options can be used to limit how many ICMP packets are emitted."
   "Program to print network statistics."
   :group 'net-utils
   :type  'string
-  :version "25.2")
+  :version "26.1")
 
 (defcustom netstat-program-options
   (list "-a")
@@ -165,7 +165,7 @@ These options can be used to limit how many ICMP packets are emitted."
   "Program to print routing tables."
   :group 'net-utils
   :type  'string
-  :version "25.2")
+  :version "26.1")
 
 (defcustom route-program-options
   (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."
   "Options for the route program."
   :group 'net-utils
   :type  '(repeat string)
-  :version "25.2")
+  :version "26.1")
 
 (defcustom nslookup-program "nslookup"
   "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."
 
 (defcustom shr-use-colors t
   "If non-nil, respect color specifications in the HTML."
-  :version "25.2"
+  :version "26.1"
   :group 'shr
   :type 'boolean)
 
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."
 
 (defcustom sieve-manage-ignore-starttls nil
   "Ignore STARTTLS even if STARTTLS capability is provided."
-  :version "25.2"
+  :version "26.1"
   :type 'boolean
   :group 'sieve-manage)
 
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
   (lambda ()
     (string-prefix-p my-grep-root (file-truename (buffer-file-name))))
 to limit saving to files located under `my-grep-root'."
-  :version "25.2"
+  :version "26.1"
   :type '(choice
           (const :tag "Ask before saving" ask)
           (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."
           (const :tag "Set point to end of last output" end-last-out)
           (const :tag "Save point" save-point))
   :group 'shell
-  :version "25.2")
+  :version "26.1")
 
 (defvar shell-command-saved-pos nil
   "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."
   "If non-nil, show a shorter M-x invocation when there is one."
   :group 'keyboard
   :type 'boolean
-  :version "25.2")
+  :version "26.1")
 
 (defun execute-extended-command--shorter-1 (name length)
   (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
 function takes three parameters -- the two correction candidates
 to be sorted, and the third parameter is the word that's being
 corrected."
-  :version "25.2"
+  :version "26.1"
   :type 'function
   :group 'flyspell)
 
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:
     (const :tag "No User-Agent at all" :value nil)
     (const :tag "An string auto-generated according to `url-privacy-level'"
            :value default))
-  :version "25.2"
+  :version "26.1"
   :group 'url)
 
 (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."
   "List of files that cause `find-change-log' to stop in containing directory.
 This applies if no pre-existing ChangeLog is found.  If nil, then in such
 a case simply use the directory containing the changed file."
-  :version "25.2"
+  :version "26.1"
   :type '(repeat file)
   :group 'change-log)
 
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'."
                   (const :tag "Active bookmark" 'bookmark)
                   (string :tag "Hg template")
                   (function :tag "Custom")))
-  :version "25.2"
+  :version "26.1"
   :group 'vc-hg)
 
 (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
 working copy.  `nil' is the much faster setting for
 large repositories."
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :group 'vc-hg)
 
 (defun vc-hg--active-bookmark-internal (rev)
@@ -574,7 +574,7 @@ directly instead of always running Mercurial.  We try to be safe
 against Mercurial data structure format changes and always fall
 back to running Mercurial directly."
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :group 'vc-hg)
 
 (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
 nonexistent directory, wdired will create any parent directories
 necessary.  When nil, attempts to rename a file into a
 nonexistent directory will fail."
-  :version "25.2"
+  :version "26.1"
   :type 'boolean
   :group 'wdired)
 
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
 	  (const :tag "If already displayed elsewhere" already-displayed)
 	  (const :tag "Always" t))
   :group 'windows
-  :version "25.2")
+  :version "26.1")
 
 (defcustom switch-to-buffer-in-dedicated-window nil
   "Allow switching to buffer in strongly dedicated windows.
-- 
2.11.4.GIT