diff options
| author | Bastien Guerry | 2014-01-17 14:05:09 +0100 |
|---|---|---|
| committer | Bastien Guerry | 2014-01-17 14:05:09 +0100 |
| commit | 2afb07b2e13f0f04d943b3ec5f0d773c9fdddcc6 (patch) | |
| tree | ad29ac3e1747f33eb594dab62fe48268e9fcca55 | |
| parent | 1a98c36400c01f862e1ec9c35c5818aaebdeae92 (diff) | |
| download | emacs-2afb07b2e13f0f04d943b3ec5f0d773c9fdddcc6.tar.gz emacs-2afb07b2e13f0f04d943b3ec5f0d773c9fdddcc6.zip | |
* simple.el (define-alternatives): Fix docstring by advising
developers to (defvar COMMAND-alternatives).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25c4e9e75b7..e8057c3c386 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-01-17 Bastien Guerry <bzg@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (define-alternatives): Fix docstring by advising | ||
| 4 | developers to (defvar COMMAND-alternatives). | ||
| 5 | |||
| 1 | 2014-01-17 Dmitry Gutov <dgutov@yandex.ru> | 6 | 2014-01-17 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 7 | ||
| 3 | * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. | 8 | * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. |
diff --git a/lisp/simple.el b/lisp/simple.el index ff32d204d17..e69cbbdfdc3 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -7666,8 +7666,10 @@ Running `C-u M-x COMMAND RET' prompts again for an alternative | |||
| 7666 | and overwrites the previous choice. | 7666 | and overwrites the previous choice. |
| 7667 | 7667 | ||
| 7668 | The variable `COMMAND-alternatives' contains an alist with | 7668 | The variable `COMMAND-alternatives' contains an alist with |
| 7669 | alternative implementations of COMMAND. `define-alternatives' | 7669 | alternative implementations of COMMAND. Developers should |
| 7670 | does not have any effect until this variable is set. | 7670 | use (defvar COMMAND-alternatives) to declare this variable |
| 7671 | after they write (define-alternatives COMMAND), otherwise | ||
| 7672 | the variable will not be handled by programs like etags. | ||
| 7671 | 7673 | ||
| 7672 | CUSTOMIZATIONS, if non-nil, should be composed of alternating | 7674 | CUSTOMIZATIONS, if non-nil, should be composed of alternating |
| 7673 | `defcustom' keywords and values to add to the declaration of | 7675 | `defcustom' keywords and values to add to the declaration of |