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

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jan Djärv <jhd>        07/11/22 08:41:59

Index: x-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.200.2.5
retrieving revision 1.200.2.6
diff -u -b -r1.200.2.5 -r1.200.2.6
--- x-win.el    1 Oct 2007 06:01:58 -0000       1.200.2.5
+++ x-win.el    22 Nov 2007 08:41:59 -0000      1.200.2.6
@@ -2603,15 +2603,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))
 
 ;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
 ;;; x-win.el ends here