diff options
| author | Lars Ingebrigtsen | 2016-04-30 23:52:19 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-04-30 23:52:19 +0200 |
| commit | 247c388f160581d207e41ca5926990bbf69d4a0f (patch) | |
| tree | 759da42ef08b96ba63e9c971a21ca876d8e9dbd3 | |
| parent | fcd0d854eef6e439d51e8f07cf734d5e34e502b3 (diff) | |
| download | emacs-247c388f160581d207e41ca5926990bbf69d4a0f.tar.gz emacs-247c388f160581d207e41ca5926990bbf69d4a0f.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.
| -rw-r--r-- | lisp/emacs-lisp/byte-run.el | 10 |
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 | ||
| 365 | If provided, WHEN should be a string indicating when the function | ||
| 366 | was first made obsolete, for example a date or a release number. | ||
| 367 | |||
| 365 | See the docstrings of `defalias' and `make-obsolete' for more details." | 368 | See 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 | |||
| 404 | applied before the defcustom tries to initialize the | 407 | applied before the defcustom tries to initialize the |
| 405 | variable (this is due to the way `defvaralias' works). | 408 | variable (this is due to the way `defvaralias' works). |
| 406 | 409 | ||
| 410 | If provided, WHEN should be a string indicating when the function | ||
| 411 | was first made obsolete, for example a date or a release number. | ||
| 412 | |||
| 407 | For the benefit of `custom-set-variables', if OBSOLETE-NAME has | 413 | For the benefit of `custom-set-variables', if OBSOLETE-NAME has |
| 408 | any of the following properties, they are copied to | 414 | any of the following properties, they are copied to |
| 409 | CURRENT-NAME, if it does not already have them: | 415 | CURRENT-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. |
| 431 | The string WHEN gives the Emacs version where OBSOLETE-FACE became | 437 | If provided, WHEN should be a string indicating when the function |
| 432 | obsolete." | 438 | was 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. |