Fix last change

[gnus] / contrib / compface.el

diff --git a/contrib/compface.el b/contrib/compface.el
index 8d97a01..09a4e7c 100644 (file)
--- a/contrib/compface.el
+++ b/contrib/compface.el
@@ -9,7 +9,7 @@
 
 ;; 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)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,9 +18,7 @@
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -80,6 +78,7 @@ or `libgr-progs', for instance."
         (uncompface-internal face))
        ((eq uncompface-use-external t)
         (with-temp-buffer
+          (unless (featurep 'xemacs) (set-buffer-multibyte nil))
           (insert face)
           (let ((coding-system-for-read 'raw-text)
                 ;; At least "icontopbm" doesn't work with Windows because
@@ -90,7 +89,8 @@ or `libgr-progs', for instance."
                               'delete '(t nil) nil))
                  (progn
                    (goto-char (point-min))
-                   (insert "/* Width=48, Height=48 */\n")
+                   (insert "/* Format_version=1, Width=48, Height=48,\
+ Depth=1, Valid_bits_per_item=16 */\n")
                    ;; I just can't get "icontopbm" to work correctly on its
                    ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
                    ;; files.
@@ -749,5 +749,4 @@ If the optional RAW is non-nil, return a raw bitmap as a vector."
 ;; eval: (put 'uncompface-loop 'lisp-indent-hook 0)
 ;; End:
 
-;; arch-tag: a8e3f4a0-e375-4f1d-a426-c7da30e16c18
 ;;; compface.el ends here