[Emacs-diffs] /srv/bzr/emacs/trunk r108511: * subr.el (kbd): Make it its own function.

[Stefan Monnier]

------------------------------------------------------------
revno: 108511
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-07 12:20:28 -0400
message:
  * subr.el (kbd): Make it its own function.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-07 09:20:41 +0000
+++ b/lisp/ChangeLog    2012-06-07 16:20:28 +0000
@@ -1,18 +1,17 @@
+2012-06-07  Stefan Monnier  <address@hidden>
+
+       * subr.el (kbd): Make it its own function.
+
 2012-06-07  Stefan Merten  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-06-02 10:56:09 +0000
+++ b/lisp/subr.el      2012-06-07 16:20:28 +0000
@@ -525,7 +525,13 @@
 
 ;;;; 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 ()