[Emacs-diffs] Changes to emacs/lisp/subr.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.360.2.5 emacs/lisp/subr.el:1.360.2.6
*** emacs/lisp/subr.el:1.360.2.5        Tue Aug  3 00:02:59 2004
--- emacs/lisp/subr.el  Tue Aug 10 07:46:38 2004
***************
*** 566,572 ****
  (defmacro 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 `insert-kbd-macro')."
    (read-kbd-macro keys))
  
  (put 'keyboard-translate-table 'char-table-extra-slots 0)
--- 566,572 ----
  (defmacro 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')."
    (read-kbd-macro keys))
  
  (put 'keyboard-translate-table 'char-table-extra-slots 0)
***************
*** 2304,2316 ****
  
  (defun global-unset-key (key)
    "Remove global binding of KEY.
! KEY is a string representing a sequence of keystrokes."
    (interactive "kUnset key globally: ")
    (global-set-key key nil))
  
  (defun local-unset-key (key)
    "Remove local binding of KEY.
! KEY is a string representing a sequence of keystrokes."
    (interactive "kUnset key locally: ")
    (if (current-local-map)
        (local-set-key key nil))
--- 2304,2316 ----
  
  (defun global-unset-key (key)
    "Remove global binding of KEY.
! KEY is a string or vector representing a sequence of keystrokes."
    (interactive "kUnset key globally: ")
    (global-set-key key nil))
  
  (defun local-unset-key (key)
    "Remove local binding of KEY.
! KEY is a string or vector representing a sequence of keystrokes."
    (interactive "kUnset key locally: ")
    (if (current-local-map)
        (local-set-key key nil))