emacs-27 ca6a53d: Don't default to showing X-Faces externally in Gnus

[Lars Ingebrigtsen]

branch: emacs-27
commit ca6a53d3bc91d6fef9aa872495ab74298ce91bee
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Don't default to showing X-Faces externally in Gnus
    
    * lisp/gnus/gnus-art.el (gnus-article-x-face-command): It's seldom
    useful to display the face in an external command, so don't ever
    default to that.  This also fixes the problem of Emacs running as
    a server in mixed graphical/non-graphical environments.
---
 lisp/gnus/gnus-art.el | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5745bf1..a937e23 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -268,21 +268,15 @@ This can also be a list of the above values."
   :type 'plist
   :group 'gnus-article-hiding)
 
-;; Fixme: This isn't the right thing for mixed graphical and non-graphical
-;; frames in a session.
-(defcustom gnus-article-x-face-command
-  (if (gnus-image-type-available-p 'pbm)
-      'gnus-display-x-face-in-from
-    "{ echo \
-'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
-; uncompface; } | icontopbm | display -")
+(defcustom gnus-article-x-face-command (and (gnus-image-type-available-p 'pbm)
+                                           'gnus-display-x-face-in-from)
   "String or function to be executed to display an X-Face header.
 If it is a string, the command will be executed in a sub-shell
 asynchronously.  The compressed face will be piped to this command."
   :type '(choice string
                 (function-item gnus-display-x-face-in-from)
                 function)
-  :version "21.1"
+  :version "27.1"
   :group 'gnus-picon
   :group 'gnus-article-washing)