diff options
author | Glenn Morris <rgm@gnu.org> | 2016-06-10 00:55:02 -0400 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2016-06-10 00:55:02 -0400 |
commit | 48079f68125e75cf581ef2b86b00c5a3851dd6e7 (patch) | |
tree | 76e55b39fec8b87caff982e9a8f17b7d19a7ff0c | |
parent | 78b18cabb4f18b7afe7f80395ea76493c22ac4f3 (diff) | |
download | emacs-48079f68125e75cf581ef2b86b00c5a3851dd6e7.tar.gz |
; Refer to version 25.2 rather than 26.1.
; I hope the next release from master is indeed 26.1, but for reasons
; that passeth my understanding we currently call it 25.2 everywhere else,
; so we should at least be consistent.
-rw-r--r-- | lisp/calendar/time-date.el | 2 | ||||
-rw-r--r-- | lisp/calendar/timeclock.el | 4 | ||||
-rw-r--r-- | lisp/cus-start.el | 2 | ||||
-rw-r--r-- | lisp/net/rcirc.el | 2 | ||||
-rw-r--r-- | lisp/nxml/nxml-mode.el | 2 | ||||
-rw-r--r-- | lisp/org/org-compat.el | 2 | ||||
-rw-r--r-- | lisp/w32-fns.el | 4 | ||||
-rw-r--r-- | lisp/widget.el | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index a1d946eac74..20ad372b05d 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 "26.1") +(define-obsolete-function-alias 'subtract-time 'time-subtract "25.2") ;;;###autoload (defun date-to-day (date) diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 3d9e2462224..f1f48e99958 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 "26.1") +(define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "25.2") (define-obsolete-function-alias 'timeclock-seconds-to-time 'seconds-to-time - "26.1") + "25.2") ;; 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 c830ed83d1d..2b79bbbfda1 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -312,7 +312,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 "26.1") + (tooltip-reuse-hidden-frame tooltip boolean "25.2") ;; fringe.c (overflow-newline-into-fringe fringe boolean) ;; image.c diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 66e6326085c..d64de0f7837 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 "26.1") +(define-obsolete-function-alias 'rcirc-float-time 'float-time "25.2") (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 edc7414bfbf..cceb75ead63 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 "26.1") +(define-obsolete-function-alias 'nxml-complete #'completion-at-point "25.2") ;;; Movement diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index e8bf9703b03..2e35c0982ea 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -409,7 +409,7 @@ 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 "26.1") +(define-obsolete-function-alias 'org-float-time 'float-time "25.2") ;; `user-error' is only available from 24.2.50 on (unless (fboundp 'user-error) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 91c02530427..3c524e76d42 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 "26.1") + #'w32-set-default-process-coding-system "25.2") (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 "26.1") + #'w32-set-system-coding-system "25.2") ;; 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 1574fb265c6..54507cdc418 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 "26.1") +(define-obsolete-function-alias 'widget-plist-member #'plist-member "25.2") ;;; The End. |