X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=b73fbb8fd6ce6016a7fc8d009216183e79af2538;hb=9b6c272d50c6896583a69d40d9e9b15cabaf4247;hp=ad81f013ac2f76bb964479a627df401dcaeac7c7;hpb=699b0f6f3746e2405e7324922a3d6211b1e39ec2;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index ad81f01..b73fbb8 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -469,7 +469,7 @@ call it with the value of the `gnus-data' text property."
   (fset 'gnus-region-active-p 'region-active-p)
   (fset 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
   (fset 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu)
-  
+
   (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add)
   (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add)
   (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add)
@@ -807,24 +807,25 @@ XEmacs compatibility workaround."
   "Display any XFace headers in the current article."
   (save-excursion
     (let ((xface-glyph
-	   (cond ((featurep 'xface)
-		  (make-glyph (vector 'xface :data
-				      (concat "X-Face: "
-					      (buffer-substring beg end)))))
-		 ((featurep 'xpm)
-		  (let ((cur (current-buffer)))
-		    (save-excursion
-		      (gnus-set-work-buffer)
-		      (insert (format "%s" (buffer-substring beg end cur)))
-		      (gnus-xmas-call-region "uncompface")
-		      (goto-char (point-min))
-		      (insert "/* Width=48, Height=48 */\n")
-		      (gnus-xmas-call-region "icontopbm")
-		      (gnus-xmas-call-region "ppmtoxpm")
-		      (make-glyph
-		       (vector 'xpm :data (buffer-string))))))
-		 (t
-		  (make-glyph [nothing]))))
+	   (cond
+	    ((featurep 'xface)
+	     (make-glyph (vector 'xface :data
+				 (concat "X-Face: "
+					 (buffer-substring beg end)))))
+	    ((featurep 'xpm)
+	     (let ((cur (current-buffer)))
+	       (save-excursion
+		 (gnus-set-work-buffer)
+		 (insert (format "%s" (buffer-substring beg end cur)))
+		 (gnus-xmas-call-region "uncompface")
+		 (goto-char (point-min))
+		 (insert "/* Width=48, Height=48 */\n")
+		 (gnus-xmas-call-region "icontopbm")
+		 (gnus-xmas-call-region "ppmtoxpm")
+		 (make-glyph
+		  (vector 'xpm :data (buffer-string))))))
+	    (t
+	     (make-glyph [nothing]))))
 	  (ext (make-extent (progn
 			      (goto-char (point-min))
 			      (re-search-forward "^From:" nil t)
@@ -834,26 +835,12 @@ XEmacs compatibility workaround."
       (set-extent-begin-glyph ext xface-glyph)
       (set-extent-property ext 'duplicable t))))
 
-;;(defvar gnus-xmas-pointer-glyph
-;;  (progn
-;;    (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory
-;;                                     "gnus"))
-;;    (let ((file-xpm (expand-file-name "gnus-pointer.xpm"
-;;				      gnus-xmas-glyph-directory))
-;;	  (file-xbm (expand-file-name "gnus-pointer.xbm"
-;;				      gnus-xmas-glyph-directory)))
-;;      (make-pointer-glyph
-;;       (list (vector 'xpm ':file file-xpm)
-;;	     (vector 'xbm ':file file-xbm))))))
-
 (defvar gnus-xmas-modeline-left-extent
   (let ((ext (copy-extent modeline-buffer-id-left-extent)))
-;    (set-extent-property ext 'pointer gnus-xmas-pointer-glyph)
     ext))
 
 (defvar gnus-xmas-modeline-right-extent
   (let ((ext (copy-extent modeline-buffer-id-right-extent)))
-;    (set-extent-property ext 'pointer gnus-xmas-pointer-glyph)
     ext))
 
 (defvar gnus-xmas-modeline-glyph
@@ -870,7 +857,7 @@ XEmacs compatibility workaround."
 			  `[xpm :file ,file-xpm])
 			 ((featurep 'xbm)
 			  ;; Then a not-so-nifty XBM
-			  [xbm :file ,file-xbm])
+			  `[xbm :file ,file-xbm])
 			 ;; Then the simple string
 			 (t [string :data "Gnus:"])))))
       (set-glyph-face glyph 'modeline-buffer-id)
@@ -902,7 +889,7 @@ XEmacs compatibility workaround."
 (defun gnus-xmas-annotation-in-region-p (b e)
   (or (map-extents (lambda (e u) t) nil b e nil nil 'mm t)
       (if (= b e)
-	  (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t) 
+	  (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t)
 	(text-property-any b e 'gnus-undeletable t))))
 
 (defun gnus-xmas-mime-button-menu (event)