[Emacs-diffs] master 67df076: ; Replace "25.2" with "26.1" where appropriate, which is almost everywhere

[Glenn Morris]

branch: master
commit 67df076793773c6226b8c08c435109aeb2e7a0d3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    ; Replace "25.2" with "26.1" where appropriate, which is almost everywhere
    
    Ref:
    http://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00692.html
    http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01215.html
---
 doc/lispref/modes.texi       |    2 +-
 lisp/allout.el               |    2 +-
 lisp/calendar/time-date.el   |    2 +-
 lisp/calendar/timeclock.el   |    4 ++--
 lisp/cus-start.el            |    2 +-
 lisp/emacs-lisp/eieio.el     |    6 +++---
 lisp/gnus/gmm-utils.el       |    2 +-
 lisp/gnus/gnus-util.el       |    2 +-
 lisp/gnus/message.el         |    2 +-
 lisp/gnus/mm-util.el         |    2 +-
 lisp/net/network-stream.el   |    2 +-
 lisp/net/rcirc.el            |    2 +-
 lisp/nxml/nxml-mode.el       |    2 +-
 lisp/obsolete/messcompat.el  |    2 +-
 lisp/org/org-compat.el       |    4 ++--
 lisp/subr.el                 |    8 ++++----
 lisp/textmodes/rst.el        |    2 +-
 lisp/vc/add-log.el           |    2 +-
 lisp/vc/emerge.el            |    2 +-
 lisp/vc/smerge-mode.el       |   14 +++++++-------
 lisp/w32-fns.el              |    4 ++--
 lisp/widget.el               |    2 +-
 test/lisp/net/tramp-tests.el |    2 +-
 23 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c7b6106..3d3122a 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -528,7 +528,7 @@ It also processes local variables specified in the file 
text.
 @deffn Command normal-mode &optional find-file
 This function establishes the proper major mode and buffer-local
 variable bindings for the current buffer.  It calls
address@hidden (see below).  As from Emacs 25.2, it no longer
address@hidden (see below).  As of Emacs 26.1, it no longer
 runs @code{hack-local-variables}, this now being done in
 @code{run-mode-hooks} at the initialization of major modes
 (@pxref{Mode Hooks}).
diff --git a/lisp/allout.el b/lisp/allout.el
index 3a7b6e6..f47213d 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1242,7 +1242,7 @@ Also refresh various data structures that hinge on the 
regexp."
                             "[^" allout-primary-bullet "]"))
                   "\\)"
                   ))))
-(define-obsolete-function-alias 'set-allout-regexp 'allout-set-regexp "25.2")
+(define-obsolete-function-alias 'set-allout-regexp 'allout-set-regexp "26.1")
 ;;;_  : Menu bar
 (defvar allout-mode-exposure-menu)
 (defvar allout-mode-editing-menu)
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 20ad372..a1d946e 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -191,7 +191,7 @@ TIME should be either a time value or a date-time string."
   (time-subtract nil time))
 
 ;;;###autoload
-(define-obsolete-function-alias 'subtract-time 'time-subtract "25.2")
+(define-obsolete-function-alias 'subtract-time 'time-subtract "26.1")
 
 ;;;###autoload
 (defun date-to-day (date)
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index f1f48e9..3d9e246 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -532,9 +532,9 @@ non-nil, the amount returned will be relative to past time 
worked."
        (message "%s" string)
       string)))
 
-(define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "25.2")
+(define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "26.1")
 (define-obsolete-function-alias 'timeclock-seconds-to-time 'seconds-to-time
-  "25.2")
+  "26.1")
 
 ;; Should today-only be removed in favor of timeclock-relative? - gm
 (defsubst timeclock-when-to-leave (&optional today-only)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b7cc626..08dfbdf 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -315,7 +315,7 @@ Leaving \"Default\" unchecked is equivalent with specifying 
a default of
                                            (const :tag "Always" t)
                                            (repeat (symbol :tag "Parameter")))
                                           "25.1")
-            (tooltip-reuse-hidden-frame tooltip boolean "25.2")
+            (tooltip-reuse-hidden-frame tooltip boolean "26.1")
             ;; fringe.c
             (overflow-newline-into-fringe fringe boolean)
             ;; image.c
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 80ac8ef..fd77654 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -679,7 +679,7 @@ This class is not stored in the `parent' slot of a class 
vector."
 (setq eieio-default-superclass (cl--find-class 'eieio-default-superclass))
 
 (define-obsolete-function-alias 'standard-class
-  'eieio-default-superclass "25.2")
+  'eieio-default-superclass "26.1")
 
 (cl-defgeneric make-instance (class &rest initargs)
   "Make a new instance of CLASS based on INITARGS.
@@ -815,7 +815,7 @@ first and modify the returned object.")
 
 (cl-defgeneric destructor (_this &rest _params)
   "Destructor for cleaning up any dynamic links to our object."
-  (declare (obsolete nil "25.2"))
+  (declare (obsolete nil "26.1"))
   ;; No cleanup... yet.
   nil)
 
@@ -938,7 +938,7 @@ this object."
 This may create or delete slots, but does not affect the return value
 of `eq'."
   (error "EIEIO: `change-class' is unimplemented"))
-(define-obsolete-function-alias 'change-class 'eieio-change-class "25.2")
+(define-obsolete-function-alias 'change-class 'eieio-change-class "26.1")
 
 ;; Hook ourselves into help system for describing classes and methods.
 ;; FIXME: This is not actually needed any more since we can click on the
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 7aa5279..61ef001 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -257,7 +257,7 @@ If mode is nil, use `major-mode' of the current buffer."
                 (match-string 1 mode))))))
 
 (define-obsolete-function-alias 'gmm-format-time-string 'format-time-string
-  "25.2")
+  "26.1")
 
 (provide 'gmm-utils)
 
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index b6ef433..7eb4462 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -81,7 +81,7 @@ If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
 string containing the replacements.
 
 This is a compatibility function for different Emacsen."
-  (declare (obsolete replace-regexp-in-string "25.2"))
+  (declare (obsolete replace-regexp-in-string "26.1"))
   (replace-regexp-in-string regexp newtext string nil literal))
 
 (defun gnus-boundp (variable)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 52eaff3..448ba7b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1353,7 +1353,7 @@ If nil, you might be asked to input the charset."
   :type 'symbol)
 (make-obsolete-variable
  'message-default-charset
- "The default charset comes from the language environment" "25.2")
+ "The default charset comes from the language environment" "26.1")
 
 (defcustom message-dont-reply-to-names mail-dont-reply-to-names
   "Addresses to prune when doing wide replies.
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index adf2fda..59ab791 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -757,7 +757,7 @@ If INHIBIT is non-nil, inhibit 
`mm-inhibit-file-name-handlers'."
     (write-region start end filename append visit lockname)))
 
 (defalias 'mm-make-temp-file 'make-temp-file)
-(define-obsolete-function-alias 'mm-make-temp-file 'make-temp-file "25.2")
+(define-obsolete-function-alias 'mm-make-temp-file 'make-temp-file "26.1")
 
 (defvar mm-image-load-path-cache nil)
 
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 50991fd..657672d 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -204,7 +204,7 @@ gnutls-boot (as returned by `gnutls-boot-parameters')."
 ;;;###autoload
 (defalias 'open-protocol-stream 'open-network-stream)
 (define-obsolete-function-alias 'open-protocol-stream 'open-network-stream
-  "25.2")
+  "26.1")
 
 (defun network-stream-open-plain (name buffer host service parameters)
   (let ((start (with-current-buffer buffer (point)))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index d64de0f..66e6326 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -611,7 +611,7 @@ If ARG is non-nil, instead prompt for connection 
parameters."
   `(with-current-buffer rcirc-server-buffer
      ,@body))
 
-(define-obsolete-function-alias 'rcirc-float-time 'float-time "25.2")
+(define-obsolete-function-alias 'rcirc-float-time 'float-time "26.1")
 
 (defun rcirc-prompt-for-encryption (server-plist)
   "Prompt the user for the encryption method to use.
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 0b9975f..8c249d5 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1500,7 +1500,7 @@ of the line.  This expects the xmltok-* variables to be 
set up as by
        (t (back-to-indentation)))
   (current-column))
 
-(define-obsolete-function-alias 'nxml-complete #'completion-at-point "25.2")
+(define-obsolete-function-alias 'nxml-complete #'completion-at-point "26.1")
 
 ;;; Movement
 
diff --git a/lisp/obsolete/messcompat.el b/lisp/obsolete/messcompat.el
index 5f50692..faebcc8 100644
--- a/lisp/obsolete/messcompat.el
+++ b/lisp/obsolete/messcompat.el
@@ -4,7 +4,7 @@
 
 ;; Author: Lars Magne Ingebrigtsen <address@hidden>
 ;; Keywords: mail, news
-;; Obsolete-since: 25.2
+;; Obsolete-since: 26.1
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 2e35c09..912ec5a 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -409,9 +409,9 @@ Pass BUFFER to the XEmacs version of `move-to-column'."
         (when focus-follows-mouse
           (set-mouse-position frame (1- (frame-width frame)) 0)))))
 
-(define-obsolete-function-alias 'org-float-time 'float-time "25.2")
+(define-obsolete-function-alias 'org-float-time 'float-time "26.1")
 
-;; `user-error' is only available from 24.2.50 on
+;; `user-error' is only available from 24.3 on
 (unless (fboundp 'user-error)
   (defalias 'user-error 'error))
 
diff --git a/lisp/subr.el b/lisp/subr.el
index b23f605..eb9ab98 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1295,10 +1295,10 @@ be a list of the form returned by `event-start' and 
`event-end'."
 (make-obsolete 'buffer-has-markers-at nil "24.3")
 
 ;; bug#23850
-(make-obsolete 'string-to-unibyte   "use `encode-coding-string'." "25.2")
-(make-obsolete 'string-as-unibyte   "use `encode-coding-string'." "25.2")
-(make-obsolete 'string-to-multibyte "use `decode-coding-string'." "25.2")
-(make-obsolete 'string-as-multibyte "use `decode-coding-string'." "25.2")
+(make-obsolete 'string-to-unibyte   "use `encode-coding-string'." "26.1")
+(make-obsolete 'string-as-unibyte   "use `encode-coding-string'." "26.1")
+(make-obsolete 'string-to-multibyte "use `decode-coding-string'." "26.1")
+(make-obsolete 'string-as-multibyte "use `decode-coding-string'." "26.1")
 
 (defun log10 (x)
   "Return (log X 10), the log base 10 of X."
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index ddf8d3c..49809fa 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -277,7 +277,7 @@ in parentheses follows the development revision and the 
time stamp.")
     ("1.4.0" . "24.3")
     ("1.4.1" . "24.5")
     ("1.4.2" . "24.5")
-    ("1.5.0" . "25.2")
+    ("1.5.0" . "26.1")
     ))
 
 (unless (assoc rst-official-version rst-package-emacs-version-alist)
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 7124df0..ba710b2 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -579,7 +579,7 @@ If a string, interpret as the ZONE argument of 
`format-time-string'.")
      (lambda (x) (or (booleanp x) (stringp x))))
 
 (defun add-log-iso8601-time-zone (&optional time zone)
-  (declare (obsolete nil "25.2"))
+  (declare (obsolete nil "26.1"))
   (format-time-string "%:::z" time zone))
 
 (defvar add-log-iso8601-with-time-zone nil)
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 058b15c..9c25ec4 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -3177,7 +3177,7 @@ See also `auto-save-file-name-p'."
   "Obsolete, emerge now uses `shell-quote-argument'."
   :type 'regexp
   :group 'emerge)
-(make-obsolete-variable 'emerge-metachars nil "25.2")
+(make-obsolete-variable 'emerge-metachars nil "26.1")
 
 (provide 'emerge)
 
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 5198624..1a7dece 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -82,7 +82,7 @@ Used in `smerge-diff-base-upper' and related functions."
     (((class color))
      :foreground "red"))
   "Face for the `upper' version of a conflict.")
-(define-obsolete-face-alias 'smerge-mine 'smerge-upper "25.2")
+(define-obsolete-face-alias 'smerge-mine 'smerge-upper "26.1")
 (defvar smerge-upper-face 'smerge-upper)
 
 (defface smerge-lower
@@ -93,7 +93,7 @@ Used in `smerge-diff-base-upper' and related functions."
     (((class color))
      :foreground "green"))
   "Face for the `lower' version of a conflict.")
-(define-obsolete-face-alias 'smerge-other 'smerge-lower "25.2")
+(define-obsolete-face-alias 'smerge-other 'smerge-lower "26.1")
 (defvar smerge-lower-face 'smerge-lower)
 
 (defface smerge-base
@@ -702,7 +702,7 @@ this keeps \"LLL\"."
   (smerge-keep-n 3)
   (smerge-auto-leave))
 
-(define-obsolete-function-alias 'smerge-keep-other 'smerge-keep-lower "25.2")
+(define-obsolete-function-alias 'smerge-keep-other 'smerge-keep-lower "26.1")
 
 (defun smerge-keep-upper ()
   "Keep the \"upper\" version of a merge conflict.
@@ -719,7 +719,7 @@ this keeps \"UUU\"."
   (smerge-keep-n 1)
   (smerge-auto-leave))
 
-(define-obsolete-function-alias 'smerge-keep-mine 'smerge-keep-upper "25.2")
+(define-obsolete-function-alias 'smerge-keep-mine 'smerge-keep-upper "26.1")
 
 (defun smerge-get-current ()
   (let ((i 3))
@@ -760,7 +760,7 @@ this keeps \"UUU\"."
   (smerge-diff 2 1))
 
 (define-obsolete-function-alias 'smerge-diff-base-mine
-  'smerge-diff-base-upper "25.2")
+  'smerge-diff-base-upper "26.1")
 
 (defun smerge-diff-base-lower ()
   "Diff `base' and `lower' version in current conflict region."
@@ -768,7 +768,7 @@ this keeps \"UUU\"."
   (smerge-diff 2 3))
 
 (define-obsolete-function-alias 'smerge-diff-base-other
-  'smerge-diff-base-lower "25.2")
+  'smerge-diff-base-lower "26.1")
 
 (defun smerge-diff-upper-lower ()
   "Diff `upper' and `lower' version in current conflict region."
@@ -776,7 +776,7 @@ this keeps \"UUU\"."
   (smerge-diff 1 3))
 
 (define-obsolete-function-alias 'smerge-diff-mine-other
-  'smerge-diff-upper-lower "25.2")
+  'smerge-diff-upper-lower "26.1")
 
 (defun smerge-match-conflict ()
   "Get info about the conflict.  Puts the info in the `match-data'.
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 3c524e7..91c0253 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -143,7 +143,7 @@ You should set this to t when using a non-system 
shell.\n\n"))))
                        '(undecided-dos . undecided-dos)
                      '(raw-text-dos . raw-text-dos)))))
 (define-obsolete-function-alias 'set-default-process-coding-system
-  #'w32-set-default-process-coding-system "25.2")
+  #'w32-set-default-process-coding-system "26.1")
 (add-hook 'before-init-hook #'w32-set-default-process-coding-system)
 
 
@@ -235,7 +235,7 @@ This function is provided for backward compatibility, since
   (check-coding-system coding-system)
   (setq locale-coding-system coding-system))
 (define-obsolete-function-alias 'set-w32-system-coding-system
-  #'w32-set-system-coding-system "25.2")
+  #'w32-set-system-coding-system "26.1")
 
 ;; locale-coding-system was introduced to do the same thing as
 ;; w32-system-coding-system. Use that instead.
diff --git a/lisp/widget.el b/lisp/widget.el
index 54507cd..1574fb2 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -91,7 +91,7 @@ The third argument DOC is a documentation string for the 
widget."
   name)
 
 ;; This is used by external widget code (in W3, at least).
-(define-obsolete-function-alias 'widget-plist-member #'plist-member "25.2")
+(define-obsolete-function-alias 'widget-plist-member #'plist-member "26.1")
 
 ;;; The End.
 
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 4c3b83c..d88dbce 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1937,7 +1937,7 @@ This tests also `make-symbolic-link', `file-truename' and 
`add-name-to-file'."
       (ignore-errors (delete-file tmp-name1))
       (ignore-errors (delete-directory tmp-name2 'recursive)))))
 
-;; The functions have been introduced in Emacs 25.2.
+;; The functions were introduced in Emacs 26.1.
 (ert-deftest tramp-test32-make-nearby-temp-file ()
   "Check `make-nearby-temp-file' and `temporary-file-directory'."
   (skip-unless (tramp--test-enabled))