* dgnushack.el: Autoload Info-index and Info-index-next for XEmacs.

* lpath.el: Fbind Info-index and Info-index-next for Emacs 21, 22.

* gnus-art.el (gnus-button-handle-info-keystrokes): Don't use optional args of
 `how-many' of which the XEmacs version doesn't take;
 declare Info-index-next as function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3919b94..6ecc7d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * dgnushack.el: Autoload Info-index and Info-index-next for XEmacs.
+
+       * lpath.el: Fbind Info-index and Info-index-next for Emacs 21, 22.
+
+       * gnus-art.el (gnus-button-handle-info-keystrokes): Don't use optional
+       args of `how-many' of which the XEmacs version doesn't take; declare
+       Info-index-next as function.
+
 2008-03-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-score.el (gnus-score-headers): Fix handling of

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index b9c3ca2..797f038 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -203,6 +203,8 @@ fixed in Emacs 22."
     (unless (fboundp 'defadvice)
       (autoload 'defadvice "advice" nil nil 'macro))
     (autoload 'Info-directory "info" nil t)
+    (autoload 'Info-index "info" nil t)
+    (autoload 'Info-index-next "info" nil t)
     (autoload 'Info-menu "info" nil t)
     (autoload 'ad-add-advice "advice")
     (autoload 'annotations-at "annotations")

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 04b28b6..4f6b9aa 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -7893,6 +7893,7 @@ url is put as the `gnus-button-url' overlay property on the button."
 
 ;; (info) will autoload info.el
 (declare-function Info-menu "info" (menu-item &optional fork))
+(declare-function Info-index-next "info" (num))
 
 (defun gnus-button-handle-info-keystrokes (url)
   "Call `info' when pushing the corresponding URL button."
@@ -7920,7 +7921,10 @@ url is put as the `gnus-button-url' overlay property on the button."
       (when comma
        (dotimes (i (with-temp-buffer
                      (insert comma)
-                     (how-many "," (point-min) (point-max))))
+                     ;; Note: the XEmacs version of `how-many' takes
+                     ;; no optional argument.
+                     (goto-char (point-min))
+                     (how-many ",")))
          (Info-index-next 1)))
       nil)))
 

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 5a86223..4499fb3 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -18,10 +18,11 @@
   (when (<= emacs-major-version 22)
     (defun nnkiboze-score-file (a))
     (maybe-fbind
-     '(Info-menu
-       bbdb-complete-name display-time-event-handler epg-check-configuration
-       find-coding-system frame-device w3-do-setup w3-prepare-buffer w3-region
-       w32-focus-frame w3m-detect-meta-charset w3m-region)))
+     '(Info-index
+       Info-index-next Info-menu bbdb-complete-name display-time-event-handler
+       epg-check-configuration find-coding-system frame-device w3-do-setup
+       w3-prepare-buffer w3-region w32-focus-frame w3m-detect-meta-charset
+       w3m-region)))
 
   (when (= emacs-major-version 21)
     (defun split-line (&optional arg))