summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-10-06 03:43:23 +0000
committerGlenn Morris <rgm@gnu.org>2009-10-06 03:43:23 +0000
commit73fe714ac3df0269c1053875dc54bd95672898b2 (patch)
tree4bf24c0493e77aa5a1cc2a1e6d365df137da785b
parent3405d98c33c2467e533bf4dc10fb1adc7a05ebff (diff)
downloademacs-73fe714ac3df0269c1053875dc54bd95672898b2.tar.gz
(define-obsolete-face-alias): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/byte-run.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7a4f85f4ee..c3b7b28361c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2009-10-06 Glenn Morris <rgm@gnu.org>
+ * emacs-lisp/byte-run.el (define-obsolete-face-alias): Doc fix.
+
* emacs-lisp/autoload.el (autoload-excludes): New variable.
(autoload-generate-file-autoloads): Skip files in autoload-excludes.
(batch-update-autoloads): Process a string value of autoload-excludes,
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 7c3ea62f3ec..5c4eeae0cde 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -210,8 +210,8 @@ Info node `(elisp)Variable Aliases' for more details."
;; It only really affects M-x describe-face output.
(defmacro define-obsolete-face-alias (obsolete-face current-face when)
"Make OBSOLETE-FACE a face alias for CURRENT-FACE and mark it obsolete.
-The optional string WHEN gives the Emacs version where OBSOLETE-FACE
-became obsolete."
+The string WHEN gives the Emacs version where OBSOLETE-FACE became
+obsolete."
`(progn
(put ,obsolete-face 'face-alias ,current-face)
;; Used by M-x describe-face.