[Emacs-diffs] Changes to emacs/lisp/term/x-win.el,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        07/11/22 08:35:20

Index: x-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- x-win.el    9 Nov 2007 19:37:03 -0000       1.217
+++ x-win.el    22 Nov 2007 08:35:20 -0000      1.218
@@ -2672,15 +2672,18 @@
 
 (defun x-gtk-map-stock (file)
   "Map icon with file name FILE to a Gtk+ stock name, using `x-gtk-stock-map'."
+  (if (stringp file)
   (let* ((file-sans (file-name-sans-extension file))
         (key (and (string-match "/\\([^/]+/[^/]+/[^/]+$\\)" file-sans)
                   (match-string 1 file-sans)))
         (value))
     (mapc (lambda (elem)
            (let ((assoc (if (symbolp elem) (symbol-value elem) elem)))
-             (or value (setq value (assoc-string (or key file-sans) assoc)))))
+                 (or value (setq value (assoc-string (or key file-sans)
+                                                     assoc)))))
            icon-map-list)
-    (and value (cdr value))))
+       (and value (cdr value)))
+    nil))
 
 (provide 'x-win)