Accommodate change of disassemble output in GDB 7.1.

This commit is contained in:
Nick Roberts 2010-02-19 17:55:31 +13:00
parent 055e4eea01
commit 8cfae03d19
2 changed files with 22 additions and 11 deletions

View file

@ -1,3 +1,8 @@
2010-02-19 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-assembler-handler): Accommodate change
of disassemble output in GDB 7.1.
2010-02-19 Glenn Morris <rgm@gnu.org>
* progmodes/f90.el (f90-electric-insert): Give it a delete-selection

View file

@ -3573,18 +3573,24 @@ BUFFER nil or omitted means use the current buffer."
(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))