Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9f74d2..e67ddbc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-agent.el (gnus-agent-check-overview-buffer): No warning.
+
+2002-11-26  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+       * gnus-agent.el (gnus-agent-check-overview-buffer): Explicitly
+       require thingatpt (for number-at-point) and protect against
+       deactivate-mark being unbound (on XEmacs).
+
 2002-11-25  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * gnus-agent.el (gnus-agent-check-overview-buffer): Make debugger

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 28899de..da70485 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1090,11 +1090,14 @@ This can be added to `gnus-select-article-hook' or
 In particular, checks that the file is sorted by article number
 and that there are no duplicates."
   (let (prev-num)
+    (require 'thingatpt)
     (save-excursion
       (when buffer (set-buffer buffer))
       (save-excursion
         (save-restriction
-          (let ((deactivate-mark deactivate-mark))
+          (let ((deactivate-mark (if (boundp 'deactivate-mark)
+                                    (symbol-value 'deactivate-mark)
+                                  nil)))
             (widen)
             (goto-char (point-min))
             (setq prev-num (number-at-point))