[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110980: Document the conversion of kbd into a function.

[Chong Yidong]

------------------------------------------------------------
revno: 110980
fixes bug: http://debbugs.gnu.org/13052
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-12-02 15:13:44 +0800
message:
  Document the conversion of kbd into a function.
  
  * doc/emacs/custom.texi (Init Rebinding): kbd is now a function.
  
  * doc/lispref/keymaps.texi (Key Sequences): kbd is now a function.
modified:
  doc/emacs/ChangeLog
  doc/emacs/custom.texi
  doc/lispref/ChangeLog
  doc/lispref/keymaps.texi
  etc/NEWS

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-11-18 06:27:43 +0000
+++ b/doc/emacs/ChangeLog       2012-12-02 07:13:44 +0000
@@ -1,3 +1,7 @@
+2012-12-02  Chong Yidong  <address@hidden>
+
+       * custom.texi (Init Rebinding): kbd is now a function (Bug#13052).
+
 2012-11-18  Dani Moncayo  <address@hidden>
 
        * display.texi (Auto Scrolling): Fix some inaccuracies, plus

=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi     2012-10-23 15:06:07 +0000
+++ b/doc/emacs/custom.texi     2012-12-02 07:13:44 +0000
@@ -1648,7 +1648,7 @@
 
 @findex kbd
   There are several ways to write a key binding using Lisp.  The
-simplest is to use the @code{kbd} macro, which converts a textual
+simplest is to use the @code{kbd} function, which converts a textual
 representation of a key sequence---similar to how we have written key
 sequences in this manual---into a form that can be passed as an
 argument to @code{global-set-key}.  For example, here's how to bind
@@ -1676,11 +1676,11 @@
 (global-set-key (kbd "<mouse-2>") 'mouse-save-then-kill)
 @end example
 
-  Instead of using the @code{kbd} macro, you can use a Lisp string or
-vector to specify the key sequence.  Using a string is simpler, but
-only works for @acronym{ASCII} characters and Meta-modified
address@hidden characters.  For example, here's how to bind @kbd{C-x
-M-l} to @code{make-symbolic-link} (@pxref{Misc File Ops}):
+  Instead of using @code{kbd}, you can use a Lisp string or vector to
+specify the key sequence.  Using a string is simpler, but only works
+for @acronym{ASCII} characters and Meta-modified @acronym{ASCII}
+characters.  For example, here's how to bind @kbd{C-x M-l} to
address@hidden (@pxref{Misc File Ops}):
 
 @example
 (global-set-key "\C-x\M-l" 'make-symbolic-link)

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-11-23 14:39:07 +0000
+++ b/doc/lispref/ChangeLog     2012-12-02 07:13:44 +0000
@@ -1,3 +1,7 @@
+2012-12-02  Chong Yidong  <address@hidden>
+
+       * keymaps.texi (Key Sequences): kbd is now a function.
+
 2012-11-23  Martin Rudalics  <address@hidden>
 
        * windows.texi (Basic Windows): Fix typo.

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2012-11-15 14:20:45 +0000
+++ b/doc/lispref/keymaps.texi  2012-12-02 07:13:44 +0000
@@ -75,8 +75,8 @@
   For examples of key sequences written in string and vector
 representations, @ref{Init Rebinding,,, emacs, The GNU Emacs Manual}.
 
address@hidden kbd keyseq-text
-This macro converts the text @var{keyseq-text} (a string constant)
address@hidden kbd keyseq-text
+This function converts the text @var{keyseq-text} (a string constant)
 into a key sequence (a string or vector constant).  The contents of
 @var{keyseq-text} should use the same syntax as in the buffer invoked
 by the @kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}) command; in
@@ -97,7 +97,7 @@
 
 This macro is not meant for use with arguments that vary---only
 with string constants.
address@hidden defmac
address@hidden defun
 
 @node Keymap Basics
 @section Keymap Basics
@@ -1294,8 +1294,8 @@
   The functions below signal an error if @var{keymap} is not a keymap,
 or if @var{key} is not a string or vector representing a key sequence.
 You can use event types (symbols) as shorthand for events that are
-lists.  The @code{kbd} macro (@pxref{Key Sequences}) is a convenient
-way to specify the key sequence.
+lists.  The @code{kbd} function (@pxref{Key Sequences}) is a
+convenient way to specify the key sequence.
 
 @defun define-key keymap key binding
 This function sets the binding for @var{key} in @var{keymap}.  (If

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-11-20 19:28:53 +0000
+++ b/etc/NEWS  2012-12-02 07:13:44 +0000
@@ -709,9 +709,9 @@
 
 +++
 ** The return values of `defalias', `defun' and `defmacro' have changed,
-and are now undefined.  For backwards compatibility, defun and
-defmacro currently return the name of the newly defined function/macro
-but this should not be relied upon.
+and are now undefined.  For backwards compatibility, `defun' and
+`defmacro' currently return the name of the newly defined
+function/macro, but this should not be relied upon.
 
 ---
 ** `face-spec-set' no longer sets frame-specific attributes when the
@@ -958,6 +958,12 @@
 +++
 ** New macros `setq-local' and `defvar-local'.
 
+** Changes to special forms and macros
++++
+*** `defun' and `defmacro' are now macros rather than special forms
++++
+*** `kbd' is now a function rather than a macro.
+
 +++
 ** New fringe bitmap `exclamation-mark'.