*** empty log message ***

[gnu-emacs] / lisp / info.el

diff --git a/lisp/info.el b/lisp/info.el
index 91305ee025b872b5de21f3004605e02eff224c06..5bbbd60019e1bec38928be93f9a7962a9dd749d3 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1550,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 ()
@@ -2673,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))
@@ -2695,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)
@@ -3123,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]+"