summaryrefslogtreecommitdiff
path: root/lisp/bookmark.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/bookmark.el')
-rw-r--r--lisp/bookmark.el10
1 files changed, 2 insertions, 8 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index d8d90d6d6f7..5da231cf3ae 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -297,7 +297,6 @@ through a file easier.")
(defvar bookmark-yank-point 0)
(defvar bookmark-current-buffer nil)
-(defvar Info-current-node)
(defvar Info-suffix-list)
;; Helper functions.
@@ -850,8 +849,7 @@ Default to file name if it's nil."
(defun bookmark-buffer-name ()
- "Return the name of the current buffer's file, non-directory.
-In Info, return the current node."
+ "Return the name of the current buffer's file, non-directory."
(cond
;; Or are we a file?
(buffer-file-name (file-name-nondirectory buffer-file-name))
@@ -885,12 +883,8 @@ In Info, return the current node."
(setq bookmark-yank-point (point)))))))
(insert string)))
-
-(defvar Info-current-file)
-
(defun bookmark-buffer-file-name ()
- "Return the current buffer's file in a way useful for bookmarks.
-For example, if this is a Info buffer, return the Info file's name."
+ "Return the current buffer's file in a way useful for bookmarks."
(cond
(buffer-file-name
;; Abbreviate the path, both so it's shorter and so it's more