aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2012-04-18 16:26:57 -0400
committerSam Steingold2012-04-18 16:26:57 -0400
commita77b0ac9928f2ec476de39c704bb899fa4731859 (patch)
treea6465e3a65d00928cb186206d47c46a774c1278f
parent99c8ec3fbfc439845c29144a61a42a5183441eaf (diff)
downloademacs-a77b0ac9928f2ec476de39c704bb899fa4731859.tar.gz
emacs-a77b0ac9928f2ec476de39c704bb899fa4731859.zip
* 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.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/gdb-mi.el2
-rw-r--r--lisp/progmodes/gud.el4
3 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de484dc68fa..edfe575a576 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12012-04-18 Sam Steingold <sds@gnu.org>
2
3 * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence
4 instead of 'string to accommodate values like [f11].
5 Always use `vconcat' instead of `concat' on it, like in `gud-def'.
6 * progmodes/gdb-mi.el: Likewise.
7
12012-04-18 Leo Liu <sdl.web@gmail.com> 82012-04-18 Leo Liu <sdl.web@gmail.com>
2 9
3 * abbrev.el (edit-abbrevs): Move point to the abbrev table of 10 * 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."
1056 (if gdb-speedbar-auto-raise "en" "dis")))) 1056 (if gdb-speedbar-auto-raise "en" "dis"))))
1057 1057
1058(define-key gud-minor-mode-map "\C-c\C-w" 'gud-watch) 1058(define-key gud-minor-mode-map "\C-c\C-w" 'gud-watch)
1059(define-key global-map (concat gud-key-prefix "\C-w") 'gud-watch) 1059(define-key global-map (vconcat gud-key-prefix "\C-w") 'gud-watch)
1060 1060
1061(declare-function tooltip-identifier-from-point "tooltip" (point)) 1061(declare-function tooltip-identifier-from-point "tooltip" (point))
1062 1062
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."
66 66
67(defcustom gud-key-prefix "\C-x\C-a" 67(defcustom gud-key-prefix "\C-x\C-a"
68 "Prefix of all GUD commands valid in C buffers." 68 "Prefix of all GUD commands valid in C buffers."
69 :type 'string 69 :type 'key-sequence
70 :group 'gud) 70 :group 'gud)
71 71
72(global-set-key (concat gud-key-prefix "\C-l") 'gud-refresh) 72(global-set-key (vconcat gud-key-prefix "\C-l") 'gud-refresh)
73(define-key ctl-x-map " " 'gud-break) ;; backward compatibility hack 73(define-key ctl-x-map " " 'gud-break) ;; backward compatibility hack
74 74
75(defvar gud-marker-filter nil) 75(defvar gud-marker-filter nil)