Merge from gnus--rel--5.10

[gnus] / lisp / compface.el

diff --git a/lisp/compface.el b/lisp/compface.el
index 0204ad3..c146c93 100644 (file)
--- a/lisp/compface.el
+++ b/lisp/compface.el
@@ -1,5 +1,6 @@
 ;;; compface.el --- functions for converting X-Face headers
-;; Copyright (C) 2002 Free Software Foundation, Inc.
+
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -18,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -30,21 +31,33 @@
   "Convert FACE to pbm.
 Requires the external programs `uncompface', and `icontopbm'.  On a
 GNU/Linux system these might be in packages with names like `compface'
-or `faces-xface' and `netpbm' or `libgr-progs', for instance.  See
-also `compface-xbm-p'."
+or `faces-xface' and `netpbm' or `libgr-progs', for instance."
   (with-temp-buffer
     (insert face)
-    (and (eq 0 (apply #'call-process-region (point-min) (point-max)
-                     "uncompface"
-                     'delete '(t nil) nil))
-        (progn
-          (goto-char (point-min))
-          (progn (insert "/* Width=48, Height=48 */\n") t)
-          (eq 0 (call-process-region (point-min) (point-max)
-                                     "icontopbm"
-                                     'delete '(t nil))))
-        (buffer-string))))
+    (let ((coding-system-for-read 'raw-text)
+         ;; At least "icontopbm" doesn't work with Windows because
+         ;; the line-break code is converted into CRLF by default.
+         (coding-system-for-write 'binary))
+      (and (eq 0 (apply 'call-process-region (point-min) (point-max)
+                       "uncompface"
+                       'delete '(t nil) nil))
+          (progn
+            (goto-char (point-min))
+            (insert "/* Width=48, Height=48 */\n")
+            ;; I just can't get "icontopbm" to work correctly on its
+            ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
+            ;; files.
+            (if (not (featurep 'xemacs))
+                (eq 0 (call-process-region (point-min) (point-max)
+                                           "icontopbm"
+                                           'delete '(t nil)))
+              (shell-command-on-region (point-min) (point-max)
+                                       "icontopbm | pnmnoraw"
+                                       (current-buffer) t)
+              t))
+          (buffer-string)))))
 
 (provide 'compface)
 
+;;; arch-tag: f9c78e84-98c0-4142-9682-8ba4cf4c3441
 ;;; compface.el ends here