lisp/simple.el (define-alternatives): Rename from alternatives-define.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34154551fcd46674a4171dcc5fcf47151ab2b7cd..6dcbb90b0f6a00d7ec5684bf988a1fa425a27eb5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-15  Juanma Barranquero  <lekktu@gmail.com>
+
+       * simple.el (define-alternatives): Rename from alternatives-define,
+       per RMS' suggestion.
+
 2013-07-14  Juanma Barranquero  <lekktu@gmail.com>
 
        * desktop.el (desktop-restore-frames): Change default to t.

diff --git a/lisp/simple.el b/lisp/simple.el
index 3e3ff485c5e7bcfee775530cdcb20e59c5c99029..bcce938df733aae8700b6b843f0fdbe4eee7aeda 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7437,19 +7437,19 @@ warning using STRING as the message.")
 \f
 ;;; Generic dispatcher commands
 
-;; Macro `alternatives-define' is used to create generic commands.
+;; Macro `define-alternatives' is used to create generic commands.
 ;; Generic commands are these (like web, mail, news, encrypt, irc, etc.)
 ;; that can have different alternative implementations where choosing
 ;; among them is exclusively a matter of user preference.
 
-;; (alternatives-define COMMAND) creates a new interactive command
+;; (define-alternatives COMMAND) creates a new interactive command
 ;; M-x COMMAND and a customizable variable COMMAND-alternatives.
 ;; Typically, the user will not need to customize this variable; packages
 ;; wanting to add alternative implementations should use
 ;;
 ;; ;;;###autoload (push '("My impl name" . my-impl-symbol) COMMAND-alternatives
 
-(defmacro alternatives-define (command &rest customizations)
+(defmacro define-alternatives (command &rest customizations)
   "Define new command `COMMAND'.
 The variable `COMMAND-alternatives' will contain alternative
 implementations of COMMAND, so that running `C-u M-x COMMAND'