diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 90f215465a8..cd057df253f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2000-06-01 Stefan Monnier + + * emacs-lisp/bytecomp.el: + * frame.el: + * international/mule-cmds.el: + * international/mule-util.el: + * international/mule.el: + * mouse.el: + * subr.el: + * faces.el: Update calls to make-obsolete with a WHEN argument. + + * byte-run.el (make-obsolete, make-obsolete-variable): + Add an optional WHEN argument and change the format of the + symbol-property information. + * emacs-lisp/bytecomp.el (byte-compile-log): Don't quote lambda. + (byte-compile-obsolete, byte-compile-variable-ref): Understand the + new obsolete-symbol-property format and print WHEN if it is provided. + 2000-05-31 Dave Love * loadhist.el (loadhist-hook-functions): Remove diff --git a/lisp/faces.el b/lisp/faces.el index 3ed3bb7aa74..914f2c177af 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -156,7 +156,7 @@ If NAME is already a face, it is simply returned. This function is defined for compatibility with Emacs 20.2. It should not be used anymore." (facep name)) -(make-obsolete 'internal-find-face 'facep) +(make-obsolete 'internal-find-face 'facep "21.1") (defun internal-get-face (name &optional frame) @@ -170,7 +170,7 @@ This function is defined for compatibility with Emacs 20.2. It should not be used anymore." (or (internal-find-face name frame) (check-face name))) -(make-obsolete 'internal-get-face "See `facep' and `check-face'.") +(make-obsolete 'internal-get-face "See `facep' and `check-face'." "21.1") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1471,14 +1471,14 @@ created." (defun frame-update-faces (frame) nil) -(make-obsolete 'frame-update-faces "No longer necessary") +(make-obsolete 'frame-update-faces "No longer necessary" "21.1") ;; Update the colors of FACE, after FRAME's own colors have been ;; changed. (defun frame-update-face-colors (frame) (frame-set-background-mode frame)) -(make-obsolete 'frame-update-face-colors 'frame-set-background-mode) +(make-obsolete 'frame-update-face-colors 'frame-set-background-mode "21.1") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1771,7 +1771,7 @@ also the same size as FACE on FRAME, or fail." ((string-match x-font-regexp-weight font) (concat (substring font 0 (match-beginning 1)) which (substring font (match-end 1))))))) -(make-obsolete 'x-frob-font-weight 'make-face-...) +(make-obsolete 'x-frob-font-weight 'make-face-... "21.1") (defun x-frob-font-slant (font which) (let ((case-fold-search t)) @@ -1792,50 +1792,50 @@ also the same size as FACE on FRAME, or fail." ((string-match x-font-regexp-slant font) (concat (substring font 0 (match-beginning 1)) which (substring font (match-end 1))))))) -(make-obsolete 'x-frob-font-slant 'make-face-...) +(make-obsolete 'x-frob-font-slant 'make-face-... "21.1") (defun x-make-font-bold (font) "Given an X font specification, make a bold version of it. If that can't be done, return nil." (x-frob-font-weight font "bold")) -(make-obsolete 'x-make-font-bold 'make-face-bold) +(make-obsolete 'x-make-font-bold 'make-face-bold "21.1") (defun x-make-font-demibold (font) "Given an X font specification, make a demibold version of it. If that can't be done, return nil." (x-frob-font-weight font "demibold")) -(make-obsolete 'x-make-font-demibold 'make-face-bold) +(make-obsolete 'x-make-font-demibold 'make-face-bold "21.1") (defun x-make-font-unbold (font) "Given an X font specification, make a non-bold version of it. If that can't be done, return nil." (x-frob-font-weight font "medium")) -(make-obsolete 'x-make-font-unbold 'make-face-unbold) +(make-obsolete 'x-make-font-unbold 'make-face-unbold "21.1") (defun x-make-font-italic (font) "Given an X font specification, make an italic version of it. If that can't be done, return nil." (x-frob-font-slant font "i")) -(make-obsolete 'x-make-font-italic 'make-face-italic) +(make-obsolete 'x-make-font-italic 'make-face-italic "21.1") (defun x-make-font-oblique (font) ; you say tomayto... "Given an X font specification, make an oblique version of it. If that can't be done, return nil." (x-frob-font-slant font "o")) -(make-obsolete 'x-make-font-oblique 'make-face-italic) +(make-obsolete 'x-make-font-oblique 'make-face-italic "21.1") (defun x-make-font-unitalic (font) "Given an X font specification, make a non-italic version of it. If that can't be done, return nil." (x-frob-font-slant font "r")) -(make-obsolete 'x-make-font-unitalic 'make-face-unitalic) +(make-obsolete 'x-make-font-unitalic 'make-face-unitalic "21.1") (defun x-make-font-bold-italic (font) "Given an X font specification, make a bold and italic version of it. If that can't be done, return nil." (and (setq font (x-make-font-bold font)) (x-make-font-italic font))) -(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic) +(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1") (provide 'faces) diff --git a/lisp/frame.el b/lisp/frame.el index 5b7709b69b4..1348fabd8a8 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -977,10 +977,10 @@ FRAME nil or omitted means delete all frames except the selected frame." (mapcar 'delete-frame (delq frame (frame-list)))) -(make-obsolete 'screen-height 'frame-height) -(make-obsolete 'screen-width 'frame-width) -(make-obsolete 'set-screen-width 'set-frame-width) -(make-obsolete 'set-screen-height 'set-frame-height) +(make-obsolete 'screen-height 'frame-height) ;before 19.15 +(make-obsolete 'screen-width 'frame-width) ;before 19.15 +(make-obsolete 'set-screen-width 'set-frame-width) ;before 19.15 +(make-obsolete 'set-screen-height 'set-frame-height) ;before 19.15 ;;; Highlighting trailing whitespace. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 016c2c4ecfb..33f0da1311e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -280,7 +280,7 @@ This also sets the following values: (setq default-process-coding-system (cons coding-system coding-system))) (defalias 'update-iso-coding-systems 'update-coding-systems-internal) -(make-obsolete 'update-iso-coding-systems 'update-coding-systems-internal) +(make-obsolete 'update-iso-coding-systems 'update-coding-systems-internal "20.3") (defun prefer-coding-system (coding-system) "Add CODING-SYSTEM at the front of the priority list for automatic detection. diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index a7a53e5a3ed..af5b608f6c8 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -133,7 +133,7 @@ the resulting string may be narrower than END-COLUMN." ;;; For backward compatibility ... ;;;###autoload (defalias 'truncate-string 'truncate-string-to-width) -(make-obsolete 'truncate-string 'truncate-string-to-width) +(make-obsolete 'truncate-string 'truncate-string-to-width "20.1") ;;; Nested alist handler. Nested alist is alist whose elements are ;;; also nested alist. diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 7b32325db46..1e7fa52aced 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -439,7 +439,7 @@ Any alias nor subsidiary coding systems are not base coding system." (car (coding-system-get coding-system 'alias-coding-systems))) (defalias 'coding-system-parent 'coding-system-base) -(make-obsolete 'coding-system-parent 'coding-system-base) +(make-obsolete 'coding-system-parent 'coding-system-base "20.3") ;; Coding system also has a property `eol-type'. ;; diff --git a/lisp/subr.el b/lisp/subr.el index e33d2b027f5..9bef0025d52 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -615,8 +615,8 @@ as returned by the `event-start' and `event-end' functions." (defalias 'define-function 'defalias) (defalias 'sref 'aref) -(make-obsolete 'sref 'aref) -(make-obsolete 'char-bytes "Now this function always returns 1") +(make-obsolete 'sref 'aref "20.4") +(make-obsolete 'char-bytes "Now this function always returns 1" "20.4") ;; Some programs still use this as a function. (defun baud-rate ()