Synch with Oort Gnus (my changes).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c886201..706602c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-treat-display-xface): Don't use
+       `shell-command-to-string' when compiling.
+       (gnus-treat-display-grey-xface): Ditto.
+
 2002-02-13  Paul Jarc  <prj@po.cwru.edu>
 
        * nnmaildir.el (nnmaildir--article-count): If the group is
@@ -58,7 +64,7 @@
        (nnrss-request-article): Use it.
 
 2002-02-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       
+
        * gnus.el: Add article-unsplit-urls.
        * gnus-sum.el: Ditto.
        * gnus-art.el (gnus-treat-strip-cr): New variable.
@@ -77,7 +83,7 @@
        * gnus-util.el (gnus-split-references): Allow (broken) Message-IDs
        with internal whitespace.
        (gnus-parent-id): Ditto.
-       
+
 2002-02-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-art.el (gnus-article-treat-body-boundary): Add
@@ -104,7 +110,7 @@
        (gnus-configure-posting-styles): Remove trailing newspaces.
 
 2002-02-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       
+
        * gnus-sum.el (gnus-articles-to-read): Fetch all if the predicate
        is non-nil.
 
@@ -158,7 +164,7 @@
        forward-buffer.
 
        * rfc2047.el (rfc2047-decode-region): Don't decode us-ascii characters.
-       
+
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (gnus-article-followup-with-original): Mark with
@@ -175,14 +181,14 @@
 
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
-       * nnfolder.el (nnfolder-open-marks): 
+       * nnfolder.el (nnfolder-open-marks):
 
        * nnml.el (nnml-open-marks): Message when done.  From David
        Edmondson <dme@sun.com>.
 
 2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       
-       * imap.el (imap-anonymous-auth): Fix typo. 
+
+       * imap.el (imap-anonymous-auth): Fix typo.
        From: Steinar Bang <sb@dod.no>
 
        * gnus-cache.el (gnus-cache-braid-nov): Use set-buffer instead of
@@ -200,7 +206,7 @@
 
 2002-02-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-       * gnus-cache.el (gnus-summary-insert-cached-articles): 
+       * gnus-cache.el (gnus-summary-insert-cached-articles):
        (gnus-summary-limit-include-cached): gnus-newsgroup-cached is sorted.
 
        * gnus-group.el (gnus-group-mark-article-read): Nreverse
@@ -213,9 +219,9 @@
        gnus-newsgroup-unselected are sorted. Use gnus-sorted-union.
        (gnus-build-all-threads): Use gnus-add-to-sorted-list.
        (gnus-update-read-articles): UNREAD is sorted.
-       (gnus-newsgroup-unreads, gnus-newsgroup-unselected) 
-       (gnus-newsgroup-marked, gnus-newsgroup-cached) 
-       (gnus-newsgroup-expirable, gnus-newsgroup-downloadable) 
+       (gnus-newsgroup-unreads, gnus-newsgroup-unselected)
+       (gnus-newsgroup-marked, gnus-newsgroup-cached)
+       (gnus-newsgroup-expirable, gnus-newsgroup-downloadable)
        (gnus-newsgroup-dormant): Require sorted.
 
        * gnus-dired.el (gnus-dired-find-file-mailcap): Correctly handle
@@ -8909,7 +8915,7 @@
     Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-       
+
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9e94d1f..180d6b2 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1120,7 +1120,8 @@ See Info node `(gnus)Customizing Articles' for details."
 (put 'gnus-treat-overstrike 'highlight t)
 
 (defcustom gnus-treat-display-xface
-  (and (or (and (fboundp 'image-type-available-p)
+  (and (not noninteractive)
+       (or (and (fboundp 'image-type-available-p)
                (image-type-available-p 'xbm)
                (string-match "^0x" (shell-command-to-string "uncompface")))
           (and (featurep 'xemacs)
@@ -1163,7 +1164,8 @@ even if you are using Emacs 21+.  It has no effect on XEmacs."
 smiley functions are not overridden by `smiley').")
 
 (defcustom gnus-treat-display-grey-xface
-  (and (string-match "^0x" (shell-command-to-string "uncompface"))
+  (and (not noninteractive)
+       (string-match "^0x" (shell-command-to-string "uncompface"))
        t)
   "Display grey X-Face headers.
 Valid values are nil, t."