Changeset 3988 for vendor/emacs-CVS_HEAD/lisp/info.el

Timestamp:

11/26/05 08:33:26 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• vendor/emacs-CVS_HEAD/lisp/info.el (modified) (22 diffs)

vendor/emacs-CVS_HEAD/lisp/info.el

@@ -291 +291 @@
-  "Info file that Info is now looking at, or nil.
-This is the name that was specified in Info, not the actual file name.
-
-
+
-
-(defvar Info-current-subfile nil
@@ -310 +309 @@
-(defvar Info-current-file-completions nil
-  "Cached completion list for current Info file.")
+
+(defvar Info-file-supports-index-cookies nil
+  "Non-nil if current Info file supports index cookies.")
-
-(defvar Info-index-alternatives nil
@@ -689 +691 @@
-  (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
-  ;; Record the node we are leaving.
-and Info-current-file (not no-going-back)
+not no-going-back
-      (setq Info-history
-            (cons (list Info-current-file Info-current-node (point))
@@ -695 +697 @@
-  (Info-find-node-2 filename nodename no-going-back))
-
+;;;###autoload
-(defun Info-on-current-buffer (&optional nodename)
-  "Use the `Info-mode' to browse the current Info buffer.
@@ -706 +709 @@
-  (info-initialize)
-  (Info-mode)
-
+
+
+
+
-  (Info-find-node-2 nil nodename))
-
@@ -724 +730 @@
-        (wline        (count-lines (point-min) (window-start)))
-        (old-history  Info-history)
-
-
+
-    (kill-buffer (current-buffer))
-    (Info-find-node filename nodename)
@@ -843 +848 @@
-                (setq default-directory (file-name-directory filename))))
-              (set-buffer-modified-p nil)
+
+              ;; Check makeinfo version for index cookie support
+              (let ((found nil))
+                (goto-char (point-min))
+                (condition-case ()
+                    (if (and (re-search-forward
+                              "makeinfo version \\([0-9]+.[0-9]+\\)"
+                              (line-beginning-position 3) t)
+                             (not (version< (match-string 1) "4.7")))
+                        (setq found t))
+                  (error nil))
+                (set (make-local-variable 'Info-file-supports-index-cookies) found))
+
-              ;; See whether file has a tag table.  Record the location if yes.
-              (goto-char (point-max))
@@ -1385 +1403 @@
-               (list
-                (concat " ("
-
-
-
-
-
-
+
+
+
+
-
-;; Go to an Info node specified with a filename-and-nodename string
@@ -1869 +1885 @@
-          (old-file Info-current-file)
-          (node (Info-extract-pointer "up")) p)
-(or same-file (not (stringp Info-current-file)))
+same-file
-           (string-match "^(" node)
-           (error "Up node is in another Info file"))
@@ -1946 +1962 @@
-                       (string-equal node curr-node))
-                  (setq p (point)))
-
+
+
+
-                      ")" node ".\n"))
-            (setq hl (cdr hl))))))
@@ -2650 +2668 @@
-           (setq Info-index-nodes (cons (cons file nil) Info-index-nodes)))
-      (not (stringp file))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      ;; If file has no index nodes, still add it to the cache
-      (setq Info-index-nodes (cons (cons file nil) Info-index-nodes)))
@@ -2719 +2738 @@
-    ;; Don't search all index nodes if request is only for the current node
-    ;; and file is not in the cache of index nodes
-or
-
-
-
-
-
-
-
-
-                       (search-forward "\n\^_" nil t))
-                           (point-max)) t
+if Info-file-supports-index-cookies
+
+
+
+
+
+
+
+
+(save-match-data
+       (string-match "\\<Index\\>" (or node Info-current-node "")
-
-(defun Info-goto-index ()
@@ -3163 +3182 @@
-      (let ((map (make-sparse-keymap)))
-        (tool-bar-local-item-from-menu 'Info-exit "close" map Info-mode-map)
-left-arrow
-right-arrow
-arrow
-back
-fwd
+prev-node
+next-node
+node
+left
+right
-        (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map)
-        (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map)
@@ -3248 +3267 @@
-  (unless Info-current-node
-    (error "No current Info node"))
-
-
-
-
-
-
+
+
-    (if (zerop (prefix-numeric-value arg))
-        (setq node (concat "(info \"" node "\")")))
@@ -3505 +3520 @@
-            (setq file-list (cdr file-list))))))
-    (Info-find-node info-file "Top")
-    (or (and (search-forward "\n* menu:" nil t)
-             (re-search-forward "\n\\* \\(.*\\<Index\\>\\)" nil t))
-        (error "Info file `%s' appears to lack an index" info-file))
-    (goto-char (match-beginning 1))
-    ;; Bind Info-history to nil, to prevent the index nodes from
-    ;; getting into the node history.
@@ -3650 +3661 @@
-                 (tbeg (match-beginning 1))
-                 (tag (match-string 1)))
-tag "N
+(downcase tag) "n
-                (put-text-property nbeg nend 'font-lock-face 'info-header-node)
-              (put-text-property nbeg nend 'font-lock-face 'info-header-xref)
@@ -3661 +3672 @@
-              ;; It will either be used in the buffer
-              ;; or copied in the header line.
-
-
-
-
-
+
+
+
+
+
+
-        (when Info-use-header-line
-          (goto-char (point-min))
@@ -3707 +3719 @@
-                    ;; counter example is when a continuation "..." is alone
-                    ;; on a line.
-- (match-end 1) (match-beginn
-- (match-end 2) (match-beginn
+string-width (match-str
+string-width (match-str
-          (let* ((c (preceding-char))
-                 (face
@@ -3742 +3754 @@
-                    (skip-syntax-backward " ("))
-                  (setq other-tag
-
+
+
+
-                               "See ")
-                              ((save-match-data
@@ -3787 +3801 @@
-                                                  (match-string 4))
-                                             (match-string 2)))))
-
-
+
-                                 (hl Info-history-list)
-                                 res)
-                            (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
-
-
+
-                                      node (if (equal (match-string 2 node) "")
-                                               "Top"
-                                             (match-string 2 node))))
-
-
-
-
-
-
-
+
+
+
+
+
-                            res))) 'info-xref-visited 'info-xref))
-              ;; For multiline ref, unfontify newline and surrounding whitespace
@@ -3896 +3906 @@
-                                            (match-string 1)
-                                          (match-string 3)))
-(file-name-nondirectory Info-current-file)
+Info-current-file
-                                  (hl Info-history-list)
-                                  res)
-                              (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
-
-
+
-                                        node (if (equal (match-string 2 node) "")
-                                                 "Top"
-                                               (match-string 2 node))))
-
-
-
-
-
-
-
+
+
+
+
+
-                              res))) 'info-xref-visited 'info-xref)))
-              (when (and not-fontified-p (memq Info-hide-note-references '(t hide)))
@@ -4104 +4111 @@
-  (save-excursion
-    ;; Set up a buffer we can use to fake-out Info.
-
+ 
-    (if (not (equal major-mode 'Info-mode))
-        (Info-mode))