From: yamaoka <yamaoka>
Date: Tue, 12 Oct 2004 22:35:59 +0000 (+0000)
Subject: Synch to No Gnus 200410122226.
X-Git-Tag: t-gnus-6_17_4-quimby-~716
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7ff2135cf6b3f81f492c7dd59d5afcf86f222dd9;p=elisp%2Fgnus.git-

Synch to No Gnus 200410122226.
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index fed0626..df85cba 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* compface.el: Move the version of ELisp-based uncompface program
+	from the lisp directory because of the copyright problem.
+
 2004-09-27  Simon Josefsson  <jas@extundo.com>
 
 	* hashcash.el: Move to ../lisp/.
diff --git a/contrib/compface.el b/contrib/compface.el
new file mode 100644
index 0000000..45a5709
--- /dev/null
+++ b/contrib/compface.el
@@ -0,0 +1,748 @@
+;;; compface.el --- functions for converting X-Face headers
+;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;	TAKAI Kousuke <tak@kmc.gr.jp>
+;; Keywords: news
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; 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.
+
+;;; Commentary:
+
+;;; Code:
+
+(defgroup compface nil
+  "X-Face image conversion."
+  :group 'extensions)
+
+(defcustom uncompface-use-external (and (not noninteractive)
+					(executable-find "uncompface")
+					(executable-find "icontopbm")
+					'undecided)
+  "*Specify which of the internal or the external decoder should be used.
+nil means to use the internal ELisp-based uncompface program.  t means
+to use the external decoder.  In the later case, you need to have the
+external `uncompface' and `icontopbm' programs installed.  The default
+value is nil if those external programs aren't available, otherwise
+`undecided' which means to determine it by checking whether the host
+machine is slow.  See also `uncompface-use-external-threshold'.  You
+can skip that check by setting this value as nil or t explicitly."
+  :type '(choice (const :tag "Use the internal decoder" nil)
+		 (const :tag "Use the external decoder" t)
+		 (const :tag "Autodetection" undecided))
+  :group 'compface)
+
+(defcustom uncompface-use-external-threshold 0.1
+  "*Number of seconds to check whether the host machine is slow.
+If the host takes time larger than this value for decoding an X-Face
+using the internal ELisp-based uncompface program, it will be changed
+to using the external `uncompface' and `icontopbm' programs if they
+are available.  Note that the measurement may never be exact."
+  :type 'number
+  :group 'compface)
+
+(eval-when-compile
+  (defmacro uncompface-float-time (&optional specified-time)
+    (if (fboundp 'float-time)
+	`(float-time ,specified-time)
+      `(let ((time (or ,specified-time (current-time))))
+	 (+ (* (car time) 65536.0)
+	    (cadr time)
+	    (cond ((consp (setq time (cddr time)))
+		   (/ (car time) 1000000.0))
+		  (time
+		   (/ time 1000000.0))
+		  (t
+		   0)))))))
+
+(defun uncompface (face)
+  "Convert FACE to pbm.
+If `uncompface-use-external' is t, it 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."
+  (cond ((eq uncompface-use-external nil)
+	 (uncompface-internal face))
+	((eq uncompface-use-external t)
+	 (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))
+		  (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))))
+	(t
+	 (let* ((gc-cons-threshold (eval '(lsh -1 -1)))
+		(start (current-time)))
+	   (prog1
+	       (uncompface-internal face)
+	     (setq uncompface-use-external
+		   (and (> (- (uncompface-float-time (current-time))
+			      (uncompface-float-time start))
+			   uncompface-use-external-threshold)
+			(executable-find "uncompface")
+			(executable-find "icontopbm")
+			t))
+	     (message "Setting `uncompface-use-external' to `%s'"
+		      uncompface-use-external))))))
+
+;; The following section is a bug-for-bug compatible version of
+;; `uncompface' program entirely implemented in Emacs-Lisp.
+
+(eval-when-compile
+  ;; The size of 48x48 is actually hard-coded into the code itself,
+  ;; so you cannot simply change those values.  So we hard-code
+  ;; them into the compiled code.
+  (defconst uncompface-width 48
+    "Width of X-Face bitmap image.")
+  (defconst uncompface-height 48
+    "Height of X-Face bitmap image.")
+
+  ;; Again, this is also hard-coded into the compiled code.
+  (defconst uncompface-guesses
+    (mapcar (lambda (x)
+	      (mapcar (lambda (x)
+			(let ((vector (make-vector (length x) nil))
+			      (i 0))
+			  (while x
+			    (or (zerop (car x))
+				(aset vector i t))
+			    (setq x (cdr x)
+				  i (1+ i)))
+			  vector))
+		      x))
+	    '((;; g_00
+	       (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		1 1 1 0 0 0 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 1 0 1 0 0 0 1 0 1 1 1
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 1
+		0 0 0 0 1 1 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 1 1 0 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1
+		0 1 0 0 0 1 0 1 0 0 1 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1
+		0 0 0 0 0 0 0 1 0 0 1 1 1 1 1 1
+		1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1
+		1 0 0 0 0 0 0 0 1 1 0 0 1 0 0 1
+		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 1 1 0 1 1 0 0 0 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 0 1 0 1 0 0
+		0 0 0 0 0 1 1 1 0 0 0 1 1 1 1 1
+		0 1 0 1 0 1 1 1 0 1 0 0 0 1 1 1
+		1 1 0 1 0 1 1 1 0 0 1 1 1 1 0 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 1 1 1 1 1 0 0 0 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		1 0 0 1 1 0 1 1 1 1 0 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 1 1 1 1 1 0 0 0 1 1 1 0 1
+		0 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 0 0 0 1 1 1 1 1
+		0 0 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		0 0 0 0 0 0 1 1 0 0 0 1 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
+		1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 0 1 1 1 1 0 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 0 1 0 0 1 1 1 1
+		1 1 0 1 0 1 1 1 0 0 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 0 0 1 1 1 1 0 1 1 1 1 1 1
+		0 1 0 1 0 1 1 0 0 0 1 0 0 1 0 1
+		0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1
+		1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1
+		0 1 0 1 1 1 1 1 0 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1
+		0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 1 1 1 1 0 1 0 0 0 1 0
+		0 0 0 0 1 0 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		0 0 0 1 1 0 0 0 1 1 0 1 0 1 1 1
+		1 0 0 1 0 1 0 0 0 1 1 1 0 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1
+		0 0 0 1 1 1 1 1 1 0 1 1 0 1 1 1
+		0 0 0 0 1 1 0 0 0 0 0 0 0 1 1 1
+		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 1 1 1 1 0 0 0 1 1 1 1 1
+		1 0 0 0 0 1 0 0 1 0 0 0 1 1 1 1
+		0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 1
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 1
+		0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0
+		0 0 0 0 0 1 0 1 0 0 0 0 0 1 0 0
+		0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 0 0 1 1 1 1 1 1 0 0 0 1 1 1 1
+		0 1 0 0 1 0 1 0 0 1 0 0 0 0 0 0
+		0 1 0 1 1 1 1 1 0 1 0 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
+		1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1
+		1 1 0 1 0 1 1 1 0 1 0 1 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 0 1 1 1 0 1 1 1
+		1 1 0 1 1 1 1 1 0 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 0 1 0 0 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 0 0 1 1 1 0 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
+		0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 0 0 1 1 0 1 0 0 0 0 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1
+		0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 0
+		0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0
+		0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 0
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+		0 0 0 0 1 1 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0
+		1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0
+		0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 1
+		0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 1
+		1 0 1 0 1 1 1 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+		0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0
+		0 1 0 0 0 1 1 0 0 0 0 0 1 1 0 0
+		0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
+		1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 1 1 1 0 0 0 1 0 1 0 1
+		1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 1 1 1 1 1 1 1 0 1 0 1 1 1 1 1
+		1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 0 0 1 1 1 1 1 0
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
+		1 0 0 1 0 1 0 1 0 1 0 0 1 1 1 1
+		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1
+		0 0 1 0 0 1 0 1 0 0 0 0 1 1 1 0
+		0 0 0 0 1 1 0 1 0 0 0 0 1 1 0 1
+		0 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		1 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 0
+		0 0 0 0 0 1 0 0 0 1 0 0 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1
+		0 1 0 0 0 1 1 1 1 1 1 0 1 1 0 1
+		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 1 0 1 1 1 1
+		1 1 0 1 1 0 0 0 0 1 0 1 1 1 1 1
+		0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		1 1 0 1 1 1 1 1 0 1 0 1 1 1 1 1
+		0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 1
+		1 0 0 1 0 1 0 0 0 0 0 0 1 1 0 1
+		0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1
+		0 1 0 0 0 1 1 0 0 1 0 1 0 1 1 1
+		0 0 0 0 0 0 0 1 0 0 0 0 1 1 0 1
+		0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0
+		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1
+		0 1 0 0 0 1 1 1 0 1 1 0 1 1 0 0
+		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 0 1 1 0 1 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0
+		0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0
+		1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 1
+		0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		0 0 0 0 1 1 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 1 0 0 0 0 1 0 0 1 0 0
+		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
+		0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 1 1 0 0 0 1 0 0 1 1 0
+		1 1 0 0 1 1 1 1 0 0 0 0 0 1 0 1
+		1 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
+		1 1 0 1 1 1 1 1 1 1 0 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 1 0 1 1 1 0 1 0 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 0 1 1 0 0 0 0 0 1 0 0 1
+		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 0 1 0 1 0 0 0 1 0 0 0
+		1 0 1 0 0 1 1 1 0 1 1 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 0 0 0 0 0 1 0 0
+		1 1 0 1 1 1 1 1 0 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 0 1 1 1 0 0 1 1 0
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 0 1 1 0 0
+		1 0 0 0 1 1 1 1 0 1 0 0 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 0 0 1 1 1 1
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 1 0 1 1 1 1 0 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 1 1 0 0 0 0 1 1 0 0
+		1 0 0 1 1 1 0 1 0 0 0 0 1 1 1 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
+	       ;; g_10
+	       (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0
+		1 1 1 1 0 0 1 1 0 1 0 1 1 1 1 1
+		1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0
+		0 0 0 1 0 1 1 1 1 0 0 1 1 1 1 1
+		0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 1
+		0 0 0 0 0 1 0 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0
+		0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
+		0 0 1 1 0 0 1 1 1 1 0 1 0 1 1 1
+		0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 1
+		0 1 0 1 1 1 1 1 0 0 1 1 1 1 1 1
+		0 0 0 1 0 1 1 1 0 0 1 1 0 0 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0
+		0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0
+		0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0
+		0 0 0 1 0 0 0 1 0 1 0 1 0 1 1 1
+		0 0 0 0 0 1 0 1 0 0 1 0 0 1 0 1
+		0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 1
+		0 0 1 1 0 1 0 1 1 0 1 1 1 1 1 1
+		1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 1 1 1 0 1 1 0 1 1 1 1
+		0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0
+		0 0 0 1 0 1 1 1 0 0 0 0 0 1 1 0
+		1 1 1 1 1 0 1 0 1 1 1 0 1 0 0 0
+		0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1
+		0 0 0 1 1 1 1 1 1 0 0 1 1 1 1 1
+		0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
+	       ;; g_20
+	       (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1
+		0 1 0 0 0 0 1 1 0 0 1 0 1 1 1 0
+		1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1)
+	       ;; g_40
+	       (0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 1 0 0 1 1 1 0
+		1 1 1 0 0 1 0 0 0 0 0 0 1 1 0 1
+		0 0 0 1 0 0 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 1 0 0 0 1 0 0 0 1 0 0 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0
+		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
+		1 0 1 0 1 1 1 0 1 0 1 0 1 1 1 1
+		0 1 0 0 0 1 0 1 0 1 1 1 1 1 1 1
+		1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1
+		0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+		0 0 0 1 1 1 0 0 1 1 0 1 1 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 1
+		0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0
+		0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
+		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
+		0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 1 1 1 0 0 1 1 1 1 1 1 1 1
+		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 1
+		0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
+		0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1
+		0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1
+		0 0 0 0 0 1 0 1 0 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
+		0 1 0 0 0 0 0 1 0 1 0 1 0 1 1 1
+		0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 1 0 1 0 1 1 1 0 1 1 1
+		0 0 0 0 1 1 0 1 0 1 0 1 1 1 1 1
+		0 1 0 0 1 1 0 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+		0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 1
+		0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1
+		0 0 0 0 0 1 0 1 0 1 1 1 1 1 0 1
+		0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 1
+		0 0 1 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 0 0 0 0 0 1 0 1 0 0 0 0
+		0 0 0 0 1 1 0 1 1 1 1 1 1 1 0 1
+		0 0 0 0 0 1 0 0 0 0 0 0 1 1 1 1
+		0 0 0 0 0 1 1 1 0 0 0 1 1 1 1 1
+		0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1
+		0 0 0 0 1 1 0 1 0 1 1 1 1 1 1 1
+		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+		0 1 0 0 1 1 0 1 0 1 1 1 1 1 0 1
+		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1))
+	      (;; g_01
+	       (0 0 1 1 0 1 1 1 0 1 1 1 0 0 1 1
+		0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1
+		0 1 0 1 0 1 1 1 0 1 1 1 1 1 1 1
+		1 1 1 1 0 1 0 1 1 1 1 1 1 0 1 1
+		0 1 1 1 0 0 0 0 0 0 1 1 0 0 1 1
+		1 1 1 1 0 0 0 0 1 1 1 1 1 0 0 1
+		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
+	       ;; g_11
+	       (0 0 0 0 0 0 0 1 0 0 0 1 0 0 1 1
+		0 0 0 0 0 0 1 1 0 1 1 1 1 1 1 1)
+	       ;; g_21
+	       (0 0 0 1 0 1 1 1)
+	       ;; g_41
+	       (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1
+		0 0 0 0 0 0 0 1 0 0 0 1 1 1 1 1
+		0 0 0 0 0 0 1 1 0 0 0 1 1 1 1 1
+		0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1))
+	      (;; g_02
+	       (0 1 0 1)
+	       ;; g_12
+	       (0 1)
+	       ;; g_22
+	       (0)
+	       ;; g_42
+	       (0 0 0 1))))
+    "Static prediction table for X-Face image compression algorithm.")
+
+  ;; Macros for inlining critical values. 
+  (defmacro uncompface-width () (list 'quote uncompface-width))
+  (defmacro uncompface-height () (list 'quote uncompface-height))
+  (defmacro uncompface-guesses () (list 'quote uncompface-guesses))
+
+  (defmacro uncompface-loop (&rest body)
+    "Eval BODY and repeat if last expression of BODY yields non-nil."
+    (list 'while (cons 'progn body))))
+
+;; (defun uncompface-print-bignum (bignum &optional prefix)
+;;   (princ (format (concat prefix "<%s>\n")
+;; 		 (mapconcat (lambda (x) (format "%02x" x))
+;; 			    (reverse bignum) " "))))
+
+;; Shut up the byte-compiler.
+;; These variables are once bound in `uncompface' and all subfunctions
+;; accesses them directly rather than creating their own bindings.
+(eval-when-compile
+  (defvar bignum)
+  (defvar face))
+
+;; Big-number facilities.
+;; These functions were used to be implemented with `lsh' and `logand',
+;; but rewritten to use `/' and `%'.  The last two are mapped into
+;; byte-code directly, but the formers are normal functions even in
+;; compiled code which involve expensive `funcall' operations.
+(eval-when-compile
+  (defsubst uncompface-big-mul-add (multiplier adder)
+    "Multiply BIGNUM by MULTIPLIER and add ADDER and put result in `bignum'."
+    (setq bignum (if (= multiplier 0)
+		     (cons 0 bignum)
+		   (prog1 bignum
+		     (while (progn
+			      (setcar bignum (% (setq adder (+ (* (car bignum)
+								  multiplier)
+							       adder))
+						256))
+			      (setq adder (/ adder 256))
+			      (cdr bignum))
+		       (setq bignum (cdr bignum)))
+		     (or (= adder 0)
+			 (setcdr bignum (list adder))))))))
+
+;; This trick is for XEmacs 21.4 which doesn't allow inlining a function
+;; using `defsubst' into another function also defined with `defsubst'.
+(eval-when-compile
+  (when (featurep 'xemacs)
+    (defvar uncompface-big-mul-add (symbol-function 'uncompface-big-mul-add))
+    (defmacro uncompface-big-mul-add (multiplier adder)
+      `(,uncompface-big-mul-add ,multiplier ,adder))))
+
+;; Separate `eval-when-compile' for the byte compiler
+;; to properly define `uncompface-big-mul-add' before `uncompface-big-pop'.
+(eval-when-compile
+  (defsubst uncompface-big-pop (prob)
+    (let ((n (car bignum)) (i 0))
+      (if (cdr bignum)
+	  (setq bignum (cdr bignum))
+	(setcar bignum 0))
+      (while (or (< n (cdr (car prob)))
+		 (>= n (+ (cdr (car prob)) (car (car prob)))))
+	(setq prob (cdr prob)
+	      i (1+ i)))
+      (uncompface-big-mul-add (car (car prob)) (- n (cdr (car prob))))
+      i)))
+
+;; This function cannot be inlined due to recursive calls.
+(defun uncompface-pop-grays (offset size)
+  (if (<= size 3)
+      (let ((bits (uncompface-big-pop
+		   ;; This is freqs[16] in compface_private.h.
+		   '(( 0 .   0) (38 .   0) (38 .  38) (13 . 152)
+		     (38 .  76) (13 . 165) (13 . 178) ( 6 . 230)
+		     (38 . 114) (13 . 191) (13 . 204) ( 6 . 236)
+		     (13 . 217) ( 6 . 242) ( 5 . 248) ( 3 . 253)))))
+;; 	(if (/= (logand bits 1) 0)
+;; 	    (aset face offset t))
+;; 	(if (/= (logand bits 2) 0)
+;; 	    (aset face (1+ offset) t))
+;; 	(if (/= (logand bits 4) 0)
+;; 	    (aset face (+ offset (uncompface-width)) t))
+;; 	(if (/= (logand bits 8) 0)
+;; 	    (aset face (+ offset (uncompface-width) 1) t))
+	(when (>= bits 8)
+	  (aset face (+ offset (uncompface-width) 1) t)
+	  (setq bits (- bits 8)))
+	(when (>= bits 4)
+	  (aset face (+ offset (uncompface-width)) t)
+	  (setq bits (- bits 4)))
+	(or (eq (if (< bits 2)
+		    bits
+		  (aset face (1+ offset) t)
+		  (- bits 2))
+		0)
+	    (aset face offset t))
+	)
+    (setq size (/ size 2))
+    (uncompface-pop-grays offset size)
+    (uncompface-pop-grays (+ offset size) size)
+    (uncompface-pop-grays (+ offset (* (uncompface-width) size)) size)
+    (uncompface-pop-grays (+ offset (* (uncompface-width) size) size) size)))
+
+;; Again, this function call itself recursively.
+(defun uncompface-uncompress (offset size level)
+  ;; This used to be (funcall (aref [(lambda ...) ...] (u-big-pop ...)))
+  ;; but this was slow due to function call.
+  (let ((i (uncompface-big-pop (car level))))
+    (cond ((eq i 0)			; black
+	   (uncompface-pop-grays offset size))
+	  ((eq i 1)			; gray
+	   (setq size (/ size 2)
+		 level (cdr level))
+	   (uncompface-uncompress offset size level)
+	   (uncompface-uncompress (+ offset size) size level)
+	   (uncompface-uncompress (+ offset (* size (uncompface-width)))
+				  size level)
+	   (uncompface-uncompress (+ offset (* size (uncompface-width)) size)
+				  size level))
+	  ;; ((eq i 2) nil)
+	  ;; (t (error "Cannot happen"))
+	  )))
+
+(eval-when-compile
+  (defmacro uncompface-shift-in (k dy dx)
+    `(+ k k (if (aref face (+ i (* ,dy (uncompface-width)) ,dx)) 1 0))))
+
+(defun uncompface-internal (string &optional raw)
+  "Decode X-Face data STRING and return an image in the pbm format.
+If the optional RAW is non-nil, return a raw bitmap as a vector."
+  (let (;; `bignum' and `face' are semi-global variables.
+	;; Do not use '(0) below, because BIGNUM is modified in-place.
+	(bignum (list 0))
+	(face (make-vector (* (uncompface-width) (uncompface-height)) nil))
+	;;(uncompface-big-shift -16)
+	;;(uncompface-big-mask 65535)
+	(y 0) x)
+    (mapc (lambda (c)
+	    (and (>= c ?!) (<= c ?~)
+		 (uncompface-big-mul-add (1+ (- ?~ ?!)) (- c ?!))))
+	  string)
+    ;;(uncompface-print-bignum bignum)
+    ;;(setq y 0)
+    (uncompface-loop
+      (setq x 0)
+      (uncompface-loop
+	(uncompface-uncompress (+ (* (uncompface-width) y) x) 16
+			       ;; This is levels[4][3] in compface_private.h.
+			       '(;; Top of tree almost always grey
+				 ((  1 . 255) (251 .   0) (  4 . 251))
+				 ((  1 . 255) (200 .   0) ( 55 . 200))
+				 (( 33 . 223) (159 .   0) ( 64 . 159))
+				 ;; Grey disallowed at bottom
+				 ((131 .   0) (  0 .   0) (125 . 131))))
+	(< (setq x (+ x 16)) (uncompface-width)))
+      (< (setq y (+ y 16)) (uncompface-height)))
+    (setq y 0)
+    (let ((i 0) guesses k)
+      (uncompface-loop
+	(setq guesses (cond ((= y 1) (nth 2 (uncompface-guesses)))
+			    ((= y 2) (nth 1 (uncompface-guesses)))
+			    (t	     (nth 0 (uncompface-guesses))))
+	      x 0)
+	(uncompface-loop
+	  (setq k 0)
+	  (when (>= x 1)
+	    (when (>= x 2)
+	      (when (>= x 3)
+		(when (>= y 1)
+		  (when (>= y 2)
+		    (when (>= y 3)
+		      (setq k (uncompface-shift-in k -2 -2)))
+		    (setq k (uncompface-shift-in k -1 -2)))
+		  (setq k (uncompface-shift-in k 0 -2))))
+	      (when (>= y 1)
+		(when (>= y 2)
+		  (when (>= y 3)
+		    (setq k (uncompface-shift-in k -2 -1)))
+		  (setq k (uncompface-shift-in k -1 -1)))
+		(setq k (uncompface-shift-in k 0 -1))))
+	    (when (>= y 2)
+	      (when (>= y 3)
+		(setq k (uncompface-shift-in k -2 0)))
+	      (setq k (uncompface-shift-in k -1 0)))
+	    (when (>= y 2)
+	      (when (>= y 3)
+		(setq k (uncompface-shift-in k -2 1)))
+	      (setq k (uncompface-shift-in k -1 1)))
+	    (when (<= x (- (uncompface-width) 2))
+	      (when (>= y 2)
+		(when (>= y 3)
+		  (setq k (uncompface-shift-in k -2 2)))
+		(setq k (uncompface-shift-in k -1 2)))))
+	  (if (aref (car (cond ((= x 1)
+				(cdr (cdr guesses)))
+			       ((= x 2)
+				(cdr guesses))
+			       ((= x (1- (uncompface-width)))
+				(cdr (cdr (cdr guesses))))
+			       (t
+				guesses))) k)
+	      (aset face i (not (aref face i))))
+	  (setq i (1+ i))
+	  (< (setq x (1+ x)) (uncompface-width)))
+	(< (setq y (1+ y)) (uncompface-height))))
+    (if raw
+	face
+      (concat (eval-when-compile
+		(format "P1\n%d %d\n" uncompface-width uncompface-height))
+	      (mapconcat (lambda (bit) (if bit "1" "0")) face " ")
+	      "\n"))))
+
+(provide 'compface)
+
+;; Local variables:
+;; eval: (put 'uncompface-loop 'lisp-indent-hook 0)
+;; End:
+
+;;; compface.el ends here
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 216f045..5dc60f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* compface.el: Move the version of ELisp-based uncompface program
+	to the contrib directory because of the copyright problem.
+
+2004-10-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* message.el (message-kill-buffer): Raise the current frame.
+
 2004-10-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-sum.el: Mention that multibyte characters don't work as marks.
diff --git a/lisp/compface.el b/lisp/compface.el
index 45a5709..185f949 100644
--- a/lisp/compface.el
+++ b/lisp/compface.el
@@ -1,8 +1,7 @@
 ;;; compface.el --- functions for converting X-Face headers
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;;	TAKAI Kousuke <tak@kmc.gr.jp>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -26,723 +25,33 @@
 
 ;;; Code:
 
-(defgroup compface nil
-  "X-Face image conversion."
-  :group 'extensions)
-
-(defcustom uncompface-use-external (and (not noninteractive)
-					(executable-find "uncompface")
-					(executable-find "icontopbm")
-					'undecided)
-  "*Specify which of the internal or the external decoder should be used.
-nil means to use the internal ELisp-based uncompface program.  t means
-to use the external decoder.  In the later case, you need to have the
-external `uncompface' and `icontopbm' programs installed.  The default
-value is nil if those external programs aren't available, otherwise
-`undecided' which means to determine it by checking whether the host
-machine is slow.  See also `uncompface-use-external-threshold'.  You
-can skip that check by setting this value as nil or t explicitly."
-  :type '(choice (const :tag "Use the internal decoder" nil)
-		 (const :tag "Use the external decoder" t)
-		 (const :tag "Autodetection" undecided))
-  :group 'compface)
-
-(defcustom uncompface-use-external-threshold 0.1
-  "*Number of seconds to check whether the host machine is slow.
-If the host takes time larger than this value for decoding an X-Face
-using the internal ELisp-based uncompface program, it will be changed
-to using the external `uncompface' and `icontopbm' programs if they
-are available.  Note that the measurement may never be exact."
-  :type 'number
-  :group 'compface)
-
-(eval-when-compile
-  (defmacro uncompface-float-time (&optional specified-time)
-    (if (fboundp 'float-time)
-	`(float-time ,specified-time)
-      `(let ((time (or ,specified-time (current-time))))
-	 (+ (* (car time) 65536.0)
-	    (cadr time)
-	    (cond ((consp (setq time (cddr time)))
-		   (/ (car time) 1000000.0))
-		  (time
-		   (/ time 1000000.0))
-		  (t
-		   0)))))))
-
+;;;###
 (defun uncompface (face)
   "Convert FACE to pbm.
-If `uncompface-use-external' is t, it 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."
-  (cond ((eq uncompface-use-external nil)
-	 (uncompface-internal face))
-	((eq uncompface-use-external t)
-	 (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))
-		  (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))))
-	(t
-	 (let* ((gc-cons-threshold (eval '(lsh -1 -1)))
-		(start (current-time)))
-	   (prog1
-	       (uncompface-internal face)
-	     (setq uncompface-use-external
-		   (and (> (- (uncompface-float-time (current-time))
-			      (uncompface-float-time start))
-			   uncompface-use-external-threshold)
-			(executable-find "uncompface")
-			(executable-find "icontopbm")
-			t))
-	     (message "Setting `uncompface-use-external' to `%s'"
-		      uncompface-use-external))))))
-
-;; The following section is a bug-for-bug compatible version of
-;; `uncompface' program entirely implemented in Emacs-Lisp.
-
-(eval-when-compile
-  ;; The size of 48x48 is actually hard-coded into the code itself,
-  ;; so you cannot simply change those values.  So we hard-code
-  ;; them into the compiled code.
-  (defconst uncompface-width 48
-    "Width of X-Face bitmap image.")
-  (defconst uncompface-height 48
-    "Height of X-Face bitmap image.")
-
-  ;; Again, this is also hard-coded into the compiled code.
-  (defconst uncompface-guesses
-    (mapcar (lambda (x)
-	      (mapcar (lambda (x)
-			(let ((vector (make-vector (length x) nil))
-			      (i 0))
-			  (while x
-			    (or (zerop (car x))
-				(aset vector i t))
-			    (setq x (cdr x)
-				  i (1+ i)))
-			  vector))
-		      x))
-	    '((;; g_00
-	       (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		1 1 1 0 0 0 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 1 0 1 0 0 0 1 0 1 1 1
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 1 1 0 1 1
-		0 0 0 0 1 1 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 1 1 0 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1
-		0 1 0 0 0 1 0 1 0 0 1 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1
-		0 0 0 0 0 0 0 1 0 0 1 1 1 1 1 1
-		1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 1
-		1 0 0 0 0 0 0 0 1 1 0 0 1 0 0 1
-		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 1 1 0 1 1 0 0 0 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 0 1 0 1 0 0
-		0 0 0 0 0 1 1 1 0 0 0 1 1 1 1 1
-		0 1 0 1 0 1 1 1 0 1 0 0 0 1 1 1
-		1 1 0 1 0 1 1 1 0 0 1 1 1 1 0 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 1 1 1 1 1 0 0 0 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		1 0 0 1 1 0 1 1 1 1 0 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 1 1 1 1 1 0 0 0 1 1 1 0 1
-		0 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 0 0 0 1 1 1 1 1
-		0 0 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		0 0 0 0 0 0 1 1 0 0 0 1 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
-		1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 0 1 1 1 1 0 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 0 1 0 0 1 1 1 1
-		1 1 0 1 0 1 1 1 0 0 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 0 0 1 1 1 1 0 1 1 1 1 1 1
-		0 1 0 1 0 1 1 0 0 0 1 0 0 1 0 1
-		0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1
-		1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1
-		0 1 0 1 1 1 1 1 0 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1
-		0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 1 1 1 1 0 1 0 0 0 1 0
-		0 0 0 0 1 0 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		0 0 0 1 1 0 0 0 1 1 0 1 0 1 1 1
-		1 0 0 1 0 1 0 0 0 1 1 1 0 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1
-		0 0 0 1 1 1 1 1 1 0 1 1 0 1 1 1
-		0 0 0 0 1 1 0 0 0 0 0 0 0 1 1 1
-		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 1 1 1 1 0 0 0 1 1 1 1 1
-		1 0 0 0 0 1 0 0 1 0 0 0 1 1 1 1
-		0 0 0 0 0 1 0 1 0 0 0 1 0 1 0 1
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 1
-		0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0
-		0 0 0 0 0 1 0 1 0 0 0 0 0 1 0 0
-		0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 0 0 1 1 1 1 1 1 0 0 0 1 1 1 1
-		0 1 0 0 1 0 1 0 0 1 0 0 0 0 0 0
-		0 1 0 1 1 1 1 1 0 1 0 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
-		1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1
-		1 1 0 1 0 1 1 1 0 1 0 1 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 0 1 1 1 0 1 1 1
-		1 1 0 1 1 1 1 1 0 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 0 1 0 0 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 0 0 1 1 1 0 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
-		0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 0 0 1 1 0 1 0 0 0 0 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1
-		0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 0
-		0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0
-		0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 0
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 0 1 0 0 0 0 0 0 0 0 0 0 0 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-		0 0 0 0 1 1 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0
-		1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0
-		0 0 0 0 0 0 0 1 0 0 0 0 0 1 0 1
-		0 0 0 0 0 0 0 1 0 0 0 1 0 1 0 1
-		1 0 1 0 1 1 1 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-		0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0
-		0 1 0 0 0 1 1 0 0 0 0 0 1 1 0 0
-		0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
-		1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 1 1 1 0 0 0 1 0 1 0 1
-		1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 1 1 1 1 1 1 1 0 1 0 1 1 1 1 1
-		1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 0 0 1 1 1 1 1 0
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
-		1 0 0 1 0 1 0 1 0 1 0 0 1 1 1 1
-		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1
-		0 0 1 0 0 1 0 1 0 0 0 0 1 1 1 0
-		0 0 0 0 1 1 0 1 0 0 0 0 1 1 0 1
-		0 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		1 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 0
-		0 0 0 0 0 1 0 0 0 1 0 0 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 0 1 1 1 0 1 1 1 0 1 1 1
-		0 1 0 0 0 1 1 1 1 1 1 0 1 1 0 1
-		0 0 0 0 0 1 0 1 0 0 0 0 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 1 0 1 1 1 1
-		1 1 0 1 1 0 0 0 0 1 0 1 1 1 1 1
-		0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		1 1 0 1 1 1 1 1 0 1 0 1 1 1 1 1
-		0 0 0 0 0 1 1 1 0 0 0 0 1 1 1 1
-		1 0 0 1 0 1 0 0 0 0 0 0 1 1 0 1
-		0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1
-		0 1 0 0 0 1 1 0 0 1 0 1 0 1 1 1
-		0 0 0 0 0 0 0 1 0 0 0 0 1 1 0 1
-		0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 0
-		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1
-		0 1 0 0 0 1 1 1 0 1 1 0 1 1 0 0
-		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 0 1 1 0 1 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0
-		0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0
-		1 0 0 1 0 1 0 1 0 0 0 0 0 0 0 1
-		0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		0 0 0 0 1 1 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 1 0 0 0 0 1 0 0 1 0 0
-		0 0 0 0 1 1 0 1 0 0 0 0 1 1 1 1
-		0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 1 0 0 0 1 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 1 1 0 0 0 1 0 0 1 1 0
-		1 1 0 0 1 1 1 1 0 0 0 0 0 1 0 1
-		1 1 0 0 1 1 1 1 0 1 1 1 1 1 1 1
-		1 1 0 1 1 1 1 1 1 1 0 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 1 0 1 1 1 0 1 0 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 0 1 1 0 0 0 0 0 1 0 0 1
-		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 0 1 0 1 0 0 0 1 0 0 0
-		1 0 1 0 0 1 1 1 0 1 1 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 0 0 0 0 0 1 0 0
-		1 1 0 1 1 1 1 1 0 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 0 1 1 1 0 0 1 1 0
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 0 1 1 0 0
-		1 0 0 0 1 1 1 1 0 1 0 0 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 0 0 1 1 1 1
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 1 0 1 1 1 1 0 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 1 1 0 0 0 0 1 1 0 0
-		1 0 0 1 1 1 0 1 0 0 0 0 1 1 1 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-	       ;; g_10
-	       (0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0
-		1 1 1 1 0 0 1 1 0 1 0 1 1 1 1 1
-		1 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0
-		0 0 0 1 0 1 1 1 1 0 0 1 1 1 1 1
-		0 0 0 0 0 1 0 0 0 0 1 0 0 0 1 1
-		0 0 0 0 0 1 0 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0
-		0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
-		0 0 1 1 0 0 1 1 1 1 0 1 0 1 1 1
-		0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 1
-		0 1 0 1 1 1 1 1 0 0 1 1 1 1 1 1
-		0 0 0 1 0 1 1 1 0 0 1 1 0 0 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0
-		0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0
-		0 0 0 1 0 0 1 0 0 0 0 0 0 0 0 0
-		0 0 0 1 0 0 0 1 0 1 0 1 0 1 1 1
-		0 0 0 0 0 1 0 1 0 0 1 0 0 1 0 1
-		0 0 0 0 0 1 0 1 0 0 0 0 0 0 1 1
-		0 0 1 1 0 1 0 1 1 0 1 1 1 1 1 1
-		1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 1 1 1 0 1 1 0 1 1 1 1
-		0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 0
-		0 0 0 1 0 1 1 1 0 0 0 0 0 1 1 0
-		1 1 1 1 1 0 1 0 1 1 1 0 1 0 0 0
-		0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1
-		0 0 0 1 1 1 1 1 1 0 0 1 1 1 1 1
-		0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-	       ;; g_20
-	       (0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1
-		0 1 0 0 0 0 1 1 0 0 1 0 1 1 1 0
-		1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1)
-	       ;; g_40
-	       (0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 1 0 0 1 1 1 0
-		1 1 1 0 0 1 0 0 0 0 0 0 1 1 0 1
-		0 0 0 1 0 0 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 1 0 0 0 1 0 0 0 1 0 0 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0
-		0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1
-		1 0 1 0 1 1 1 0 1 0 1 0 1 1 1 1
-		0 1 0 0 0 1 0 1 0 1 1 1 1 1 1 1
-		1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1
-		0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-		0 0 0 1 1 1 0 0 1 1 0 1 1 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 1
-		0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0
-		0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
-		0 1 0 0 1 1 1 1 0 1 0 1 1 1 1 1
-		0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 1 1 1 0 0 1 1 1 1 1 1 1 1
-		1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 1
-		0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
-		0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1
-		0 0 0 0 0 0 0 1 0 0 0 1 0 0 0 1
-		0 0 0 0 0 1 0 1 0 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
-		0 1 0 0 0 0 0 1 0 1 0 1 0 1 1 1
-		0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 1 0 1 0 1 1 1 0 1 1 1
-		0 0 0 0 1 1 0 1 0 1 0 1 1 1 1 1
-		0 1 0 0 1 1 0 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-		0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 1
-		0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1
-		0 0 0 0 0 1 0 1 0 1 1 1 1 1 0 1
-		0 0 0 1 0 0 0 0 0 0 0 1 0 1 0 1
-		0 0 1 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 0 0 0 0 0 1 0 1 0 0 0 0
-		0 0 0 0 1 1 0 1 1 1 1 1 1 1 0 1
-		0 0 0 0 0 1 0 0 0 0 0 0 1 1 1 1
-		0 0 0 0 0 1 1 1 0 0 0 1 1 1 1 1
-		0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1
-		0 0 0 0 1 1 0 1 0 1 1 1 1 1 1 1
-		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
-		0 1 0 0 1 1 0 1 0 1 1 1 1 1 0 1
-		0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1))
-	      (;; g_01
-	       (0 0 1 1 0 1 1 1 0 1 1 1 0 0 1 1
-		0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1
-		0 1 0 1 0 1 1 1 0 1 1 1 1 1 1 1
-		1 1 1 1 0 1 0 1 1 1 1 1 1 0 1 1
-		0 1 1 1 0 0 0 0 0 0 1 1 0 0 1 1
-		1 1 1 1 0 0 0 0 1 1 1 1 1 0 0 1
-		0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1)
-	       ;; g_11
-	       (0 0 0 0 0 0 0 1 0 0 0 1 0 0 1 1
-		0 0 0 0 0 0 1 1 0 1 1 1 1 1 1 1)
-	       ;; g_21
-	       (0 0 0 1 0 1 1 1)
-	       ;; g_41
-	       (0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1
-		0 0 0 0 0 0 0 1 0 0 0 1 1 1 1 1
-		0 0 0 0 0 0 1 1 0 0 0 1 1 1 1 1
-		0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1))
-	      (;; g_02
-	       (0 1 0 1)
-	       ;; g_12
-	       (0 1)
-	       ;; g_22
-	       (0)
-	       ;; g_42
-	       (0 0 0 1))))
-    "Static prediction table for X-Face image compression algorithm.")
-
-  ;; Macros for inlining critical values. 
-  (defmacro uncompface-width () (list 'quote uncompface-width))
-  (defmacro uncompface-height () (list 'quote uncompface-height))
-  (defmacro uncompface-guesses () (list 'quote uncompface-guesses))
-
-  (defmacro uncompface-loop (&rest body)
-    "Eval BODY and repeat if last expression of BODY yields non-nil."
-    (list 'while (cons 'progn body))))
-
-;; (defun uncompface-print-bignum (bignum &optional prefix)
-;;   (princ (format (concat prefix "<%s>\n")
-;; 		 (mapconcat (lambda (x) (format "%02x" x))
-;; 			    (reverse bignum) " "))))
-
-;; Shut up the byte-compiler.
-;; These variables are once bound in `uncompface' and all subfunctions
-;; accesses them directly rather than creating their own bindings.
-(eval-when-compile
-  (defvar bignum)
-  (defvar face))
-
-;; Big-number facilities.
-;; These functions were used to be implemented with `lsh' and `logand',
-;; but rewritten to use `/' and `%'.  The last two are mapped into
-;; byte-code directly, but the formers are normal functions even in
-;; compiled code which involve expensive `funcall' operations.
-(eval-when-compile
-  (defsubst uncompface-big-mul-add (multiplier adder)
-    "Multiply BIGNUM by MULTIPLIER and add ADDER and put result in `bignum'."
-    (setq bignum (if (= multiplier 0)
-		     (cons 0 bignum)
-		   (prog1 bignum
-		     (while (progn
-			      (setcar bignum (% (setq adder (+ (* (car bignum)
-								  multiplier)
-							       adder))
-						256))
-			      (setq adder (/ adder 256))
-			      (cdr bignum))
-		       (setq bignum (cdr bignum)))
-		     (or (= adder 0)
-			 (setcdr bignum (list adder))))))))
-
-;; This trick is for XEmacs 21.4 which doesn't allow inlining a function
-;; using `defsubst' into another function also defined with `defsubst'.
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (defvar uncompface-big-mul-add (symbol-function 'uncompface-big-mul-add))
-    (defmacro uncompface-big-mul-add (multiplier adder)
-      `(,uncompface-big-mul-add ,multiplier ,adder))))
-
-;; Separate `eval-when-compile' for the byte compiler
-;; to properly define `uncompface-big-mul-add' before `uncompface-big-pop'.
-(eval-when-compile
-  (defsubst uncompface-big-pop (prob)
-    (let ((n (car bignum)) (i 0))
-      (if (cdr bignum)
-	  (setq bignum (cdr bignum))
-	(setcar bignum 0))
-      (while (or (< n (cdr (car prob)))
-		 (>= n (+ (cdr (car prob)) (car (car prob)))))
-	(setq prob (cdr prob)
-	      i (1+ i)))
-      (uncompface-big-mul-add (car (car prob)) (- n (cdr (car prob))))
-      i)))
-
-;; This function cannot be inlined due to recursive calls.
-(defun uncompface-pop-grays (offset size)
-  (if (<= size 3)
-      (let ((bits (uncompface-big-pop
-		   ;; This is freqs[16] in compface_private.h.
-		   '(( 0 .   0) (38 .   0) (38 .  38) (13 . 152)
-		     (38 .  76) (13 . 165) (13 . 178) ( 6 . 230)
-		     (38 . 114) (13 . 191) (13 . 204) ( 6 . 236)
-		     (13 . 217) ( 6 . 242) ( 5 . 248) ( 3 . 253)))))
-;; 	(if (/= (logand bits 1) 0)
-;; 	    (aset face offset t))
-;; 	(if (/= (logand bits 2) 0)
-;; 	    (aset face (1+ offset) t))
-;; 	(if (/= (logand bits 4) 0)
-;; 	    (aset face (+ offset (uncompface-width)) t))
-;; 	(if (/= (logand bits 8) 0)
-;; 	    (aset face (+ offset (uncompface-width) 1) t))
-	(when (>= bits 8)
-	  (aset face (+ offset (uncompface-width) 1) t)
-	  (setq bits (- bits 8)))
-	(when (>= bits 4)
-	  (aset face (+ offset (uncompface-width)) t)
-	  (setq bits (- bits 4)))
-	(or (eq (if (< bits 2)
-		    bits
-		  (aset face (1+ offset) t)
-		  (- bits 2))
-		0)
-	    (aset face offset t))
-	)
-    (setq size (/ size 2))
-    (uncompface-pop-grays offset size)
-    (uncompface-pop-grays (+ offset size) size)
-    (uncompface-pop-grays (+ offset (* (uncompface-width) size)) size)
-    (uncompface-pop-grays (+ offset (* (uncompface-width) size) size) size)))
-
-;; Again, this function call itself recursively.
-(defun uncompface-uncompress (offset size level)
-  ;; This used to be (funcall (aref [(lambda ...) ...] (u-big-pop ...)))
-  ;; but this was slow due to function call.
-  (let ((i (uncompface-big-pop (car level))))
-    (cond ((eq i 0)			; black
-	   (uncompface-pop-grays offset size))
-	  ((eq i 1)			; gray
-	   (setq size (/ size 2)
-		 level (cdr level))
-	   (uncompface-uncompress offset size level)
-	   (uncompface-uncompress (+ offset size) size level)
-	   (uncompface-uncompress (+ offset (* size (uncompface-width)))
-				  size level)
-	   (uncompface-uncompress (+ offset (* size (uncompface-width)) size)
-				  size level))
-	  ;; ((eq i 2) nil)
-	  ;; (t (error "Cannot happen"))
-	  )))
-
-(eval-when-compile
-  (defmacro uncompface-shift-in (k dy dx)
-    `(+ k k (if (aref face (+ i (* ,dy (uncompface-width)) ,dx)) 1 0))))
-
-(defun uncompface-internal (string &optional raw)
-  "Decode X-Face data STRING and return an image in the pbm format.
-If the optional RAW is non-nil, return a raw bitmap as a vector."
-  (let (;; `bignum' and `face' are semi-global variables.
-	;; Do not use '(0) below, because BIGNUM is modified in-place.
-	(bignum (list 0))
-	(face (make-vector (* (uncompface-width) (uncompface-height)) nil))
-	;;(uncompface-big-shift -16)
-	;;(uncompface-big-mask 65535)
-	(y 0) x)
-    (mapc (lambda (c)
-	    (and (>= c ?!) (<= c ?~)
-		 (uncompface-big-mul-add (1+ (- ?~ ?!)) (- c ?!))))
-	  string)
-    ;;(uncompface-print-bignum bignum)
-    ;;(setq y 0)
-    (uncompface-loop
-      (setq x 0)
-      (uncompface-loop
-	(uncompface-uncompress (+ (* (uncompface-width) y) x) 16
-			       ;; This is levels[4][3] in compface_private.h.
-			       '(;; Top of tree almost always grey
-				 ((  1 . 255) (251 .   0) (  4 . 251))
-				 ((  1 . 255) (200 .   0) ( 55 . 200))
-				 (( 33 . 223) (159 .   0) ( 64 . 159))
-				 ;; Grey disallowed at bottom
-				 ((131 .   0) (  0 .   0) (125 . 131))))
-	(< (setq x (+ x 16)) (uncompface-width)))
-      (< (setq y (+ y 16)) (uncompface-height)))
-    (setq y 0)
-    (let ((i 0) guesses k)
-      (uncompface-loop
-	(setq guesses (cond ((= y 1) (nth 2 (uncompface-guesses)))
-			    ((= y 2) (nth 1 (uncompface-guesses)))
-			    (t	     (nth 0 (uncompface-guesses))))
-	      x 0)
-	(uncompface-loop
-	  (setq k 0)
-	  (when (>= x 1)
-	    (when (>= x 2)
-	      (when (>= x 3)
-		(when (>= y 1)
-		  (when (>= y 2)
-		    (when (>= y 3)
-		      (setq k (uncompface-shift-in k -2 -2)))
-		    (setq k (uncompface-shift-in k -1 -2)))
-		  (setq k (uncompface-shift-in k 0 -2))))
-	      (when (>= y 1)
-		(when (>= y 2)
-		  (when (>= y 3)
-		    (setq k (uncompface-shift-in k -2 -1)))
-		  (setq k (uncompface-shift-in k -1 -1)))
-		(setq k (uncompface-shift-in k 0 -1))))
-	    (when (>= y 2)
-	      (when (>= y 3)
-		(setq k (uncompface-shift-in k -2 0)))
-	      (setq k (uncompface-shift-in k -1 0)))
-	    (when (>= y 2)
-	      (when (>= y 3)
-		(setq k (uncompface-shift-in k -2 1)))
-	      (setq k (uncompface-shift-in k -1 1)))
-	    (when (<= x (- (uncompface-width) 2))
-	      (when (>= y 2)
-		(when (>= y 3)
-		  (setq k (uncompface-shift-in k -2 2)))
-		(setq k (uncompface-shift-in k -1 2)))))
-	  (if (aref (car (cond ((= x 1)
-				(cdr (cdr guesses)))
-			       ((= x 2)
-				(cdr guesses))
-			       ((= x (1- (uncompface-width)))
-				(cdr (cdr (cdr guesses))))
-			       (t
-				guesses))) k)
-	      (aset face i (not (aref face i))))
-	  (setq i (1+ i))
-	  (< (setq x (1+ x)) (uncompface-width)))
-	(< (setq y (1+ y)) (uncompface-height))))
-    (if raw
-	face
-      (concat (eval-when-compile
-		(format "P1\n%d %d\n" uncompface-width uncompface-height))
-	      (mapconcat (lambda (bit) (if bit "1" "0")) face " ")
-	      "\n"))))
+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."
+  (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))
+	   (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)
 
-;; Local variables:
-;; eval: (put 'uncompface-loop 'lisp-indent-hook 0)
-;; End:
-
 ;;; compface.el ends here
diff --git a/lisp/message.el b/lisp/message.el
index 17470ea..7a32809 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3768,8 +3768,15 @@ Instead, just auto-save the buffer and then bury it."
 			  (file-exists-p auto-save-file-name))
 		     (and file-name
 			  (file-exists-p file-name)))
-		 (yes-or-no-p (format "Remove the backup file%s? "
-				      (if modified " too" ""))))
+		 (progn
+		   ;; If the message buffer has lived in a dedicated window,
+		   ;; `kill-buffer' has killed the frame.  Thus the
+		   ;; `yes-or-no-p' may show up in a lowered frame.  Make sure
+		   ;; that the user can see the question by raising the
+		   ;; current frame:
+		   (raise-frame)
+		   (yes-or-no-p (format "Remove the backup file%s? "
+					(if modified " too" "")))))
 	(ignore-errors
 	  (delete-file auto-save-file-name))
 	(let ((message-draft-article draft-article))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 47534d4..760cd2f 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (X-Face): Revert 2004-02-17 change.
+	(Slow Machine): Ditto.
+
 2004-10-02  Simon Josefsson  <jas@extundo.com>
 
 	* gnus.texi (documentencoding): Add, to avoid warnings.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2b3f4de..083083c 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -20949,31 +20949,6 @@ gnus はこれを利用することにします。
 @end iftex
 @c @anchor{X-Face}
 
-今や Gnus は @code{X-Face} ヘッダーをデコードするために、通常 Emacs で
-は ELisp で書かれた内部 @code{uncompface} プログラムを使います。それはど
-んな外部プログラムも必要としない一方、遅いマシンを使っている場合はそれを
-遅く感じるかもしれません。そんな場合は、以下の変数を変更することができま
-す:
-
-@table @code
-@item uncompface-use-external
-@vindex uncompface-use-external
-内部デコーダと外部デコーダのどちらが使われるべきかを指定します。
-@code{nil} は ELisp で書かれた内部 @code{uncompface} プログラムを使うこ
-とを意味し、@code{t} は外部デコーダを使うことを意味します。ディフォルト
-値はホストマシンが遅いかどうかを検査してそれを決めることを意味す
-る @code{undecided} で、@code{uncompface-use-external-threshold} (それを
-参照) によって制御されます。
-
-@item uncompface-use-external-threshold
-@vindex uncompface-use-external-threshold
-ホストマシンが遅いかどうかを検査するための秒数です。ELisp で書かれた内
-部 @code{uncompface} プログラムを使って @code{X-Face} をデコードするのに
-かかる時間がこの値より大きい場合は、外部デコーダの使用に変更されます。ディ
-フォルトは 0.1 秒です。
-@end table
-
-内部デコーダが無効にされる場合、あるいは XEmacs を使っている場合は、
 @code{X-Face} ヘッダーのデコードには、Emacs が @samp{compface} をサポー
 ト (XEmacs のほとんどがサポート) しているか、あなたのシステム
 に @samp{compface} がインストールされている必要があります。もしどちらか
@@ -25911,11 +25886,6 @@ Gnus が常に概略バッファを中心再設定をすることを禁止するためにこれ
 に @code{gnus-show-threads} と @code{gnus-use-cross-reference}、それ
 に @code{gnus-nov-is-evil} を @code{nil} に設定して下さい。
 
-Gnus は @code{X-Face} ヘッダーをデコードするために、通常 Emacs で
-は ELisp で書かれた内部 @code{uncompface} プログラムを使います。それが遅
-く感じる場合は、@code{uncompface-use-external} を @code{t} に設定して下
-さい。@xref{X-Face}.
-
 @page
 @node Troubleshooting
 @section 問題解決
diff --git a/texi/gnus.texi b/texi/gnus.texi
index addeadc..63edfd2 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -21835,32 +21835,7 @@ readers.
 @end iftex
 @c @anchor{X-Face}
 
-Gnus now uses the internal ELisp-based @code{uncompface} program for
-decoding an @code{X-Face} header normally in Emacs.  While it doesn't
-require any other external program, you may feel it is slow if you are
-using a slow machine.  In such a case, you can modify the following
-variables:
-
-@table @code
-@item uncompface-use-external
-@vindex uncompface-use-external
-Specify which of the internal or the external decoder should be used.
-@code{nil} means to use the internal ELisp-based @code{uncompface}
-program.  @code{t} means to use the external decoder.  The default value
-is normally @code{undecided} which means to determine it by checking
-whether the host machine is slow, being controlled by
-@code{uncompface-use-external-threshold} (which see).
-
-@item uncompface-use-external-threshold
-@vindex uncompface-use-external-threshold
-A number of seconds to check whether the host machine is slow.  If the
-host takes time larger than this value for decoding an @code{X-Face}
-using the internal ELisp-based @code{uncompface} program, it will be
-changed to using the external decoder.  The default is 0.1 seconds.
-@end table
-
-If the internal decoder is invalidated or if you are using XEmacs,
-decoding an @code{X-Face} header either requires an Emacs that has
+Decoding an @code{X-Face} header either requires an Emacs that has
 @samp{compface} support (which most XEmacs versions has), or that you
 have @samp{compface} installed on your system.  If either is true,
 Gnus will default to displaying @code{X-Face} headers.
@@ -26814,10 +26789,6 @@ Set @code{gnus-show-threads}, @code{gnus-use-cross-reference} and
 @code{gnus-nov-is-evil} to @code{nil} to make entering and exiting the
 summary buffer faster.
 
-Gnus uses the internal ELisp-based @code{uncompface} program for
-decoding an @code{X-Face} header normally in Emacs.  If you feel it is
-slow, set @code{uncompface-use-external} to @code{t}.  @xref{X-Face}.
-
 
 @page
 @node Troubleshooting