emacs: lisp/gdb-ui.el comparison

comparison lisp/gdb-ui.el @ 51693:04628db4db1a

(gdb-display-number-end): Don't re-initialise local variables to preserve array slices. (gdb-array-slice): Rename gdb-mouse-array-slice. (gdb-array-slice): Interactive function bound to "\r" for text terminals. (gdb-view-source): Rename gdb-view-source-function. Set uninitialised variables (defvars) to nil.

author	Nick Roberts <nickrob@snap.net.nz>
date	Sun, 29 Jun 2003 13:52:50 +0000
parents	cef03ad7bf21
children	10f90558dc89

comparison

equal deleted inserted replaced

-:f7d85dcfebeb
+:04628db4db1a
 (defun gdb-display-begin (ignored)
 (gdb-set-output-sink 'emacs)
 (gdb-clear-partial-output)
 (setq gdb-display-in-progress t))
-(defvar gdb-expression-buffer-name)
+(defvar gdb-expression-buffer-name nil)
-(defvar gdb-display-number)
+(defvar gdb-display-number nil)
-(defvar gdb-dive-display-number)
+(defvar gdb-dive-display-number nil)
 (defun gdb-display-number-end (ignored)
 (set-buffer (gdb-get-buffer 'gdb-partial-output-buffer))
 (setq gdb-display-number (buffer-string))
 (setq gdb-expression-buffer-name
 	    (switch-to-buffer
 	     (set-buffer (get-buffer-create gdb-expression-buffer-name)))
 	    (gdb-expressions-mode)
 	    (setq gdb-dive-display-number number)))
 (set-buffer (get-buffer-create gdb-expression-buffer-name))
-(gdb-expressions-mode)
+(if (display-graphic-p)
-(if (and (display-graphic-p) (not gdb-dive))
 	  (catch 'frame-exists
 	    (dolist (frame (frame-list))
 	      (if (string-equal (frame-parameter frame 'name)
 				gdb-expression-buffer-name)
 		  (throw 'frame-exists nil)))
+	    (gdb-expressions-mode)
 	    (make-frame `((height . ,gdb-window-height)
 			  (width . ,gdb-window-width)
 			  (tool-bar-lines . nil)
 			  (menu-bar-lines . nil)
 			  (minibuffer . nil))))
+	(gdb-expressions-mode)
 	(gdb-display-buffer (get-buffer gdb-expression-buffer-name)))))
 (set-buffer (gdb-get-buffer 'gdb-partial-output-buffer))
 (setq gdb-dive nil))
-(defvar gdb-nesting-level)
+(defvar gdb-nesting-level nil)
-(defvar gdb-expression)
+(defvar gdb-expression nil)
-(defvar gdb-point)
+(defvar gdb-point nil)
-(defvar gdb-annotation-arg)
+(defvar gdb-annotation-arg nil)
 (defun gdb-delete-line ()
 "Delete the current line."
 (delete-region (line-beginning-position) (line-beginning-position 2)))
 			   'mouse-face 'highlight)
 	(put-text-property (- (point) (- end start)) (- (point) 1)
 			   'local-map gdb-dive-map)))
 (delete-region start end)))
-(defvar gdb-values)
+(defvar gdb-values nil)
 (defun gdb-array-format ()
 (while (re-search-forward "##" nil t)
 ;; keep making recursive calls...
 (if (looking-at "array-section-begin")
 	  ;;else get rid of ##array-section-end etc
 	  (gdb-delete-line)
 	  (setq gdb-nesting-level (- gdb-nesting-level 1))
 	  (gdb-array-format)))))
-(defvar gdb-array-start)
+(defvar gdb-array-start nil)
-(defvar gdb-array-stop)
+(defvar gdb-array-stop nil)
 (defvar gdb-array-slice-map
 (let ((map (make-sparse-keymap)))
-(define-key map [mouse-2] 'gdb-array-slice)
+(define-key map "\r" 'gdb-array-slice)
+(define-key map [mouse-2] 'gdb-mouse-array-slice)
 map))
-(defun gdb-array-slice (event)
+(defun gdb-mouse-array-slice (event)
 "Select an array slice to display."
 (interactive "e")
 (mouse-set-point event)
+(gdb-array-slice))
+(defun gdb-array-slice ()
+(interactive)
 (save-excursion
 (let ((n -1) (stop 0) (start 0) (point (point)))
 (beginning-of-line)
 (while (search-forward "[" point t)
 	(setq n (+ n 1)))
 (aset gdb-array-start n start)
 (setq stop (string-to-int (read-string "Stop index: ")))
 (aset gdb-array-stop n stop)))
 (gdb-array-format1))
-(defvar gdb-display-string)
+(defvar gdb-display-string nil)
-(defvar gdb-array-size)
+(defvar gdb-array-size nil)
 (defun gdb-array-format1 ()
 (setq gdb-display-string "")
 (let ((buffer-read-only nil))
 (delete-region (point-min) (point-max))
 (define-key gud-menu-map [gdb-many-windows]
 (menu-bar-make-toggle gdb-many-windows gdb-many-windows
 			"Display other windows" "Many Windows %s"
 			"Display locals, stack and breakpoint information"))
 (let ((menu (make-sparse-keymap "GDB-Frames")))
 (define-key gud-menu-map [frames]
 `(menu-item "GDB-Frames" ,menu :visible (eq gud-minor-mode 'gdba)))
 (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
 (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
 (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
 ;	       :help "Display both source and assembler"
 ;	       :button (:radio . (eq gdb-selected-view 'both))))
 (define-key menu [assembler] '(menu-item "Assembler" gdb-view-assembler
 	       :help "Display assembler only"
 	       :button (:radio . (eq gdb-selected-view 'assembler))))
-(define-key menu [source] '(menu-item "Source" gdb-view-source
+(define-key menu [source] '(menu-item "Source" gdb-view-source-function
 	       :help "Display source only"
 	       :button (:radio . (eq gdb-selected-view 'source)))))
 (defun gdb-frame-gdb-buffer ()
 (interactive)
 (gdb-display-buffer
 (gdb-get-create-buffer 'gdba)))
 (defvar gdb-main-file nil "Source file from which program execution begins.")
-(defun gdb-view-source()
+(defun gdb-view-source-function ()
 (interactive)
 (if gdb-view-source
 (if gud-last-last-frame
 	  (set-window-buffer gdb-source-window
 			     (gud-find-file (car gud-last-last-frame)))

Mercurial > emacs

comparison lisp/gdb-ui.el @ 51693:04628db4db1a