forked from Github/emacs
; 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.
This commit is contained in:
parent
78b18cabb4
commit
48079f6812
8 changed files with 10 additions and 10 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue