mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

* bookmark.el (bookmark-make-record): Restore NAME as a default

Browse Source 
value.

Fixes: debbugs:14933
This commit is contained in:
Leo Liu 2013-07-23 08:58:28 +08:00
parent 7d22ce18d4
commit c35120929b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2013-07-23 Leo Liu <sdl.web@gmail.com>
* bookmark.el (bookmark-make-record): Restore NAME as a default
value. (Bug#14933)
2013-07-22 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/autoload.el (autoload--setup-output): New function,

15
lisp/bookmark.el
View File

@ -481,19 +481,18 @@ equivalently just return ALIST without NAME.")
(defun bookmark-make-record ()
"Return a new bookmark record (NAME . ALIST) for the current location."
(let ((record (funcall bookmark-make-record-function)))
;; Set up default name if the function does not provide one.
(unless (stringp (car record))
(if (car record) (push nil record))
(setcar record (or bookmark-current-bookmark (bookmark-buffer-name))))
;; Set up defaults.
(bookmark-prop-set
record 'defaults
(delq nil (delete-dups (append (bookmark-prop-get record 'defaults)
(list bookmark-current-bookmark
(bookmark-buffer-name))))))
;; Set up default name.
(if (stringp (car record))
;; The function already provided a default name.
record
(if (car record) (push nil record))
(setcar record (or bookmark-current-bookmark (bookmark-buffer-name)))
record)))
(car record)
(bookmark-buffer-name))))))
record))
(defun bookmark-store (name alist no-overwrite)
"Store the bookmark NAME with data ALIST.