diff options
| author | Richard M. Stallman | 2005-08-09 02:54:39 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-08-09 02:54:39 +0000 |
| commit | 08dcfdf600a6bde303f264938b39204d4830a0f6 (patch) | |
| tree | 795af6bbeed4e8cdb84cfe27061df1de7c854601 | |
| parent | 603715b0614809501af80a8888cf4f3c90f3e97d (diff) | |
| download | emacs-08dcfdf600a6bde303f264938b39204d4830a0f6.tar.gz emacs-08dcfdf600a6bde303f264938b39204d4830a0f6.zip | |
(Info-current-file): Add defvar.
(bookmark-jump-noselect): Use with-no-warnings.
| -rw-r--r-- | lisp/bookmark.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 4ec78468beb..da8a4e2b809 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -993,6 +993,8 @@ In Info, return the current node." | |||
| 993 | (insert string))) | 993 | (insert string))) |
| 994 | 994 | ||
| 995 | 995 | ||
| 996 | (defvar Info-current-file) | ||
| 997 | |||
| 996 | (defun bookmark-buffer-file-name () | 998 | (defun bookmark-buffer-file-name () |
| 997 | "Return the current buffer's file in a way useful for bookmarks. | 999 | "Return the current buffer's file in a way useful for bookmarks. |
| 998 | For example, if this is a Info buffer, return the Info file's name." | 1000 | For example, if this is a Info buffer, return the Info file's name." |
| @@ -1102,7 +1104,8 @@ be retrieved from a VC backend, else return nil." | |||
| 1102 | ;; Info nodes must be visited with care. | 1104 | ;; Info nodes must be visited with care. |
| 1103 | (progn | 1105 | (progn |
| 1104 | (require 'info) | 1106 | (require 'info) |
| 1105 | (Info-find-node file info-node)) | 1107 | (with-no-warnings |
| 1108 | (Info-find-node file info-node))) | ||
| 1106 | ;; Else no Info. Can do an ordinary find-file: | 1109 | ;; Else no Info. Can do an ordinary find-file: |
| 1107 | (set-buffer (find-file-noselect file)) | 1110 | (set-buffer (find-file-noselect file)) |
| 1108 | (goto-char place)) | 1111 | (goto-char place)) |