Commit 7d688336 authored by Thierry Volpiatto's avatar Thierry Volpiatto Committed by Stefan Monnier

* lisp/bookmark.el (bookmark-completing-read): Improve handling of empty

string.

Fixes: debbugs:14176
parent 31dcede0
2013-04-19 Thierry Volpiatto <thierry.volpiatto@gmail.com>
* bookmark.el (bookmark-completing-read): Improve handling of empty
string (bug#14176).
2013-04-19 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc-dispatcher.el (vc-do-command): Get rid of default sentinel msg.
......
......@@ -427,8 +427,8 @@ just return it."
"Prompting with PROMPT, read a bookmark name in completion.
PROMPT will get a \": \" stuck on the end no matter what, so you
probably don't want to include one yourself.
Optional second arg DEFAULT is a string to return if the user enters
the empty string."
Optional arg DEFAULT is a string to return if the user input is empty.
If DEFAULT is nil then return empty string for empty input."
(bookmark-maybe-load-default-file) ; paranoia
(if (listp last-nonmenu-event)
(bookmark-menu-popup-paned-menu t prompt
......@@ -437,22 +437,17 @@ the empty string."
'string-lessp)
(bookmark-all-names)))
(let* ((completion-ignore-case bookmark-completion-ignore-case)
(default default)
(default (unless (equal "" default) default))
(prompt (concat prompt (if default
(format " (%s): " default)
": ")))
(str
(completing-read prompt
(lambda (string pred action)
(if (eq action 'metadata)
'(metadata (category . bookmark))
(complete-with-action
action bookmark-alist string pred)))
nil
0
nil
'bookmark-history)))
(if (string-equal "" str) default str))))
": "))))
(completing-read prompt
(lambda (string pred action)
(if (eq action 'metadata)
'(metadata (category . bookmark))
(complete-with-action
action bookmark-alist string pred)))
nil 0 nil 'bookmark-history default))))
(defmacro bookmark-maybe-historicize-string (string)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment