(nntp-async-trigger): Fix authinfo in asynchronous prefetch.

[gnus] / lisp / gnus-xmas.el

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index fd6ea7f..a4c5a4b 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -442,6 +442,9 @@ call it with the value of the `gnus-data' text property."
          (list 'funcall fval)
        (cons 'progn (cdr (cdr fval))))))
 
+  (unless (fboundp 'match-string-no-properties)
+    (fset 'match-string-no-properties 'match-string))
+
   (fset 'gnus-x-color-values
        (if (fboundp 'x-color-values)
            'x-color-values
@@ -847,21 +850,19 @@ XEmacs compatibility workaround."
 
 (defun gnus-group-icon-create-glyph (substring pixmap)
   "Create a glyph for insertion into a group line."
-  (and
-   gnus-group-running-xemacs
-   (or
-    (cdr-safe (assoc pixmap gnus-group-icon-cache))
-    (let* ((glyph (make-glyph
-                  (list
-                   (cons 'x
-                         (expand-file-name pixmap gnus-xmas-glyph-directory))
-                   (cons 'mswindows
-                         (expand-file-name pixmap gnus-xmas-glyph-directory))
-                   (cons 'tty substring)))))
-      (setq gnus-group-icon-cache
-           (cons (cons pixmap glyph) gnus-group-icon-cache))
-      (set-glyph-face glyph 'default)
-      glyph))))
+  (or
+   (cdr-safe (assoc pixmap gnus-group-icon-cache))
+   (let* ((glyph (make-glyph
+                 (list
+                  (cons 'x
+                        (expand-file-name pixmap gnus-xmas-glyph-directory))
+                  (cons 'mswindows
+                        (expand-file-name pixmap gnus-xmas-glyph-directory))
+                  (cons 'tty substring)))))
+     (setq gnus-group-icon-cache
+          (cons (cons pixmap glyph) gnus-group-icon-cache))
+     (set-glyph-face glyph 'default)
+     glyph)))
 
 (provide 'gnus-xmas)