2 files changed, 24 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6985c85107b..a3c63fba027 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2008-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * autoinsert.el (auto-insert-alist): Update to FDL 1.2.
+
+        * emacs-lisp/byte-run.el (make-obsolete): Doc fix.
+
+        * mail/emacsbug.el: Remove leading `*' from defcustom doc-strings.
+        (Info-menu, Info-goto-node): Remove declarations.
+        (report-emacs-bug-info): Use info rather than Info-goto-node.
+
+        * progmodes/idlwave.el (Info-goto-node): Remove declaration.
+        (idlwave-convert-xml-system-routine-info): Don't require xml.
+        (idlwave-show-commentary, idlwave-shell-show-commentary):
+        Don't require finder.
+        (idlwave-info): Don't require info.  Use info rather than
+        Info-goto-node.
+
+        * textmodes/org.el (Info-goto-node): Remove declaration.
+        (org-info): Use info rather than Info-goto-node.
+
+        * textmodes/reftex.el (reftex-show-commentary): Don't require finder.
+        (reftex-info): Don't require info.  Use info rather than Info-goto-node.
+
 2008-02-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * progmodes/hideshow.el (hs-minor-mode-menu): Add some options to
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index bc63a962b9c..98a2c668e51 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -4105,7 +4105,6 @@ If it is less than 8, the level-1 face gets re-used for level N+1 etc."
                   (date string specifier &optional marker globcolor literal))
 (declare-function table--at-cell-p "table" (position &optional object at-column))
 (declare-function Info-find-node "info" (filename nodename &optional no-going-back))
-(declare-function Info-goto-node "info" (nodename &optional fork))
 (declare-function bbdb "ext:bbdb-com" (string elidep))
 (declare-function bbdb-company "ext:bbdb-com" (string elidep))
 (declare-function bbdb-current-record "ext:bbdb-com" (&optional planning-on-modifying))
@@ -26976,8 +26975,7 @@ See the individual commands for more information."
   "Read documentation for Org-mode in the info system.
 With optional NODE, go directly to that node."
   (interactive)
-  (require 'info)
-  (Info-goto-node (format "(org)%s" (or node ""))))
+  (info (format "(org)%s" (or node ""))))
 
 (defun org-install-agenda-files-menu ()
   (let ((bl (buffer-list)))