diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 15 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22db4c3fe86..7b43346100c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2008-01-31 Jason Rumney <jasonr@gnu.org> + + * term/w32-win.el (image-library-alist): Prefer libxpm.dll. + +2008-01-30 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-var-set-format-regexp): New constant. + (gdb-var-set-format-handler): New function. + (gdb-var-set-format): Use it. + 2008-01-31 Juanma Barranquero <lekktu@gmail.com> * linum.el (linum-unload-function): New function. diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 3e29f9732b2..21525891d37 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -886,13 +886,22 @@ type_changed=\".*?\".*?}") (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list)) (varnum (car var))) (gdb-enqueue-input - (list + (list (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba) (concat "server interpreter mi \"-var-set-format " varnum " " format "\"\n") (concat "-var-set-format " varnum " " format "\n")) - 'ignore)) - (gdb-var-update-1))) + `(lambda () (gdb-var-set-format-handler ,varnum)))))) + +(defconst gdb-var-set-format-regexp + "format=\"\\(.*?\\)\",.*value=\"\\(.*?\\)\"") + +(defun gdb-var-set-format-handler (varnum) + (goto-char (point-min)) + (if (re-search-forward gdb-var-set-format-regexp nil t) + (let ((var (assoc varnum gdb-var-list))) + (setcar (nthcdr 4 var) (match-string 2)) + (gdb-var-update-1)))) (defun gdb-var-delete-1 (varnum) (gdb-enqueue-input diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 066093f3a32..fd5ccc0acee 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -1111,7 +1111,7 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')." ;;; Set default known names for image libraries (setq image-library-alist - '((xpm "xpm4.dll" "libXpm-nox4.dll" "libxpm.dll") + '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll") (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") (tiff "libtiff3.dll" "libtiff.dll") |