(defvar bookmark-current-buffer nil
- "The buffer in which a bookmark is currently being set or renamed.
-Functions that insert strings into the minibuffer use this to know
-the source buffer for that information; see `bookmark-yank-word'
-for example.")
-
-
-(defvar bookmark-yank-point 0
- "The next point from which to pull source text for `bookmark-yank-word'.
-This point is in `bookmark-current-buffer'.")
-
+ "The buffer in which a bookmark is currently being set or renamed.")
(defvar bookmark-quit-flag nil
"Non-nil means `bookmark-bmenu-search' quits immediately.")
(define-obsolete-function-alias 'bookmark-maybe-message 'message "27.1")
(defvar-keymap bookmark-minibuffer-read-name-map
- :parent minibuffer-local-map
- "C-w" #'bookmark-yank-word)
+ :doc "This variable is obsolete and no longer used.")
-(defun bookmark-set-internal (prompt name overwrite-or-push)
+(make-obsolete-variable 'bookmark-minibuffer-read-name-map
+ 'minibuffer-local-map "30.1")
+
+(defun bookmark-set-internal (name overwrite-or-push)
"Set a bookmark using specified NAME or prompting with PROMPT.
The bookmark is set at the current location.
-If NAME is non-nil, use it as the name of the new bookmark. In
-this case, the value of PROMPT is ignored.
-
-Otherwise, prompt the user for the bookmark name. Begin the
-interactive prompt with PROMPT, followed by a space, a generated
-default name in parentheses, a colon and a space.
-
OVERWRITE-OR-PUSH controls what happens if there is already a
bookmark with the same name: nil means signal an error;
`overwrite' means replace any existing bookmark; `push' means
behavior means that among bookmarks with the same name, this most
recently set one becomes the one in effect, but the others are
still there, in order, if the topmost one is ever deleted."
- (unwind-protect
- (let* ((record (bookmark-make-record))
- ;; `defaults' is a transient element of the
- ;; extensible format described above in the section
- ;; `File format stuff'. Bookmark record functions
- ;; can use it to specify a list of default values
- ;; accessible via M-n while reading a bookmark name.
- (defaults (bookmark-prop-get record 'defaults))
- (default (if (consp defaults) (car defaults) defaults)))
-
- (if defaults
- ;; Don't store default values in the record.
- (setq record (assq-delete-all 'defaults record))
- ;; When no defaults in the record, use its first element.
- (setq defaults (car record) default defaults))
-
- (bookmark-maybe-load-default-file)
- ;; Don't set `bookmark-yank-point' and `bookmark-current-buffer'
- ;; if they have been already set in another buffer. (e.g gnus-art).
- (unless (and bookmark-yank-point
- bookmark-current-buffer)
- (setq bookmark-yank-point (point))
- (setq bookmark-current-buffer (current-buffer)))
-
- (let ((str
- (or name
- (read-from-minibuffer
- (format-prompt prompt default)
- nil
- bookmark-minibuffer-read-name-map
- nil nil defaults))))
- (and (string-equal str "") (setq str default))
-
- (cond
- ((eq overwrite-or-push nil)
- (if (bookmark-get-bookmark str t)
- (error "A bookmark named \"%s\" already exists" str)
- (bookmark-store str (cdr record) nil)))
- ((eq overwrite-or-push 'overwrite)
- (bookmark-store str (cdr record) nil))
- ((eq overwrite-or-push 'push)
- (bookmark-store str (cdr record) t))
- (t
- (error "Unrecognized value for `overwrite-or-push': %S"
- overwrite-or-push)))
-
- ;; Ask for an annotation buffer for this bookmark
- (when bookmark-use-annotations
- (bookmark-edit-annotation str))
- (when bookmark-fringe-mark
- (bookmark--set-fringe-mark))))
- (setq bookmark-yank-point nil)
- (setq bookmark-current-buffer nil)))
-
+ (with-current-buffer (or bookmark-current-buffer (current-buffer))
+ (let* ((record (cdr (assq-delete-all 'defaults (bookmark-make-record)))))
+ (bookmark-maybe-load-default-file)
+ (cond
+ ((eq overwrite-or-push nil)
+ (if (bookmark-get-bookmark name t)
+ (error "A bookmark named \"%s\" already exists" name)
+ (bookmark-store name record nil)))
+ ((eq overwrite-or-push 'overwrite)
+ (bookmark-store name record nil))
+ ((eq overwrite-or-push 'push)
+ (bookmark-store name record t))
+ (t
+ (error "Unrecognized value for `overwrite-or-push': %S"
+ overwrite-or-push))))))
+
+(defun bookmark-read-bookmark-name (prompt)
+ (let* ((buffer (current-buffer))
+ (record (bookmark-make-record))
+ (defaults (or (bookmark-prop-get record 'defaults)
+ (car record))))
+ (minibuffer-with-setup-hook
+ (lambda ()
+ (setq-local bookmark-current-buffer buffer))
+ (read-string (format-prompt prompt defaults) nil nil defaults))))
;;;###autoload
-(defun bookmark-set (&optional name no-overwrite)
+(defun bookmark-set (name &optional no-overwrite)
"Set a bookmark named NAME at the current location.
-If NAME is nil, then prompt the user.
With a prefix arg (non-nil NO-OVERWRITE), do not overwrite any
existing bookmark that has the same name as NAME, but instead push the
others are still there, should the user decide to delete the most
recent one.
-To yank words from the text of the buffer and use them as part of the
-bookmark name, type \\<bookmark-minibuffer-read-name-map>\
-\\[bookmark-yank-word] while setting a bookmark. Successive \
-\\[bookmark-yank-word]'s
-yank successive words.
-
-Typing \\[universal-argument] inserts (at the bookmark name prompt) the name of the last
-bookmark used in the document where the new bookmark is being set;
-this helps you use a single bookmark name to track progress through a
-large document. If there is no prior bookmark for this document, then
-\\[universal-argument] inserts an appropriate name based on the buffer or file.
-
Use \\[bookmark-delete] to remove bookmarks (you give it a name and
it removes only the first instance of a bookmark with that name from
the list of bookmarks.)"
- (interactive (list nil current-prefix-arg))
- (let ((prompt
- (if no-overwrite "Add bookmark named" "Set bookmark named")))
- (bookmark-set-internal prompt name (if no-overwrite 'push 'overwrite))))
+ (interactive (list (bookmark-read-bookmark-name
+ (if current-prefix-arg "Add bookmark named" "Set bookmark named"))
+ current-prefix-arg))
+ (bookmark-set-internal name (if no-overwrite 'push 'overwrite)))
+
+(put 'bookmark-set 'minibuffer-action "set")
;;;###autoload
-(defun bookmark-set-no-overwrite (&optional name push-bookmark)
+(defun bookmark-set-no-overwrite (name &optional push-bookmark)
"Set a bookmark named NAME at the current location.
-If NAME is nil, then prompt the user.
If a bookmark named NAME already exists and prefix argument
PUSH-BOOKMARK is non-nil, then push the new bookmark onto the
Otherwise, if a bookmark named NAME already exists but PUSH-BOOKMARK
is nil, raise an error.
-To yank words from the text of the buffer and use them as part of the
-bookmark name, type \\<bookmark-minibuffer-read-name-map>\
-\\[bookmark-yank-word] while setting a bookmark. Successive \
-\\[bookmark-yank-word]'s
-yank successive words.
-
-Typing \\[universal-argument] inserts (at the bookmark name prompt) the name of the last
-bookmark used in the document where the new bookmark is being set;
-this helps you use a single bookmark name to track progress through a
-large document. If there is no prior bookmark for this document, then
-\\[universal-argument] inserts an appropriate name based on the buffer or file.
-
Use \\[bookmark-delete] to remove bookmarks (you give it a name and
it removes only the first instance of a bookmark with that name from
the list of bookmarks.)"
- (interactive (list nil current-prefix-arg))
- (bookmark-set-internal "Set bookmark" name (if push-bookmark 'push nil)))
+ (interactive (list (bookmark-read-bookmark-name "Set bookmark") current-prefix-arg))
+ (bookmark-set-internal name (if push-bookmark 'push nil)))
+(put 'bookmark-set-no-overwrite 'minibuffer-action 'bookmark-set)
(defun bookmark-kill-line (&optional newline-too)
"Kill from point to end of line.
(buffer-name (current-buffer)))))
-(defun bookmark-yank-word ()
- "Get the next word from buffer `bookmark-current-buffer' and append
-it to the name of the bookmark currently being set, advancing
-`bookmark-yank-point' by one word."
- (interactive)
- (let ((string (with-current-buffer bookmark-current-buffer
- (goto-char bookmark-yank-point)
- (buffer-substring-no-properties
- (point)
- (progn
- (forward-word 1)
- (setq bookmark-yank-point (point)))))))
- (insert string)))
-
(defun bookmark-buffer-file-name ()
"Return the current buffer's file in a way useful for bookmarks."
;; Abbreviate the path, both so it's shorter and so it's more
"-- Unknown location --"))
;;;###autoload
-(defun bookmark-rename (old-name &optional new-name)
+(defun bookmark-rename (old-name new-name)
"Change the name of OLD-NAME bookmark to NEW-NAME name.
If called from keyboard, prompt for OLD-NAME and NEW-NAME.
-If called from menubar, select OLD-NAME from a menu and prompt for NEW-NAME.
-
-If called from Lisp, prompt for NEW-NAME if only OLD-NAME was passed
-as an argument. If called with two strings, then no prompting is done.
-You must pass at least OLD-NAME when calling from Lisp.
-
-While you are entering the new name, consecutive \
-\\<bookmark-minibuffer-read-name-map>\\[bookmark-yank-word]'s insert
-consecutive words from the text of the buffer into the new bookmark
-name."
- (interactive (list (bookmark-completing-read "Old bookmark name")))
+If called from menubar, select OLD-NAME from a menu and prompt for NEW-NAME."
+ (interactive (let ((old (bookmark-completing-read "Old bookmark name")))
+ (list old (bookmark-read-bookmark-name (format "Rename \"%s\" to" old)))))
(bookmark-maybe-load-default-file)
- (setq bookmark-yank-point (point))
- (setq bookmark-current-buffer (current-buffer))
- (let ((final-new-name
- (or new-name ; use second arg, if non-nil
- (read-from-minibuffer
- (format-prompt "Rename \"%s\" to" nil old-name)
- nil
- (define-keymap
- :parent minibuffer-local-map
- "C-w" #'bookmark-yank-word)
- nil
- 'bookmark-history))))
- (bookmark-set-name old-name final-new-name)
- (bookmark-update-last-modified final-new-name)
- (setq bookmark-current-bookmark final-new-name)
- (bookmark-bmenu-surreptitiously-rebuild-list)
- (setq bookmark-alist-modification-count
- (1+ bookmark-alist-modification-count))
- (if (bookmark-time-to-save-p)
- (bookmark-save))))
+ (bookmark-set-name old-name new-name)
+ (bookmark-update-last-modified new-name)
+ (setq bookmark-current-bookmark new-name)
+ (bookmark-bmenu-surreptitiously-rebuild-list)
+ (setq bookmark-alist-modification-count
+ (1+ bookmark-alist-modification-count))
+ (if (bookmark-time-to-save-p)
+ (bookmark-save)))
;;;###autoload
(interactive nil bookmark-bmenu-mode)
(let ((bmrk (bookmark-bmenu-bookmark))
(thispoint (point)))
+ ;; FIXME: Second arg of `bookmark-rename'.
(bookmark-rename bmrk)
(goto-char thispoint)))
projects / emacs.git / commitdiff