2001-12-29 ShengHuo ZHU <zsh@cs.rochester.edu>

	* dgnushack.el (dgnushack-compile): Compile gnus-picon for Emacs.
	* gnus-picon.el: Less warnings when compile.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79307e6..ca9086a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-29  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * dgnushack.el (dgnushack-compile): Compile gnus-picon for Emacs.
+       * gnus-picon.el: Less warnings when compile.
+
 2001-12-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-picon.el (gnus-picons-news-directories): Removed obsolete

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 62b75df..d37f23c 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -250,8 +250,7 @@ Modify to suit your needs."))
     (dolist (file
             (if (featurep 'xemacs)
                 '("md5.el" "smiley-ems.el")
-              '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
-                "nnheaderxm.el" "smiley.el")))
+              '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el" "smiley.el")))
       (setq files (delete file files)))
 
     (dolist (file files)

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 4c5a015..f7740f4 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -1,6 +1,6 @@
 ;;; gnus-picon.el --- displaying pretty icons in Gnus
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
 ;;      Free Software Foundation, Inc.
 
 ;; Author: Wes Hardaker <hardaker@ece.ucdavis.edu>
@@ -29,7 +29,9 @@
 
 (require 'gnus)
 ;; (require 'xpm)
-;; (require 'annotations)
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (require 'annotations)))
 (require 'custom)
 (require 'gnus-art)
 (require 'gnus-win)
@@ -37,7 +39,7 @@
 ;;; User variables:
 
 (defgroup picons nil
-  "Show pictures of people, domains, and newsgroups (XEmacs).
+  "Show pictures of people, domains, and newsgroups.
 For this to work, you must switch on the `gnus-treat-display-picons'
 variable."
   :group 'gnus-visual)
@@ -171,7 +173,7 @@ arguments necessary for the job.")
 (defun gnus-picons-remove-all ()
   "Removes all picons from the Gnus display(s)."
   (interactive)
-  ;;(map-extents (function (lambda (ext unused) (delete-annotation ext) nil))
+;;(map-extents (function (lambda (ext unused) (delete-annotation ext) nil))
 ;;            nil nil nil nil nil 'gnus-picon)
   (setq gnus-picons-jobs-alist '())
   ;; notify running job that it may have been preempted
@@ -241,16 +243,15 @@ arguments necessary for the job.")
   (gnus-picons-set-buffer)
   (gnus-picons-remove-all))
 
-(defun gnus-picons-make-annotation (&rest args)
-  (let ((annot (apply 'make-annotation args)))
-    (set-extent-property annot 'gnus-picon t)
-    (set-extent-property annot 'duplicable t)
-    annot))
+;; (defun gnus-picons-make-annotation (&rest args)
+;;   (let ((annot (apply 'make-annotation args)))
+;;     (set-extent-property annot 'gnus-picon t)
+;;     (set-extent-property annot 'duplicable t)
+;;     annot))
 
 (defun gnus-picons-make-annotation (&rest args)
   nil)
 
-
 (defun gnus-article-display-picons ()
   "Display faces for an author and her domain in gnus-picons-display-where."
   (interactive)