aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2005-11-15 12:25:49 +0000
committerNick Roberts2005-11-15 12:25:49 +0000
commitba5ff011a8dcb7322ecfe51d445ce618a6695282 (patch)
tree99660911fdb466af2d46d4fe346d1b0248821ac7
parenta354cf393bd9daaa9757d60fa0cbd281c9a07e51 (diff)
downloademacs-ba5ff011a8dcb7322ecfe51d445ce618a6695282.tar.gz
emacs-ba5ff011a8dcb7322ecfe51d445ce618a6695282.zip
Remove face-alias left over from change on
2005-08-15. (gdb-ann3): New command gud-go. (menu): Accomodate gdb-mi.el. (gdb-assembler-custom): Make buffer of selected window current so that set-window-point works.
-rw-r--r--lisp/progmodes/gdb-ui.el16
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 0d3d29205ae..f8f80ce6f66 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -358,13 +358,16 @@ With arg, use separate IO iff arg is positive."
358 (gud-call "clear *%a" arg))) 358 (gud-call "clear *%a" arg)))
359 "\C-d" "Remove breakpoint at current line or address.") 359 "\C-d" "Remove breakpoint at current line or address.")
360 ;; 360 ;;
361 (gud-def gud-until (if (not (string-match "Machine" mode-name)) 361 (gud-def gud-until (if (not (string-match "Machine" mode-name))
362 (gud-call "until %f:%l" arg) 362 (gud-call "until %f:%l" arg)
363 (save-excursion 363 (save-excursion
364 (beginning-of-line) 364 (beginning-of-line)
365 (forward-char 2) 365 (forward-char 2)
366 (gud-call "until *%a" arg))) 366 (gud-call "until *%a" arg)))
367 "\C-u" "Continue to current line or address.") 367 "\C-u" "Continue to current line or address.")
368 ;;
369 (gud-def gud-go (gud-call (if gdb-active-process "continue" "run") arg)
370 nil "Start or continue execution.")
368 371
369 (define-key gud-minor-mode-map [left-margin mouse-1] 372 (define-key gud-minor-mode-map [left-margin mouse-1]
370 'gdb-mouse-set-clear-breakpoint) 373 'gdb-mouse-set-clear-breakpoint)
@@ -1376,8 +1379,6 @@ static char *magick[] = {
1376 :weight bold)) 1379 :weight bold))
1377 "Face for enabled breakpoint icon in fringe." 1380 "Face for enabled breakpoint icon in fringe."
1378 :group 'gud) 1381 :group 'gud)
1379;; Compatibility alias for old name.
1380(put 'breakpoint-enabled-bitmap-face 'face-alias 'breakpoint-enabled)
1381 1382
1382(defface breakpoint-disabled 1383(defface breakpoint-disabled
1383 ;; We use different values of grey for different background types, 1384 ;; We use different values of grey for different background types,
@@ -2358,11 +2359,13 @@ corresponding to the mode line clicked."
2358 (define-key menu [breakpoints] 2359 (define-key menu [breakpoints]
2359 '("Breakpoints" . gdb-frame-breakpoints-buffer))) 2360 '("Breakpoints" . gdb-frame-breakpoints-buffer)))
2360 2361
2361(let ((menu (make-sparse-keymap "GDB-UI"))) 2362(let ((menu (make-sparse-keymap "GDB-UI/MI")))
2362 (define-key gud-menu-map [ui] 2363 (define-key gud-menu-map [ui]
2363 `(menu-item "GDB-UI" ,menu :visible (eq gud-minor-mode 'gdba))) 2364 `(menu-item (if (eq gud-minor-mode 'gdba) "GDB-UI" "GDB-MI")
2365 ,menu :visible (memq gud-minor-mode '(gdbmi gdba))))
2364 (define-key menu [gdb-use-inferior-io] 2366 (define-key menu [gdb-use-inferior-io]
2365 '(menu-item "Separate inferior IO" gdb-use-inferior-io-buffer 2367 '(menu-item "Separate inferior IO" gdb-use-inferior-io-buffer
2368 :visible (eq gud-minor-mode 'gdba)
2366 :help "Toggle separate IO for inferior." 2369 :help "Toggle separate IO for inferior."
2367 :button (:toggle . gdb-use-inferior-io-buffer))) 2370 :button (:toggle . gdb-use-inferior-io-buffer)))
2368 (define-key menu [gdb-many-windows] 2371 (define-key menu [gdb-many-windows]
@@ -2702,7 +2705,8 @@ BUFFER nil or omitted means use the current buffer."
2702 (if (re-search-forward address nil t) 2705 (if (re-search-forward address nil t)
2703 (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))))) 2706 (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))))
2704 (if (not (equal gdb-frame-address "main")) 2707 (if (not (equal gdb-frame-address "main"))
2705 (set-window-point (get-buffer-window buffer 0) pos)))) 2708 (with-current-buffer buffer
2709 (set-window-point (get-buffer-window buffer 0) pos)))))
2706 2710
2707(defvar gdb-assembler-mode-map 2711(defvar gdb-assembler-mode-map
2708 (let ((map (make-sparse-keymap))) 2712 (let ((map (make-sparse-keymap)))