diff options
| author | Richard M. Stallman | 1992-08-14 07:50:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1992-08-14 07:50:26 +0000 |
| commit | a4223f965ae478b61dd09fb7398f236c75fad12a (patch) | |
| tree | 270b9c49b6a2f72e04062a095d4c81a7ec4c3022 | |
| parent | 42a9cd6a9cf7e2133c185023b98b9be2f9ad3575 (diff) | |
| download | emacs-a4223f965ae478b61dd09fb7398f236c75fad12a.tar.gz emacs-a4223f965ae478b61dd09fb7398f236c75fad12a.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/info.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/info.el b/lisp/info.el index 996c35152d6..a044aa77796 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -186,15 +186,16 @@ to read a file name from the minibuffer." | |||
| 186 | (progn (setq Info-current-node nodename) | 186 | (progn (setq Info-current-node nodename) |
| 187 | (Info-set-mode-line)) | 187 | (Info-set-mode-line)) |
| 188 | ;; Search file for a suitable node. | 188 | ;; Search file for a suitable node. |
| 189 | ;; First get advice from tag table if file has one. | 189 | (let ((guesspos (point-min)) |
| 190 | ;; Also, if this is an indirect info file, | 190 | (regexp (concat "Node: *" (regexp-quote nodename) " *[,\t\n\177]"))) |
| 191 | ;; read the proper subfile into this buffer. | 191 | ;; First get advice from tag table if file has one. |
| 192 | (let ((guesspos (point-min))) | 192 | ;; Also, if this is an indirect info file, |
| 193 | ;; read the proper subfile into this buffer. | ||
| 193 | (if (marker-position Info-tag-table-marker) | 194 | (if (marker-position Info-tag-table-marker) |
| 194 | (save-excursion | 195 | (save-excursion |
| 195 | (set-buffer (marker-buffer Info-tag-table-marker)) | 196 | (set-buffer (marker-buffer Info-tag-table-marker)) |
| 196 | (goto-char Info-tag-table-marker) | 197 | (goto-char Info-tag-table-marker) |
| 197 | (if (search-forward (concat "Node: " nodename "\177") nil t) | 198 | (if (re-search-forward regexp nil t) |
| 198 | (progn | 199 | (progn |
| 199 | (setq guesspos (read (current-buffer))) | 200 | (setq guesspos (read (current-buffer))) |
| 200 | ;; If this is an indirect file, | 201 | ;; If this is an indirect file, |
| @@ -204,10 +205,9 @@ to read a file name from the minibuffer." | |||
| 204 | (setq guesspos | 205 | (setq guesspos |
| 205 | (Info-read-subfile guesspos)))) | 206 | (Info-read-subfile guesspos)))) |
| 206 | (error "No such node: \"%s\"" nodename)))) | 207 | (error "No such node: \"%s\"" nodename)))) |
| 207 | (goto-char (max (point-min) (- guesspos 1000)))) | 208 | (goto-char (max (point-min) (- guesspos 1000))) |
| 208 | ;; Now search from our advised position (or from beg of buffer) | 209 | ;; Now search from our advised position (or from beg of buffer) |
| 209 | ;; to find the actual node. | 210 | ;; to find the actual node. |
| 210 | (let ((regexp (concat "Node: *" (regexp-quote nodename) " *[,\t\n]"))) | ||
| 211 | (catch 'foo | 211 | (catch 'foo |
| 212 | (while (search-forward "\n\^_" nil t) | 212 | (while (search-forward "\n\^_" nil t) |
| 213 | (forward-line 1) | 213 | (forward-line 1) |