From 8ebaa6c769ac8dbb97e8cb283daf784e8ffb1b56 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 3 Oct 2000 03:26:54 +0000
Subject: [PATCH] * gnus-group.el (gnus-group-get-new-news): Update modeline
 using `gnus-agent-toggle-plugged' if agent is activated. *
 gnus-agent.el (gnus-group-get-new-news): Don't advise it,
 merge it into gnus-group.el instead.

* gnus-offline.el (gnus-offline-after-jobs-done): Use `ding' with
`play-sound-file' for XEmacs statically.

* gnus-art.el (gnus-article-add-button): Quote `:button-keymap' for Mule 2.3
but it won't work.

* dgnushack.el: (dgnushack-compile): Don't conpile dgnushack.el nor lpath.el.
---
 ChangeLog            |   16 ++++++++++++++++
 lisp/dgnushack.el    |    5 +++--
 lisp/gnus-agent.el   |   10 ----------
 lisp/gnus-art.el     |    4 +++-
 lisp/gnus-group.el   |    5 ++++-
 lisp/gnus-offline.el |    7 ++++---
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d3a4df..bbad84d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-03  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-group.el (gnus-group-get-new-news): Update modeline
+	using `gnus-agent-toggle-plugged' if agent is activated.
+	* lisp/gnus-agent.el (gnus-group-get-new-news): Don't advise it,
+	merge it into gnus-group.el instead.
+
+	* lisp/gnus-offline.el (gnus-offline-after-jobs-done): Use `ding'
+	with `play-sound-file' for XEmacs statically.
+
+	* lisp/gnus-art.el (gnus-article-add-button): Quote
+	`:button-keymap' for Mule 2.3 but it won't work.
+
+	* lisp/dgnushack.el: (dgnushack-compile): Don't conpile
+	dgnushack.el nor lpath.el.
+
 2000-09-29  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* lisp/message.el (message-ignored-supersedes-headers): Synch with
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index cac6741..0a43379 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -195,11 +195,12 @@ You also then need to add the following to the lisp/dgnushack.el file:
      (push \"~/lisp/custom\" load-path)
 
 Modify to suit your needs."))
-  (let ((files (delete "dgnuspath.el"
-		       (directory-files srcdir nil "^[^=].*\\.el$")))
+  (let ((files (directory-files srcdir nil "^[^=].*\\.el$"))
 	(xemacs (string-match "XEmacs" emacs-version))
 	;;(byte-compile-generate-call-tree t)
 	file elc)
+    (dolist (file '("dgnushack.el" "dgnuspath.el" "lpath.el"))
+      (setq files (delete file files)))
     (condition-case ()
 	(require 'w3-forms)
       (error
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 78be9e9..19ca139 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1641,16 +1641,6 @@ The following commands are available:
   (gnus-group-send-drafts)
   (gnus-agent-fetch-session))
 
-;;;
-;;; Advice
-;;;
-
-(defadvice gnus-group-get-new-news (after gnus-agent-advice
-					  activate preactivate)
-  "Update modeline."
-  (unless (interactive-p)
-    (gnus-agent-toggle-plugged gnus-plugged)))
-
 (provide 'gnus-agent)
 
 ;;; gnus-agent.el ends here
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index c840e4f..1b438b9 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4861,7 +4861,9 @@ specified by `gnus-button-alist'."
 	  (list 'gnus-callback fun)
 	  (and data (list 'gnus-data data))))
   (widget-convert-button 'link from to :action 'gnus-widget-press-button
-			 :button-keymap gnus-widget-button-keymap))
+			 ;; Quote `:button-keymap' for Mule 2.3
+			 ;; but it won't work.
+			 ':button-keymap gnus-widget-button-keymap))
 
 ;;; Internal functions:
 
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index b2e4372..9077ce9 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3218,7 +3218,10 @@ re-scanning.  If ARG is non-nil and not a number, this will force
 	(gnus-get-unread-articles arg)))
     (gnus-run-hooks 'gnus-after-getting-new-news-hook)
     (gnus-group-list-groups (and (numberp arg)
-				 (max (car gnus-group-list-mode) arg)))))
+				 (max (car gnus-group-list-mode) arg))))
+  ;; Update modeline.
+  (when (and gnus-agent (not (interactive-p)))
+    (gnus-agent-toggle-plugged gnus-plugged)))
 
 (defun gnus-group-get-new-news-this-group (&optional n dont-scan)
   "Check for newly arrived news in the current group (and the N-1 next groups).
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 8fa6f2c..63e6c74 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -676,9 +676,10 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   (if (and (eq gnus-offline-news-fetch-method 'nnagent)
 	   gnus-offline-auto-expire)
       (gnus-agent-expire))
-  (if (and (featurep 'xemacs)
-	   (fboundp 'play-sound-file))
-      (ding nil 'drum)
+  (static-if (featurep 'xemacs)
+      (if (fboundp 'play-sound-file)
+	  (ding nil 'drum)
+	(ding))
     (ding))
   (gnus-group-save-newsrc)
   (message "%s" (gnus-offline-gettext 'after-jobs-done-1)))
-- 
1.7.10.4