diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-09 21:35:01 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-09 21:35:01 +0000 |
| commit | 136894c8fc052b51d5558c169881d92086158e8e (patch) | |
| tree | 4ec5ffeef07231395c7c5782f921f311e496bc8a /lisp/info.el | |
| parent | a7e83b26f856eeec1f7fbd6bf4c2374cf3db8c1a (diff) | |
| download | emacs-136894c8fc052b51d5558c169881d92086158e8e.tar.gz emacs-136894c8fc052b51d5558c169881d92086158e8e.tar.bz2 emacs-136894c8fc052b51d5558c169881d92086158e8e.zip | |
* bookmark.el (bookmark-make-record-function): Change expected return value
to include a suggested bookmark name.
(bookmark-make): Split into bookmark-make-record and bookmark-store.
Fix reversed `overwrite' semantics.
(bookmark-set): Call bookmark-make-record before prompting the user.
Then pass the result to bookmark-store later on.
(bookmark-make-name-function): Remove.
(bookmark-buffer-file-name, bookmark-buffer-name): Don't use it.
* info.el (bookmark-make-name-function): Remove.
(Info-mode): Don't set it.
(Info-bookmark-make-name): Remove.
(Info-bookmark-make-record): Use Info-current-node as suggested default
bookmark name.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lisp/info.el b/lisp/info.el index d93d93e7c4b..5a0c4ce6611 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -3375,7 +3375,6 @@ With a zero prefix arg, put the name inside a function call to `info'." (defvar tool-bar-map) (defvar bookmark-make-record-function) -(defvar bookmark-make-name-function) ;; Autoload cookie needed by desktop.el ;;;###autoload @@ -3490,8 +3489,6 @@ Advanced commands: (Info-set-mode-line) (set (make-local-variable 'bookmark-make-record-function) 'Info-bookmark-make-record) - (set (make-local-variable 'bookmark-make-name-function) - 'Info-bookmark-make-name) (run-mode-hooks 'Info-mode-hook)) ;; When an Info buffer is killed, make sure the associated tags buffer @@ -4329,15 +4326,9 @@ BUFFER is the buffer speedbar is requesting buttons for." ;; This is only called from bookmark.el. (declare-function bookmark-buffer-file-name "bookmark" ()) - -(defun Info-bookmark-make-name (&optional file) - "Return the default name for the bookmark. -When FILE is non-nil, return the Info file instead." - (if file Info-current-file Info-current-node)) - - (defun Info-bookmark-make-record () - `((filename . ,(bookmark-buffer-file-name)) + `(,Info-current-node + (filename . ,(bookmark-buffer-file-name)) (front-context-string . ,(if (>= (- (point-max) (point)) bookmark-search-size) (buffer-substring-no-properties |