Issues marked as fixed in 25.2

Issues marked as fixed in 25.2

[Glenn Morris]

Here's a list of (archived) bugs marked as fixed in version 25.2.
Owing to the change in the Emacs version numbering plan, most of these
(except the more recent ones) probably aren't actually fixed in 25.2.
IMO it would be good if the metadata was reviewed and adjusted to 26.1
where appropriate (unarchive NNN; fixed NNN 26.1; notfixed NNN 25.2).

10
96
1149
1150
2270
2405
2589
3137
3393
4589
4920
5001
5262
5305
5314
5479
5650
5661
5727
6817
7385
7522
7751
8634
8693
8925
9342
9730
10487
10540
10723
10794
10942
10980
11357
11400
11788
12048
12377
12378
12636
12939
13187
13269
13571
13745
13949
14256
14341
14484
14554
14577
14687
14844
14854
14915
14919
15021
15047
15171
15324
15445
15506
15909
16136
16200
16276
16294
16345
16390
16406
16483
16513
16579
16746
16891
16904
17039
17067
17119
17582
17707
17716
17738
17989
17999
18008
18024
18026
18028
18089
18092
18110
18202
18203
18204
18211
18279
18527
18587
18634
18635
18686
18692
18809
18810
18829
19114
19152
19209
19214
19215
19255
19368
19424
19497
19587
19638
19722
19754
19801
19851
20038
20158
20181
20304
20408
20460
20485
20520
20654
20702
20724
20878
21002
21014
21024
21091
21155
21169
21171
21225
21231
21252
21269
21359
21427
21552
21576
21577
21601
21678
21679
21684
21706
21759
21851
21852
21853
21881
21936
21962
22117
22140
22170
22172
22227
22315
22325
22329
22348
22478
22530
22531
22576
22583
22586
22592
22594
22595
22596
22627
22632
22648
22664
22720
22724
22764
22799
22800
22814
22824
22827
22837
22841
22890
22928
22940
22964
22968
23020
23071
23116
23139
23159
23167
23262
23290
23374
23390
23401
23411
23459
23533
23608
23703
23730
23829
23850
23863
23883
23914
23949
23998
24122
24133
24166
24200
24257
24308
24315
24432

Re: Issues marked as fixed in 25.2

[John Wiegley]

>>>>> "GM" == Glenn Morris <rgm@gnu.org> writes:

GM> Here's a list of (archived) bugs marked as fixed in version 25.2. Owing to
GM> the change in the Emacs version numbering plan, most of these (except the
GM> more recent ones) probably aren't actually fixed in 25.2. IMO it would be
GM> good if the metadata was reviewed and adjusted to 26.1 where appropriate
GM> (unarchive NNN; fixed NNN 26.1; notfixed NNN 25.2).

That sounds reasonable to me; I imagine you can write a script to do the batch
modification in debbugs? Are there any gotchas we need to worry about?

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

Re: Issues marked as fixed in 25.2

[Stefan Monnier]

> That sounds reasonable to me; I imagine you can write a script to do
> the batch modification in debbugs? Are there any gotchas we need to
> worry about?

Other than the obvious one (that some of these bugs are actually really
fixed in 25.2 so they shouldn't all be changed)?


        Stefan

Re: Issues marked as fixed in 25.2

[Glenn Morris]

John Wiegley wrote:

> GM> Here's a list of (archived) bugs marked as fixed in version 25.2. Owing to
> GM> the change in the Emacs version numbering plan, most of these (except the
> GM> more recent ones) probably aren't actually fixed in 25.2. IMO it would be
> GM> good if the metadata was reviewed and adjusted to 26.1 where appropriate
> GM> (unarchive NNN; fixed NNN 26.1; notfixed NNN 25.2).
>
> That sounds reasonable to me; I imagine you can write a script to do
> the batch modification in debbugs?

If it were that simple, I would just have done it. :)

Some of these issues will actually be fixed in 25.2, some will be fixed
in the old 25.2, which is now 26.1. (It would be great if release
version numbers were predictable in advance.)

I suggest looking at the date the issue was closed and comparing it to
the date the version numbering was changed. But then you also need to
check for issues that have been backported since. And you might also
want to review every such issue to see if it _should_ be backported now.

Re: Issues marked as fixed in 25.2

[John Wiegley]

>>>>> "GM" == Glenn Morris <rgm@gnu.org> writes:

GM> I suggest looking at the date the issue was closed and comparing it to the
GM> date the version numbering was changed. But then you also need to check
GM> for issues that have been backported since. And you might also want to
GM> review every such issue to see if it _should_ be backported now.

Btw, it's exactly this sort of confusion that I wanted to avoid by using a
3-branch scheme (current release target, next minor, next major).

The 2-branch scheme we have now makes this sort of confusion a regular part of
ongoing development, because we'll always encounter the case where a fix on
'master' ends up becoming part of the next release, ahead of whichever version
master was marked as at the time the bug was fixed.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

Re: Issues marked as fixed in 25.2

[Lars Ingebrigtsen]

John Wiegley <jwiegley@gmail.com> writes:

> Btw, it's exactly this sort of confusion that I wanted to avoid by using a
> 3-branch scheme (current release target, next minor, next major).
>
> The 2-branch scheme we have now makes this sort of confusion a regular part of
> ongoing development, because we'll always encounter the case where a fix on
> 'master' ends up becoming part of the next release, ahead of whichever version
> master was marked as at the time the bug was fixed.

I don't think there was much confusion amongst most of the developers.

If you take a poll, I think you'll find that most of us assumed that
"master" would end up as 26.1, and were just wondering when somebody was
going to get around to running the numbering script.  (And prodding
gently.  Perhaps too gently.)

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: Issues marked as fixed in 25.2

[Eli Zaretskii]

> From: John Wiegley <jwiegley@gmail.com>
> Date: Mon, 14 Nov 2016 14:00:47 -0800
> Cc: emacs-devel@gnu.org
> 
> >>>>> "GM" == Glenn Morris <rgm@gnu.org> writes:
> 
> GM> I suggest looking at the date the issue was closed and comparing it to the
> GM> date the version numbering was changed. But then you also need to check
> GM> for issues that have been backported since. And you might also want to
> GM> review every such issue to see if it _should_ be backported now.
> 
> Btw, it's exactly this sort of confusion that I wanted to avoid by using a
> 3-branch scheme (current release target, next minor, next major).
> 
> The 2-branch scheme we have now makes this sort of confusion a regular part of
> ongoing development, because we'll always encounter the case where a fix on
> 'master' ends up becoming part of the next release, ahead of whichever version
> master was marked as at the time the bug was fixed.

I think the confusion will happen no matter which scheme we choose.  I
think the idea that we can know which version will come from what
branch is a fallacy, because the original intent can always be
thwarted by later decisions, based on situations no one can predict.

I understand the rationale behind trying to record in the bug where it
is solved, but I don't think that goal is achievable in practice.

RE: Issues marked as fixed in 25.2

[Herring, Davis]

> I think the idea that we can know which version will come from what
> branch is a fallacy, because the original intent can always be
> thwarted by later decisions, based on situations no one can predict.

That's why the three branches should not literally be "(current release target, next minor, next major)".  For a library equipped with an soname, the standard versioning system suggests (bug fixes, new features, incompatible changes).  The same idea can be applied to a gradually evolving editor: commits are not assigned to a supposedly certain destiny, but rather are sorted according to the probability that they might delay a release.

Then, whenever a "minimal changes" release is desired (e.g., to fix a vulnerability without breaking other things), it can be made immediately from the strictest branch.  When work on a major feature drags on, meaningful releases can be made without it by releasing from the middle branch.  (These two use cases are the reason for the number of branches being 3; the match with libraries is largely coincidental.)  When instead release day comes for the middle branch before the strict branch, you just merge the latter into the former first.

There are two refinements to make.  First, the "strictness" of a branch has two interpretations: either in terms of the user-visible behavior changes, or in terms of the (possibly destabilizing) code changes.  The former is more appropriate for the library case, because feature lists and backwards-compatibility guarantees are defined in terms of the visible behavior.  It also has the advantage of tending to reduce merge conflicts and cherrypicking, because refactoring can be done on the bugfix branch even if it is to support new features to be added elsewhere.  The latter interpretation may however be more appropriate for Emacs, where no absolute definition of compatibility exists but stability is very important.

The second refinement is just (the bikeshedding of) what to call such branches for Emacs, with a mind to making it easy for committers to categorize commits.  The schema that seems most obvious to me is (bug fixes and documentation work, well-separable features, core features) which maps well to the past "major version features" (like lexical binding and modules).  The first two are often distinguished by whether a change includes NEWS text.

Finally, you can still have feature branches, as we already do; this scheme just reduces the anxiety associated with the merge of such a branch by allowing it to remain targeted at an unspecified release.

Davis

Re: Issues marked as fixed in 25.2

[Eli Zaretskii]

> From: "Herring, Davis" <herring@lanl.gov>
> CC: "rgm@gnu.org" <rgm@gnu.org>, "emacs-devel@gnu.org" <emacs-devel@gnu.org>
> Date: Tue, 15 Nov 2016 06:25:00 +0000
>
> > I think the idea that we can know which version will come from what
> > branch is a fallacy, because the original intent can always be
> > thwarted by later decisions, based on situations no one can predict.
> 
> That's why the three branches should not literally be "(current release target, 
> next minor, next major)".  For a library equipped with an soname, the standard 
> versioning system suggests (bug fixes, new features, incompatible changes).  
> The same idea can be applied to a gradually evolving editor: commits are not 
> assigned to a supposedly certain destiny, but rather are sorted according to 
> the probability that they might delay a release.
> 
> Then, whenever a "minimal changes" release is desired (e.g., to fix a 
> vulnerability without breaking other things), it can be made immediately from 
> the strictest branch.  When work on a major feature drags on, meaningful 
> releases can be made without it by releasing from the middle branch.  (These 
> two use cases are the reason for the number of branches being 3; the match with 
> libraries is largely coincidental.)  When instead release day comes for the 
> middle branch before the strict branch, you just merge the latter into the 
> former first.

That's a different discussion, isn't it?  The issue at hand is whether
marking bugs at closure time as being "fixed in version X.Y" is
something that can avoid the danger of having the specified version be
eventually released without the fix, while the fix is actually
available with some other released version.

I submit that we cannot know in advance whether a given commit will
end up in a specific released version.  There are just too many
factors that are unknown when the bug is resolved which could easily
change the version in which the bug will be eventually fixed.  Some of
these factors:

  . a fix is found to be too dangerous for its branch, and is moved to
    another branch
  . a fix is found to be a "band-aid" type, and the real fix is on
    another branch
  . we decide to change the branch configuration

And these are only the ones I came up with within the first 5 sec of
thought.

I don't see how _any_ branch configuration could prevent the above
factors from thwarting our release plans as known when the bug is
closed and marked as fixed in some specific version of Emacs.

Re: Issues marked as fixed in 25.2

[Tino Calancha]

[-- Attachment #1: Type: text/plain, Size: 16931 bytes --]



On Tue, 8 Nov 2016, Glenn Morris wrote:

>
> Here's a list of (archived) bugs marked as fixed in version 25.2.
> Owing to the change in the Emacs version numbering plan, most of these
> (except the more recent ones) probably aren't actually fixed in 25.2.
> IMO it would be good if the metadata was reviewed and adjusted to 26.1

We also need to adjust changes to defcustom's in master branch: some
of these changes add :version "25.2", instead of 26.1.

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
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 e6e79b0..10a3403 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -41,7 +41,7 @@ battery
  (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 0319eeb..919265f 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -354,7 +354,7 @@ comint-password-prompt-regexp
     "\\(?: 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 7ead087..daa6d77 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -264,7 +264,7 @@ dired-always-read-filesystem
   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 db78d94..66117b8 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -237,7 +237,7 @@ edebug-sit-on-break
    "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 d6ec98b..6e3b08c 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2476,7 +2476,7 @@ homoglyph
      (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 @@ nobreak-hyphen
      (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 @@ read-multiple-choice-face
          :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 7cfb20d..c50e6aa 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1321,7 +1321,7 @@ mounted-file-systems
      "^\\(?:/\\(?: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 @@ kill-emacs-query-functions
  `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 738adb5..0080b41 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1612,7 +1612,7 @@ gnus-article-encrypt-protocol

  (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 @@ gnus-button-url-regexp

  (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 bdf1b15..52eaff3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1764,7 +1764,7 @@ message-user-fqdn

  (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 1918ce8..b3d1452 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -98,7 +98,7 @@ ibuffer-never-search-content-name
        (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 @@ ibuffer-never-search-content-name
  (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 9becfc9..b33c2e3 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -138,7 +138,7 @@ ibuffer-formats

  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 @@ ibuffer-marked-char

  (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 @@ ibuffer-locked-buffer
    '((((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 e1f52de..82e0162 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -135,7 +135,7 @@ image-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 8c83f5e..db9f13b 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -551,7 +551,7 @@ mouse-select-region-move-to-beginning
    :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 1547f52..73d6ff4 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -119,7 +119,7 @@ iwconfig-program
    "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 @@ iwconfig-program-options
   "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 @@ netstat-program
    "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 @@ route-program
    "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 @@ route-program-options
    "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 5660355..f1b0087 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -68,7 +68,7 @@ shr-use-fonts

  (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 c8276e7..8f7bd44 100644
--- a/lisp/net/sieve-manage.el
+++ b/lisp/net/sieve-manage.el
@@ -148,7 +148,7 @@ sieve-manage-default-stream

  (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 f7f097b..5112c6b 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -235,7 +235,7 @@ grep-save-buffers
    (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 fe61325..2506c4a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -50,7 +50,7 @@ shell-command-dont-erase-buffer
            (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 @@ extended-command-suggest-shorter
    "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 042b7d4..29aa231 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -102,7 +102,7 @@ flyspell-sort-corrections-function
  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 f6aae21..1286d6c 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -373,7 +373,7 @@ url-user-agent
      (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 b516b67..7124df0 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -175,7 +175,7 @@ change-log-directory-files
    "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 78ff56c..cee01ee 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -280,7 +280,7 @@ vc-hg-symbolic-revision-styles
                    (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 @@ vc-hg-use-file-version-for-mode-line-version
  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 @@ vc-hg-parse-hg-data-structures
  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 5b23f84..f059ab7 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -158,7 +158,7 @@ wdired-create-parent-directories
  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 da3691e..5255905 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7519,7 +7519,7 @@ switch-to-buffer-preserve-window-point
  	  (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.10.2

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.3)
  of 2016-11-16
Repository revision: 36b99556dea23f17d5598bbed366e7201eec9fbb

Re: Issues marked as fixed in 25.2

[Eli Zaretskii]

> From: Tino Calancha <tino.calancha@gmail.com>
> Date: Thu, 17 Nov 2016 00:42:16 +0900 (JST)
> Cc: Emacs developers <emacs-devel@gnu.org>
> 
> > Here's a list of (archived) bugs marked as fixed in version 25.2.
> > Owing to the change in the Emacs version numbering plan, most of these
> > (except the more recent ones) probably aren't actually fixed in 25.2.
> > IMO it would be good if the metadata was reviewed and adjusted to 26.1
> 
> We also need to adjust changes to defcustom's in master branch: some
> of these changes add :version "25.2", instead of 26.1.

Thanks.  If you verified that these are only on the master branch,
please push this to master.

Re: Issues marked as fixed in 25.2

[Tino Calancha]

On Wed, 16 Nov 2016, Eli Zaretskii wrote:

>> From: Tino Calancha <tino.calancha@gmail.com>
>> Date: Thu, 17 Nov 2016 00:42:16 +0900 (JST)
>> Cc: Emacs developers <emacs-devel@gnu.org>
>>
>>> Here's a list of (archived) bugs marked as fixed in version 25.2.
>>> Owing to the change in the Emacs version numbering plan, most of these
>>> (except the more recent ones) probably aren't actually fixed in 25.2.
>>> IMO it would be good if the metadata was reviewed and adjusted to 26.1
>>
>> We also need to adjust changes to defcustom's in master branch: some
>> of these changes add :version "25.2", instead of 26.1.
>
> Thanks.  If you verified that these are only on the master branch,
> please push this to master.
Just rechecked.
Pushed to master branch as commit: 5ffdbe0