[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el,v

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Nick Roberts <nickrob>  07/02/07 21:12:52

Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- gdb-ui.el   6 Feb 2007 03:40:33 -0000       1.202
+++ gdb-ui.el   7 Feb 2007 21:12:52 -0000       1.203
@@ -611,11 +611,10 @@
 The destination source line can be selected either by clicking with mouse-2
 on the fringe/margin or dragging the arrow with mouse-1 (default bindings)."
   (interactive "e")
-  (if gud-overlay-arrow-position
       (let ((start (event-start event))
-           (end  (event-end event))
-           (buffer (marker-buffer gud-overlay-arrow-position)) (line))
-       (if (not (string-match "Machine" mode-name))
+       (end (event-end event)))
+    (if gud-overlay-arrow-position
+       (let ((buffer (marker-buffer gud-overlay-arrow-position)) (line))
            (if (equal buffer (window-buffer (posn-window end)))
                (with-current-buffer buffer
                  (when (or (equal start end)
@@ -623,9 +622,11 @@
                                   (marker-position
                                    gud-overlay-arrow-position)))
                    (setq line (line-number-at-pos (posn-point end)))
-                   (gud-call (concat "until " (number-to-string line))))))
-         (if (equal (marker-buffer gdb-overlay-arrow-position)
-                    (window-buffer (posn-window end)))
+                 (gud-call (concat "until " (number-to-string line))))))))
+    (if gdb-overlay-arrow-position
+    (let ((buffer (marker-buffer gdb-overlay-arrow-position)))
+      (if (equal buffer (window-buffer (posn-window end)))
+         (with-current-buffer buffer
              (when (or (equal start end)
                        (equal (posn-point start)
                               (marker-position
@@ -633,7 +634,7 @@
                (save-excursion
                  (goto-line (line-number-at-pos (posn-point end)))
                  (forward-char 2)
-                 (gud-call (concat "until *%a")))))))))
+               (gud-call (concat "until *%a"))))))))))
 
 (defun gdb-mouse-jump (event)
   "Set execution address/line.
@@ -642,11 +643,10 @@
 Unlike gdb-mouse-until the destination address can be before the current
 line, and no execution takes place."
   (interactive "e")
-  (if gud-overlay-arrow-position
       (let ((start (event-start event))
-           (end  (event-end event))
-           (buffer (marker-buffer gud-overlay-arrow-position)) (line))
-       (if (not (string-match "Machine" mode-name))
+       (end (event-end event)))
+    (if gud-overlay-arrow-position
+       (let ((buffer (marker-buffer gud-overlay-arrow-position)) (line))
            (if (equal buffer (window-buffer (posn-window end)))
                (with-current-buffer buffer
                  (when (or (equal start end)
@@ -654,10 +654,13 @@
                                   (marker-position
                                    gud-overlay-arrow-position)))
                    (setq line (line-number-at-pos (posn-point end)))
-          (progn (gud-call (concat "tbreak " (number-to-string line)))
-                 (gud-call (concat "jump " (number-to-string line)))))))
-         (if (equal (marker-buffer gdb-overlay-arrow-position)
-                    (window-buffer (posn-window end)))
+                 (progn
+                   (gud-call (concat "tbreak " (number-to-string line)))
+                   (gud-call (concat "jump " (number-to-string line)))))))))
+    (if gdb-overlay-arrow-position
+       (let ((buffer (marker-buffer gdb-overlay-arrow-position)))
+         (if (equal buffer (window-buffer (posn-window end)))
+             (with-current-buffer buffer
              (when (or (equal start end)
                        (equal (posn-point start)
                               (marker-position
@@ -667,7 +670,7 @@
                  (forward-char 2)
                  (progn
                    (gud-call (concat "tbreak *%a"))
-                   (gud-call (concat "jump *%a"))))))))))
+                     (gud-call (concat "jump *%a")))))))))))
 
 (defcustom gdb-speedbar-auto-raise nil
   "If non-nil raise speedbar every time display of watch expressions is\