Sync up with r21-4-10-utf-2000-0_20-11.

[chise/xemacs-chise.git] / lisp / info.el

diff --git a/lisp/info.el b/lisp/info.el
index bc8f765..be66af1 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2008,7 +2008,7 @@ NAME may be an abbreviation of the reference name."
            ;; Kludge.
            ;; Allow dots in node name not followed by whitespace.
            (re-search-forward
-            (concat "\\(([^)]+)[^."
+            (concat "\\(([^)]+)[^.,"
                     (if multi-line "" "\n")
                     "]*\\|\\([^.,\t"
                     (if multi-line "" "\n")
@@ -2430,7 +2430,8 @@ This command is designed to be used whether you are already in Info or not."
                                    (if fn
                                        (format " (default %s)" fn)
                                      ""))
-                           obarray 'fboundp t))
+                           obarray 'fboundp t
+                            nil nil (and fn (symbol-name fn))))
                 (list (if (equal val "")
                           fn (intern val)))))
   (save-window-excursion
@@ -3103,7 +3104,7 @@ The locations are of the format used in Info-history, i.e.
            (forward-char 1)
            (insert "\n")
            (just-one-space)
-           (backward-delete-char 1)
+           (delete-backward-char 1)
            (setq p (point)
                  len 0))))
       (toggle-read-only 1)