aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-04-30 23:54:16 +0200
committerLars Ingebrigtsen2016-05-01 19:27:16 +0200
commit8c66ebfcf06f318a5d984178c90d48362eebe085 (patch)
tree31ac66c92801a37ca4b49990a3fe9d8e7c20241a
parent25b4cf33dddf9af02b94237d65a6c163bd308747 (diff)
downloademacs-8c66ebfcf06f318a5d984178c90d48362eebe085.tar.gz
emacs-8c66ebfcf06f318a5d984178c90d48362eebe085.zip
Further define-obsolete-* doc fixups
* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias): Fix up last change. (define-obsolete-variable-alias): Ditto. (cherry picked from commit 28e9f4390d8391c2c36be4ef515cf3a2c679a5a5)
-rw-r--r--lisp/emacs-lisp/byte-run.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index ed457d9ede1..818c2683463 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -407,7 +407,7 @@ dumped with Emacs). This is so that any user customizations are
407applied before the defcustom tries to initialize the 407applied before the defcustom tries to initialize the
408variable (this is due to the way `defvaralias' works). 408variable (this is due to the way `defvaralias' works).
409 409
410If provided, WHEN should be a string indicating when the function 410If provided, WHEN should be a string indicating when the variable
411was first made obsolete, for example a date or a release number. 411was first made obsolete, for example a date or a release number.
412 412
413For the benefit of `custom-set-variables', if OBSOLETE-NAME has 413For the benefit of `custom-set-variables', if OBSOLETE-NAME has
@@ -434,7 +434,7 @@ CURRENT-NAME, if it does not already have them:
434;; It only really affects M-x describe-face output. 434;; It only really affects M-x describe-face output.
435(defmacro define-obsolete-face-alias (obsolete-face current-face when) 435(defmacro define-obsolete-face-alias (obsolete-face current-face when)
436 "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.
437If provided, WHEN should be a string indicating when the function 437If provided, WHEN should be a string indicating when the face
438was first made obsolete, for example a date or a release number." 438was first made obsolete, for example a date or a release number."
439 `(progn 439 `(progn
440 (put ,obsolete-face 'face-alias ,current-face) 440 (put ,obsolete-face 'face-alias ,current-face)