mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* bookmark.el (bookmark-make-record-function): Change expected return value

Browse source 
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.
This commit is contained in:
Stefan Monnier 2008-03-09 21:35:01 +00:00
parent a7e83b26f8
commit 136894c8fc
3 changed files with 71 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/info.el
View file

@ -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