[Emacs-diffs] Changes to emacs/lisp/info.el

[Stefan Monnier]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.427 emacs/lisp/info.el:1.428
*** emacs/lisp/info.el:1.427    Thu May 26 13:01:03 2005
--- emacs/lisp/info.el  Fri May 27 16:19:35 2005
***************
*** 1,7 ****
  ;;; info.el --- info package for Emacs
  
! ;; Copyright (C) 1985,86,92,93,94,95,96,97,98,99,2000,01,02,03,04,2005
! ;;  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: help
--- 1,7 ----
  ;;; info.el --- info package for Emacs
  
! ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! ;;   2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: help
***************
*** 515,523 ****
        ;; since the argument will then be parsed improperly.  This also
        ;; has the added benefit of allowing node names to be included
        ;; following the parenthesized filename.
!       (if (and (stringp file) (string-match "(.*)" file))
!         (Info-goto-node file)
!       (Info-goto-node (concat "(" file ")")))
      (if (zerop (buffer-size))
          (Info-directory))))
  
--- 515,524 ----
        ;; since the argument will then be parsed improperly.  This also
        ;; has the added benefit of allowing node names to be included
        ;; following the parenthesized filename.
!       (Info-goto-node
!        (if (and (stringp file) (string-match "(.*)" file))
!            file
!          (concat "(" file ")")))
      (if (zerop (buffer-size))
          (Info-directory))))
  
***************
*** 1344,1350 ****
  ;; Go to an info node specified with a filename-and-nodename string
  ;; of the sort that is found in pointers in nodes.
  
! ;;;###autoload
  (defun Info-goto-node (nodename &optional fork)
    "Go to info node named NODENAME.  Give just NODENAME or (FILENAME)NODENAME.
  If NODENAME is of the form (FILENAME)NODENAME, the node is in the Info file
--- 1345,1353 ----
  ;; Go to an info node specified with a filename-and-nodename string
  ;; of the sort that is found in pointers in nodes.
  
! ;; Don't autoload this function: the correct entry point for other packages
! ;; to use is `info'.  --Stef
! ;; ;;;###autoload
  (defun Info-goto-node (nodename &optional fork)
    "Go to info node named NODENAME.  Give just NODENAME or (FILENAME)NODENAME.
  If NODENAME is of the form (FILENAME)NODENAME, the node is in the Info file
***************
*** 4127,4131 ****
  
  (provide 'info)
  
! ;;; arch-tag: f2480fe2-2139-40c1-a49b-6314991164ac
  ;;; info.el ends here
--- 4130,4134 ----
  
  (provide 'info)
  
! ;; arch-tag: f2480fe2-2139-40c1-a49b-6314991164ac
  ;;; info.el ends here