[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107962: * lisp/progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence

[Sam Steingold]

------------------------------------------------------------
revno: 107962
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Wed 2012-04-18 16:26:57 -0400
message:
  * lisp/progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence
  instead of 'string to accommodate values like [f11].
  Always use `vconcat' instead of `concat' on it, like in `gud-def'.
  * lisp/progmodes/gdb-mi.el: Likewise.
modified:
  lisp/ChangeLog
  lisp/progmodes/gdb-mi.el
  lisp/progmodes/gud.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-18 16:43:23 +0000
+++ b/lisp/ChangeLog    2012-04-18 20:26:57 +0000
@@ -1,3 +1,10 @@
+2012-04-18  Sam Steingold  <address@hidden>
+
+       * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence
+       instead of 'string to accommodate values like [f11].
+       Always use `vconcat' instead of `concat' on it, like in `gud-def'.
+       * progmodes/gdb-mi.el: Likewise.
+
 2012-04-18  Leo Liu  <address@hidden>
 
        * abbrev.el (edit-abbrevs): Move point to the abbrev table of

=== modified file 'lisp/progmodes/gdb-mi.el'
--- a/lisp/progmodes/gdb-mi.el  2012-03-13 07:07:10 +0000
+++ b/lisp/progmodes/gdb-mi.el  2012-04-18 20:26:57 +0000
@@ -1056,7 +1056,7 @@
                   (if gdb-speedbar-auto-raise "en" "dis"))))
 
 (define-key gud-minor-mode-map "\C-c\C-w" 'gud-watch)
-(define-key global-map (concat gud-key-prefix "\C-w") 'gud-watch)
+(define-key global-map (vconcat gud-key-prefix "\C-w") 'gud-watch)
 
 (declare-function tooltip-identifier-from-point "tooltip" (point))
 

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/gud.el     2012-04-18 20:26:57 +0000
@@ -66,10 +66,10 @@
 
 (defcustom gud-key-prefix "\C-x\C-a"
   "Prefix of all GUD commands valid in C buffers."
-  :type 'string
+  :type 'key-sequence
   :group 'gud)
 
-(global-set-key (concat gud-key-prefix "\C-l") 'gud-refresh)
+(global-set-key (vconcat gud-key-prefix "\C-l") 'gud-refresh)
 (define-key ctl-x-map " " 'gud-break)  ;; backward compatibility hack
 
 (defvar gud-marker-filter nil)