diff options
| author | Bastien Guerry | 2014-01-17 15:58:34 +0100 |
|---|---|---|
| committer | Bastien Guerry | 2014-01-17 15:58:34 +0100 |
| commit | 502963bbf2febcc5fa6b15d5b5bb5d0431d7428e (patch) | |
| tree | 8fa78b2ccef5a7d52d11b2cca319b404db144e54 | |
| parent | 2afb07b2e13f0f04d943b3ec5f0d773c9fdddcc6 (diff) | |
| download | emacs-502963bbf2febcc5fa6b15d5b5bb5d0431d7428e.tar.gz emacs-502963bbf2febcc5fa6b15d5b5bb5d0431d7428e.zip | |
Revert 2014-01-17T13:05:09Z!bzg@gnu.org.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e8057c3c386..25c4e9e75b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,8 +1,3 @@ | |||
| 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 | |||
| 6 | 2014-01-17 Dmitry Gutov <dgutov@yandex.ru> | 1 | 2014-01-17 Dmitry Gutov <dgutov@yandex.ru> |
| 7 | 2 | ||
| 8 | * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. | 3 | * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. |
diff --git a/lisp/simple.el b/lisp/simple.el index e69cbbdfdc3..ff32d204d17 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -7666,10 +7666,8 @@ 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. Developers should | 7669 | alternative implementations of COMMAND. `define-alternatives' |
| 7670 | use (defvar COMMAND-alternatives) to declare this variable | 7670 | does not have any effect until this variable is set. |
| 7671 | after they write (define-alternatives COMMAND), otherwise | ||
| 7672 | the variable will not be handled by programs like etags. | ||
| 7673 | 7671 | ||
| 7674 | CUSTOMIZATIONS, if non-nil, should be composed of alternating | 7672 | CUSTOMIZATIONS, if non-nil, should be composed of alternating |
| 7675 | `defcustom' keywords and values to add to the declaration of | 7673 | `defcustom' keywords and values to add to the declaration of |