aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2005-12-04 09:12:07 +0000
committerNick Roberts2005-12-04 09:12:07 +0000
commit67afa80d6230ea08df956336c6be37c02d8280dc (patch)
tree9ead92cc546f19ad5bd1e9d854ecfc8680a549d5
parentd85af294eb3b313e767f5c0a41abbc7633d8e5aa (diff)
downloademacs-67afa80d6230ea08df956336c6be37c02d8280dc.tar.gz
emacs-67afa80d6230ea08df956336c6be37c02d8280dc.zip
(gdb-use-inferior-io-buffer, gdb-speedbar-auto-raise):
Echo new state in minibuffer. (gdb-var-create-handler, gdb-assembler-custom): Use search-forward for plain strings. (gdb-frames-mode): Remove redundant call to font-lock-mode. (gdb-all-registers): Rename from toggle-gdb-all-registers. Create registers buffer if necessary. Echo new state in minibuffer. (gdb-registers-mode-map, gdb-registers-mode): Use gdb-all-registers.
-rw-r--r--lisp/progmodes/gdb-ui.el37
1 files changed, 21 insertions, 16 deletions
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index e714fa3d7fb..2fac23152e0 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -78,7 +78,7 @@
78;; 1) Use MI command -data-read-memory for memory window. 78;; 1) Use MI command -data-read-memory for memory window.
79;; 2) Highlight changed register values (use MI commands 79;; 2) Highlight changed register values (use MI commands
80;; -data-list-register-values and -data-list-changed-registers instead 80;; -data-list-register-values and -data-list-changed-registers instead
81;; of 'info registers'. 81;; of 'info registers' after release of 22.1.
82;; 3) Use tree-widget.el instead of the speedbar for watch-expressions? 82;; 3) Use tree-widget.el instead of the speedbar for watch-expressions?
83;; 4) Mark breakpoint locations on scroll-bar of source buffer? 83;; 4) Mark breakpoint locations on scroll-bar of source buffer?
84;; 5) After release of 22.1, use "-var-list-children --all-values" 84;; 5) After release of 22.1, use "-var-list-children --all-values"
@@ -263,6 +263,8 @@ With arg, use separate IO iff arg is positive."
263 (if (null arg) 263 (if (null arg)
264 (not gdb-use-inferior-io-buffer) 264 (not gdb-use-inferior-io-buffer)
265 (> (prefix-numeric-value arg) 0))) 265 (> (prefix-numeric-value arg) 0)))
266 (message (format "Separate inferior IO %sabled"
267 (if gdb-use-inferior-io-buffer "en" "dis")))
266 (if (and gud-comint-buffer 268 (if (and gud-comint-buffer
267 (buffer-name gud-comint-buffer)) 269 (buffer-name gud-comint-buffer))
268 (condition-case nil 270 (condition-case nil
@@ -376,11 +378,11 @@ With arg, use separate IO iff arg is positive."
376 "\C-d" "Remove breakpoint at current line or address.") 378 "\C-d" "Remove breakpoint at current line or address.")
377 ;; 379 ;;
378 (gud-def gud-until (if (not (string-match "Machine" mode-name)) 380 (gud-def gud-until (if (not (string-match "Machine" mode-name))
379 (gud-call "until %f:%l" arg) 381 (gud-call "until %f:%l" arg)
380 (save-excursion 382 (save-excursion
381 (beginning-of-line) 383 (beginning-of-line)
382 (forward-char 2) 384 (forward-char 2)
383 (gud-call "until *%a" arg))) 385 (gud-call "until *%a" arg)))
384 "\C-u" "Continue to current line or address.") 386 "\C-u" "Continue to current line or address.")
385 ;; 387 ;;
386 (gud-def gud-go (gud-call (if gdb-active-process "continue" "run") arg) 388 (gud-def gud-go (gud-call (if gdb-active-process "continue" "run") arg)
@@ -492,7 +494,9 @@ With arg, use separate IO iff arg is positive."
492 (setq gdb-speedbar-auto-raise 494 (setq gdb-speedbar-auto-raise
493 (if (null arg) 495 (if (null arg)
494 (not gdb-speedbar-auto-raise) 496 (not gdb-speedbar-auto-raise)
495 (> (prefix-numeric-value arg) 0)))) 497 (> (prefix-numeric-value arg) 0)))
498 (message (format "Auto raising %sabled"
499 (if gdb-speedbar-auto-raise "en" "dis"))))
496 500
497(defcustom gdb-use-colon-colon-notation nil 501(defcustom gdb-use-colon-colon-notation nil
498 "If non-nil use FUN::VAR format to display variables in the speedbar." 502 "If non-nil use FUN::VAR format to display variables in the speedbar."
@@ -547,7 +551,7 @@ With arg, use separate IO iff arg is positive."
547 `(lambda () (gdb-var-evaluate-expression-handler 551 `(lambda () (gdb-var-evaluate-expression-handler
548 ,(nth 1 var) nil)))) 552 ,(nth 1 var) nil))))
549 (setq gdb-var-changed t)) 553 (setq gdb-var-changed t))
550 (if (re-search-forward "Undefined command" nil t) 554 (if (search-forward "Undefined command" nil t)
551 (message-box "Watching expressions requires gdb 6.0 onwards") 555 (message-box "Watching expressions requires gdb 6.0 onwards")
552 (message "No symbol \"%s\" in current context." expr))))) 556 (message "No symbol \"%s\" in current context." expr)))))
553 557
@@ -1736,7 +1740,6 @@ static char *magick[] = {
1736 (setq mode-name "Frames") 1740 (setq mode-name "Frames")
1737 (setq buffer-read-only t) 1741 (setq buffer-read-only t)
1738 (use-local-map gdb-frames-mode-map) 1742 (use-local-map gdb-frames-mode-map)
1739 (font-lock-mode -1)
1740 (run-mode-hooks 'gdb-frames-mode-hook) 1743 (run-mode-hooks 'gdb-frames-mode-hook)
1741 (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba) 1744 (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
1742 'gdb-invalidate-frames 1745 'gdb-invalidate-frames
@@ -1899,7 +1902,7 @@ static char *magick[] = {
1899 (suppress-keymap map) 1902 (suppress-keymap map)
1900 (define-key map "\r" 'gdb-edit-register-value) 1903 (define-key map "\r" 'gdb-edit-register-value)
1901 (define-key map [mouse-2] 'gdb-edit-register-value) 1904 (define-key map [mouse-2] 'gdb-edit-register-value)
1902 (define-key map " " 'toggle-gdb-all-registers) 1905 (define-key map " " 'gdb-all-registers)
1903 (define-key map "q" 'kill-this-buffer) 1906 (define-key map "q" 'kill-this-buffer)
1904 map)) 1907 map))
1905 1908
@@ -1909,7 +1912,7 @@ static char *magick[] = {
1909\\{gdb-registers-mode-map}" 1912\\{gdb-registers-mode-map}"
1910 (kill-all-local-variables) 1913 (kill-all-local-variables)
1911 (setq major-mode 'gdb-registers-mode) 1914 (setq major-mode 'gdb-registers-mode)
1912 (setq mode-name "Registers:") 1915 (setq mode-name (if gdb-all-registers "Registers:All" "Registers:"))
1913 (setq buffer-read-only t) 1916 (setq buffer-read-only t)
1914 (use-local-map gdb-registers-mode-map) 1917 (use-local-map gdb-registers-mode-map)
1915 (run-mode-hooks 'gdb-registers-mode-hook) 1918 (run-mode-hooks 'gdb-registers-mode-hook)
@@ -1934,17 +1937,19 @@ static char *magick[] = {
1934 (special-display-frame-alist gdb-frame-parameters)) 1937 (special-display-frame-alist gdb-frame-parameters))
1935 (display-buffer (gdb-get-create-buffer 'gdb-registers-buffer)))) 1938 (display-buffer (gdb-get-create-buffer 'gdb-registers-buffer))))
1936 1939
1937(defun toggle-gdb-all-registers () 1940(defun gdb-all-registers ()
1938 "Toggle the display of floating-point registers." 1941 "Toggle the display of floating-point registers."
1939 (interactive) 1942 (interactive)
1940 (if gdb-all-registers 1943 (if gdb-all-registers
1941 (progn 1944 (progn
1942 (setq gdb-all-registers nil) 1945 (setq gdb-all-registers nil)
1943 (with-current-buffer (gdb-get-buffer 'gdb-registers-buffer) 1946 (with-current-buffer (gdb-get-create-buffer 'gdb-registers-buffer)
1944 (setq mode-name "Registers:"))) 1947 (setq mode-name "Registers:")))
1945 (setq gdb-all-registers t) 1948 (setq gdb-all-registers t)
1946 (with-current-buffer (gdb-get-buffer 'gdb-registers-buffer) 1949 (with-current-buffer (gdb-get-create-buffer 'gdb-registers-buffer)
1947 (setq mode-name "Registers:All"))) 1950 (setq mode-name "Registers:All")))
1951 (message (format "Display of floating-point registers %sabled"
1952 (if gdb-all-registers "en" "dis")))
1948 (gdb-invalidate-registers)) 1953 (gdb-invalidate-registers))
1949 1954
1950 1955
@@ -2758,7 +2763,7 @@ BUFFER nil or omitted means use the current buffer."
2758 (progn 2763 (progn
2759 (goto-char (point-min)) 2764 (goto-char (point-min))
2760 (if (and gdb-frame-address 2765 (if (and gdb-frame-address
2761 (re-search-forward gdb-frame-address nil t)) 2766 (search-forward gdb-frame-address nil t))
2762 (progn 2767 (progn
2763 (setq pos (point)) 2768 (setq pos (point))
2764 (beginning-of-line) 2769 (beginning-of-line)
@@ -2782,7 +2787,7 @@ BUFFER nil or omitted means use the current buffer."
2782 (with-current-buffer buffer 2787 (with-current-buffer buffer
2783 (save-excursion 2788 (save-excursion
2784 (goto-char (point-min)) 2789 (goto-char (point-min))
2785 (if (re-search-forward address nil t) 2790 (if (search-forward address nil t)
2786 (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))))) 2791 (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))))
2787 (if (not (equal gdb-frame-address "main")) 2792 (if (not (equal gdb-frame-address "main"))
2788 (with-current-buffer buffer 2793 (with-current-buffer buffer