Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c3512092
Commit
c3512092
authored
Jul 23, 2013
by
Leo Liu
Browse files
* bookmark.el (bookmark-make-record): Restore NAME as a default
value. Fixes: debbugs:14933
parent
7d22ce18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/bookmark.el
lisp/bookmark.el
+7
-8
No files found.
lisp/ChangeLog
View file @
c3512092
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,
...
...
lisp/bookmark.el
View file @
c3512092
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment