[Emacs-diffs] /srv/bzr/emacs/trunk r99533: Accommodate change of disassemble output in GDB 7.1.

[Nick Roberts]

------------------------------------------------------------
revno: 99533
committer: Nick Roberts <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-19 17:55:31 +1300
message:
  Accommodate change of disassemble output in GDB 7.1.
modified:
  lisp/ChangeLog
  lisp/progmodes/gdb-ui.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-19 02:36:10 +0000
+++ b/lisp/ChangeLog    2010-02-19 04:55:31 +0000
@@ -1,3 +1,8 @@
+2010-02-19  Nick Roberts  <address@hidden>
+
+       * progmodes/gdb-ui.el (gdb-assembler-handler): Accommodate change
+       of disassemble output in GDB 7.1.
+
 2010-02-19  Glenn Morris  <address@hidden>
 
        * progmodes/f90.el (f90-electric-insert): Give it a delete-selection

=== modified file 'lisp/progmodes/gdb-ui.el'
--- a/lisp/progmodes/gdb-ui.el  2010-01-14 18:59:31 +0000
+++ b/lisp/progmodes/gdb-ui.el  2010-02-19 04:55:31 +0000
@@ -3573,18 +3573,24 @@
   (setq gdb-pending-triggers
        (delq 'gdb-invalidate-assembler
              gdb-pending-triggers))
-     (let ((buf (gdb-get-buffer 'gdb-assembler-buffer)))
-       (and buf
-           (with-current-buffer buf
-             (let* ((window (get-buffer-window buf 0))
-                    (p (window-point window))
-                   (buffer-read-only nil))
-               (erase-buffer)
-               (insert-buffer-substring (gdb-get-buffer-create
+  (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer)))
+    (with-current-buffer buf
+      (goto-char (point-min))
+      ;; The disassemble command in GDB 7.1 onwards displays an overlay arrow.
+      (while (re-search-forward "\\(^   0x\\|=> 0x\\)" nil t)
+       (replace-match "0x" nil nil))))
+  (let ((buf (gdb-get-buffer 'gdb-assembler-buffer)))
+    (and buf
+        (with-current-buffer buf
+          (let* ((window (get-buffer-window buf 0))
+                 (p (window-point window))
+                 (buffer-read-only nil))
+            (erase-buffer)
+            (insert-buffer-substring (gdb-get-buffer-create
                                          'gdb-partial-output-buffer))
-               (set-window-point window p)))))
-     ;; put customisation here
-     (gdb-assembler-custom))
+            (set-window-point window p)))))
+  ;; put customisation here
+  (gdb-assembler-custom))
 
 (defun gdb-assembler-custom ()
   (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))