From: Sam Steingold <sds@gnu.org>
Date: Wed, 18 Apr 2012 20:26:57 +0000 (-0400)
Subject: * lisp/progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence
X-Git-Tag: emacs-24.2.90~471^2~345
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a77b0ac9928f2ec476de39c704bb899fa4731859;p=emacs.git

* 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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de484dc68fa..edfe575a576 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-18  Sam Steingold  <sds@gnu.org>
+
+	* 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  <sdl.web@gmail.com>
 
 	* abbrev.el (edit-abbrevs): Move point to the abbrev table of
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 89450cd2276..497d2440cfd 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1056,7 +1056,7 @@ positive, otherwise don't automatically raise it."
 		   (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))
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 6b1f891b230..1f60c351252 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -66,10 +66,10 @@ Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python) and jdb."
 
 (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)