aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-06-10 00:55:02 -0400
committerGlenn Morris2016-06-10 00:55:02 -0400
commit48079f68125e75cf581ef2b86b00c5a3851dd6e7 (patch)
tree76e55b39fec8b87caff982e9a8f17b7d19a7ff0c
parent78b18cabb4f18b7afe7f80395ea76493c22ac4f3 (diff)
downloademacs-48079f68125e75cf581ef2b86b00c5a3851dd6e7.tar.gz
emacs-48079f68125e75cf581ef2b86b00c5a3851dd6e7.zip
; 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.el2
-rw-r--r--lisp/calendar/timeclock.el4
-rw-r--r--lisp/cus-start.el2
-rw-r--r--lisp/net/rcirc.el2
-rw-r--r--lisp/nxml/nxml-mode.el2
-rw-r--r--lisp/org/org-compat.el2
-rw-r--r--lisp/w32-fns.el4
-rw-r--r--lisp/widget.el2
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."
191 (time-subtract nil time)) 191 (time-subtract nil time))
192 192
193;;;###autoload 193;;;###autoload
194(define-obsolete-function-alias 'subtract-time 'time-subtract "26.1") 194(define-obsolete-function-alias 'subtract-time 'time-subtract "25.2")
195 195
196;;;###autoload 196;;;###autoload
197(defun date-to-day (date) 197(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."
532 (message "%s" string) 532 (message "%s" string)
533 string))) 533 string)))
534 534
535(define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "26.1") 535(define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "25.2")
536(define-obsolete-function-alias 'timeclock-seconds-to-time 'seconds-to-time 536(define-obsolete-function-alias 'timeclock-seconds-to-time 'seconds-to-time
537 "26.1") 537 "25.2")
538 538
539;; Should today-only be removed in favor of timeclock-relative? - gm 539;; Should today-only be removed in favor of timeclock-relative? - gm
540(defsubst timeclock-when-to-leave (&optional today-only) 540(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
312 (const :tag "Always" t) 312 (const :tag "Always" t)
313 (repeat (symbol :tag "Parameter"))) 313 (repeat (symbol :tag "Parameter")))
314 "25.1") 314 "25.1")
315 (tooltip-reuse-hidden-frame tooltip boolean "26.1") 315 (tooltip-reuse-hidden-frame tooltip boolean "25.2")
316 ;; fringe.c 316 ;; fringe.c
317 (overflow-newline-into-fringe fringe boolean) 317 (overflow-newline-into-fringe fringe boolean)
318 ;; image.c 318 ;; 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."
611 `(with-current-buffer rcirc-server-buffer 611 `(with-current-buffer rcirc-server-buffer
612 ,@body)) 612 ,@body))
613 613
614(define-obsolete-function-alias 'rcirc-float-time 'float-time "26.1") 614(define-obsolete-function-alias 'rcirc-float-time 'float-time "25.2")
615 615
616(defun rcirc-prompt-for-encryption (server-plist) 616(defun rcirc-prompt-for-encryption (server-plist)
617 "Prompt the user for the encryption method to use. 617 "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
1500 (t (back-to-indentation))) 1500 (t (back-to-indentation)))
1501 (current-column)) 1501 (current-column))
1502 1502
1503(define-obsolete-function-alias 'nxml-complete #'completion-at-point "26.1") 1503(define-obsolete-function-alias 'nxml-complete #'completion-at-point "25.2")
1504 1504
1505;;; Movement 1505;;; Movement
1506 1506
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'."
409 (when focus-follows-mouse 409 (when focus-follows-mouse
410 (set-mouse-position frame (1- (frame-width frame)) 0))))) 410 (set-mouse-position frame (1- (frame-width frame)) 0)))))
411 411
412(define-obsolete-function-alias 'org-float-time 'float-time "26.1") 412(define-obsolete-function-alias 'org-float-time 'float-time "25.2")
413 413
414;; `user-error' is only available from 24.2.50 on 414;; `user-error' is only available from 24.2.50 on
415(unless (fboundp 'user-error) 415(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"))))
143 '(undecided-dos . undecided-dos) 143 '(undecided-dos . undecided-dos)
144 '(raw-text-dos . raw-text-dos))))) 144 '(raw-text-dos . raw-text-dos)))))
145(define-obsolete-function-alias 'set-default-process-coding-system 145(define-obsolete-function-alias 'set-default-process-coding-system
146 #'w32-set-default-process-coding-system "26.1") 146 #'w32-set-default-process-coding-system "25.2")
147(add-hook 'before-init-hook #'w32-set-default-process-coding-system) 147(add-hook 'before-init-hook #'w32-set-default-process-coding-system)
148 148
149 149
@@ -235,7 +235,7 @@ This function is provided for backward compatibility, since
235 (check-coding-system coding-system) 235 (check-coding-system coding-system)
236 (setq locale-coding-system coding-system)) 236 (setq locale-coding-system coding-system))
237(define-obsolete-function-alias 'set-w32-system-coding-system 237(define-obsolete-function-alias 'set-w32-system-coding-system
238 #'w32-set-system-coding-system "26.1") 238 #'w32-set-system-coding-system "25.2")
239 239
240;; locale-coding-system was introduced to do the same thing as 240;; locale-coding-system was introduced to do the same thing as
241;; w32-system-coding-system. Use that instead. 241;; 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."
91 name) 91 name)
92 92
93;; This is used by external widget code (in W3, at least). 93;; This is used by external widget code (in W3, at least).
94(define-obsolete-function-alias 'widget-plist-member #'plist-member "26.1") 94(define-obsolete-function-alias 'widget-plist-member #'plist-member "25.2")
95 95
96;;; The End. 96;;; The End.
97 97