* subr.el (kbd): Make it its own function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e85ce83503cf9735e452284e2a012f719fa3d45..cbdf00d639d9216fb21b5eea1419002c768e6f8a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,18 +1,17 @@
+2012-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (kbd): Make it its own function.
+
 2012-06-07  Stefan Merten  <smerten@oekonux.de>
 
        * textmodes/rst.el: Use `eval-when-compile' for requiring `cl.el'.
        Silence compiler warnings.  Fix versions.
-
-       (rst-position-if, rst-position, rst-some, rst-signum): New
-       functions.
+       (rst-position-if, rst-position, rst-some, rst-signum): New functions.
        (rst-shift-region, rst-adornment-level, rst-compute-tabs)
-       (rst-indent-line, rst-shift-region, rst-forward-line): Use new
-       functions.
-
+       (rst-indent-line, rst-shift-region, rst-forward-line): Use them.
        (rst-package-emacs-version-alist): Correct Emacs version to
        represent major merge with upstream.
-       (rst-transition, rst-adornment, rst-compile-toolsets): Fix
-       versions.
+       (rst-transition, rst-adornment, rst-compile-toolsets): Fix versions.
 
 2012-06-06  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/subr.el b/lisp/subr.el
index 7dc5d66b747ebed7efc3aa55313dd9a6af310458..473cc3efddd8c6d2c7b7d7f951372a4a231b5a28 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -525,7 +525,13 @@ side-effects, and the argument LIST is not modified."
 \f
 ;;;; Keymap support.
 
-(defalias 'kbd 'read-kbd-macro)
+(defun kbd (keys)
+  "Convert KEYS to the internal Emacs key representation.
+KEYS should be a string constant in the format used for
+saving keyboard macros (see `edmacro-mode')."
+  ;; Don't use a defalias, since the `pure' property is only true for
+  ;; the calling convention of `kbd'.
+  (read-kbd-macro keys))
 (put 'kbd 'pure t)
 
 (defun undefined ()