diff options
| author | Nick Roberts | 2008-08-23 15:50:06 +0000 |
|---|---|---|
| committer | Nick Roberts | 2008-08-23 15:50:06 +0000 |
| commit | e2cb56be555404f08bbe0626c1b598377f8b7770 (patch) | |
| tree | ca32f9aa9a8191e57fb78f2569c8f41a3e99d9b0 | |
| parent | 7131d2616670d2541e4ea165c98a57038be5da87 (diff) | |
| download | emacs-e2cb56be555404f08bbe0626c1b598377f8b7770.tar.gz emacs-e2cb56be555404f08bbe0626c1b598377f8b7770.zip | |
(x-gtk-map-stock): Don't let the tool bar destroy
match data in process filters.
| -rw-r--r-- | lisp/term/x-win.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 1cfdeaf084b..a8813aeb917 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -1669,16 +1669,17 @@ If you don't want stock icons, set the variable to nil." | |||
| 1669 | (defun x-gtk-map-stock (file) | 1669 | (defun x-gtk-map-stock (file) |
| 1670 | "Map icon with file name FILE to a Gtk+ stock name, using `x-gtk-stock-map'." | 1670 | "Map icon with file name FILE to a Gtk+ stock name, using `x-gtk-stock-map'." |
| 1671 | (if (stringp file) | 1671 | (if (stringp file) |
| 1672 | (let* ((file-sans (file-name-sans-extension file)) | 1672 | (save-match-data |
| 1673 | (key (and (string-match "/\\([^/]+/[^/]+/[^/]+$\\)" file-sans) | 1673 | (let* ((file-sans (file-name-sans-extension file)) |
| 1674 | (match-string 1 file-sans))) | 1674 | (key (and (string-match "/\\([^/]+/[^/]+/[^/]+$\\)" file-sans) |
| 1675 | (value)) | 1675 | (match-string 1 file-sans))) |
| 1676 | (mapc (lambda (elem) | 1676 | (value)) |
| 1677 | (let ((assoc (if (symbolp elem) (symbol-value elem) elem))) | 1677 | (mapc (lambda (elem) |
| 1678 | (or value (setq value (assoc-string (or key file-sans) | 1678 | (let ((assoc (if (symbolp elem) (symbol-value elem) elem))) |
| 1679 | assoc))))) | 1679 | (or value (setq value (assoc-string (or key file-sans) |
| 1680 | icon-map-list) | 1680 | assoc))))) |
| 1681 | (and value (cdr value))) | 1681 | icon-map-list) |
| 1682 | (and value (cdr value)))) | ||
| 1682 | nil)) | 1683 | nil)) |
| 1683 | 1684 | ||
| 1684 | (provide 'x-win) | 1685 | (provide 'x-win) |