*** empty log message ***

[gnu-emacs] / lisp / info.el

diff --git a/lisp/info.el b/lisp/info.el
index 5248639b946dc49e5fd752d4924443880a14666a..5bbbd60019e1bec38928be93f9a7962a9dd749d3 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,7 +1,8 @@
 ;;; info.el --- info package for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
@@ -1549,13 +1550,12 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
           1
         0)))
 
-(defun Info-read-node-name (prompt &optional default)
+(defun Info-read-node-name (prompt)
   (let* ((completion-ignore-case t)
         (Info-read-node-completion-table (Info-build-node-completions))
         (nodename (completing-read prompt 'Info-read-node-name-1 nil t)))
     (if (equal nodename "")
-       (or default
-           (Info-read-node-name prompt))
+       (Info-read-node-name prompt)
       nodename)))
 
 (defun Info-build-node-completions ()
@@ -2672,7 +2672,7 @@ See `Info-scroll-down'."
 (defun Info-next-reference (&optional recur)
   "Move cursor to the next cross-reference or menu item in the node."
   (interactive)
-  (let ((pat "\\*note[ \n\t]+\\([^:]+\\):\\|^\\* .*:\\|[hf]t?tp://")
+  (let ((pat "\\*note[ \n\t]+\\([^:]+\\):\\|^\\* .*:\\|[hf]t?tps?://")
        (old-pt (point))
        (case-fold-search t))
     (or (eobp) (forward-char 1))
@@ -2694,7 +2694,7 @@ See `Info-scroll-down'."
 (defun Info-prev-reference (&optional recur)
   "Move cursor to the previous cross-reference or menu item in the node."
   (interactive)
-  (let ((pat "\\*note[ \n\t]+\\([^:]+\\):\\|^\\* .*:\\|[hf]t?tp://")
+  (let ((pat "\\*note[ \n\t]+\\([^:]+\\):\\|^\\* .*:\\|[hf]t?tps?://")
        (old-pt (point))
        (case-fold-search t))
     (or (re-search-backward pat nil t)
@@ -3122,7 +3122,7 @@ If FORK is a string, it is the name to use for the new buffer."
 If FORK is non-nil, it i spassed to `Info-goto-node'."
   (let (node)
     (cond
-     ((Info-get-token (point) "[hf]t?tp://" "[hf]t?tp://\\([^ \t\n\"`({<>})']+\\)")
+     ((Info-get-token (point) "[hf]t?tps?://" "[hf]t?tps?://\\([^ \t\n\"`({<>})']+\\)")
       (setq node t)
       (browse-url (browse-url-url-at-point)))
      ((setq node (Info-get-token (point) "\\*note[ \n\t]+"
@@ -3374,6 +3374,7 @@ With a zero prefix arg, put the name inside a function call to `info'."
 (put 'Info-mode 'no-clone-indirect t)
 
 (defvar tool-bar-map)
+(defvar bookmark-make-cell-function)
 
 ;; Autoload cookie needed by desktop.el
 ;;;###autoload
@@ -4320,7 +4321,12 @@ BUFFER is the buffer speedbar is requesting buttons for."
 
 ;;;; Bookmark support
 
-(defun Info-bookmark-make-cell (annotation &rest args)
+(defvar bookmark-search-size)
+
+;; This is only called from bookmark.el.
+(declare-function bookmark-buffer-file-name "bookmark" ())
+
+(defun Info-bookmark-make-cell (annotation &optional info-node)
   (let ((the-record
          `((filename . ,(bookmark-buffer-file-name))
            (front-context-string
@@ -4350,6 +4356,15 @@ BUFFER is the buffer speedbar is requesting buttons for."
     ;; Finally, return the completed record.
     the-record))
 
+(defvar bookmark-current-bookmark)
+(declare-function bookmark-get-filename              "bookmark" (bookmark))
+(declare-function bookmark-get-front-context-string  "bookmark" (bookmark))
+(declare-function bookmark-get-rear-context-string   "bookmark" (bookmark))
+(declare-function bookmark-get-position              "bookmark" (bookmark))
+(declare-function bookmark-get-info-node             "bookmark" (bookmark))
+(declare-function bookmark-file-or-variation-thereof "bookmark" (file))
+(declare-function bookmark-jump-noselect             "bookmark" (str))
+
 ;;;###autoload
 (defun Info-bookmark-jump (bmk)
   ;; This implements the `handler' function interface for record type returned
@@ -4363,7 +4378,6 @@ BUFFER is the buffer speedbar is requesting buttons for."
     (if (setq file (bookmark-file-or-variation-thereof file))
         (save-excursion
           (save-window-excursion
-           (require 'info)
            (with-no-warnings
              (Info-find-node file info-node))
            ;; Go searching forward first.  Then, if forward-str exists and was