Mercurial > emacs
diff lisp/bookmark.el @ 92789:61c661dac856
(Info-current-node): Remove.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 13 Mar 2008 01:57:05 +0000 |
parents | ae00481eacc1 |
children | 442e2ad714cd |
line wrap: on
line diff
--- a/lisp/bookmark.el Wed Mar 12 21:55:02 2008 +0000 +++ b/lisp/bookmark.el Thu Mar 13 01:57:05 2008 +0000 @@ -297,7 +297,6 @@ (defvar bookmark-yank-point 0) (defvar bookmark-current-buffer nil) -(defvar Info-current-node) (defvar Info-suffix-list) ;; Helper functions. @@ -850,8 +849,7 @@ (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 @@ (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