X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-fun.el;h=0f28bf5e5eaea9c94189f18a9d420140035c8a03;hb=5a2aa34b11bf5ba8488a10de1f50998d14dc2eab;hp=72627f27e3e81d1efba4b84ee45f955a6343e9e6;hpb=c358f44b1670d12d5eff5fe5a447a19afd34a252;p=gnus

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 72627f27e..0f28bf5e5 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -1,32 +1,30 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, 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
+;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;;; Code:
 
-;; For Emacs < 22.2.
+;; For Emacs <22.2 and XEmacs.
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
@@ -217,8 +215,7 @@ colors of the displayed X-Faces."
 (defun gnus-display-x-face-in-from (data)
   "Display the X-Face DATA in the From header."
   (require 'gnus-art)
-  (let ((default-enable-multibyte-characters nil)
-	pbm)
+  (let (pbm)
     (when (or (gnus-image-type-available-p 'xface)
 	      (and (gnus-image-type-available-p 'pbm)
 		   (setq pbm (uncompface data))))
@@ -293,5 +290,4 @@ colors of the displayed X-Faces."
 
 (provide 'gnus-fun)
 
-;;; arch-tag: 9d000a69-15cc-4491-9dc0-4627484f50c1
 ;;; gnus-fun.el ends here