aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-04-30 23:52:19 +0200
committerLars Ingebrigtsen2016-05-01 19:27:16 +0200
commit25b4cf33dddf9af02b94237d65a6c163bd308747 (patch)
tree555034fafff027816631a483173a52731a7eeab7
parent6b39501612ac2e932a6f62ca558659007c9b3daa (diff)
downloademacs-25b4cf33dddf9af02b94237d65a6c163bd308747.tar.gz
emacs-25b4cf33dddf9af02b94237d65a6c163bd308747.zip
Describe WHEN in all the define-obsolete- macros
* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias): Say more verbosely what WHEN is (bug#21225). (define-obsolete-function-alias): Describe the WHEN parameter. (define-obsolete-variable-alias): Ditto. (cherry picked from commit 247c388f160581d207e41ca5926990bbf69d4a0f)
-rw-r--r--lisp/emacs-lisp/byte-run.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 83cb7e70f37..ed457d9ede1 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -362,6 +362,9 @@ is equivalent to the following two lines of code:
362\(defalias \\='old-fun \\='new-fun \"old-fun's doc.\") 362\(defalias \\='old-fun \\='new-fun \"old-fun's doc.\")
363\(make-obsolete \\='old-fun \\='new-fun \"22.1\") 363\(make-obsolete \\='old-fun \\='new-fun \"22.1\")
364 364
365If provided, WHEN should be a string indicating when the function
366was first made obsolete, for example a date or a release number.
367
365See the docstrings of `defalias' and `make-obsolete' for more details." 368See the docstrings of `defalias' and `make-obsolete' for more details."
366 (declare (doc-string 4) 369 (declare (doc-string 4)
367 (advertised-calling-convention 370 (advertised-calling-convention
@@ -404,6 +407,9 @@ dumped with Emacs). This is so that any user customizations are
404applied before the defcustom tries to initialize the 407applied before the defcustom tries to initialize the
405variable (this is due to the way `defvaralias' works). 408variable (this is due to the way `defvaralias' works).
406 409
410If provided, WHEN should be a string indicating when the function
411was first made obsolete, for example a date or a release number.
412
407For the benefit of `custom-set-variables', if OBSOLETE-NAME has 413For the benefit of `custom-set-variables', if OBSOLETE-NAME has
408any of the following properties, they are copied to 414any of the following properties, they are copied to
409CURRENT-NAME, if it does not already have them: 415CURRENT-NAME, if it does not already have them:
@@ -428,8 +434,8 @@ CURRENT-NAME, if it does not already have them:
428;; It only really affects M-x describe-face output. 434;; It only really affects M-x describe-face output.
429(defmacro define-obsolete-face-alias (obsolete-face current-face when) 435(defmacro define-obsolete-face-alias (obsolete-face current-face when)
430 "Make OBSOLETE-FACE a face alias for CURRENT-FACE and mark it obsolete. 436 "Make OBSOLETE-FACE a face alias for CURRENT-FACE and mark it obsolete.
431The string WHEN gives the Emacs version where OBSOLETE-FACE became 437If provided, WHEN should be a string indicating when the function
432obsolete." 438was first made obsolete, for example a date or a release number."
433 `(progn 439 `(progn
434 (put ,obsolete-face 'face-alias ,current-face) 440 (put ,obsolete-face 'face-alias ,current-face)
435 ;; Used by M-x describe-face. 441 ;; Used by M-x describe-face.