Commit abe18f59 authored by Stefan Kangas's avatar Stefan Kangas Committed by Paul Eggert

Make bookmark-old-default-file variable obsolete

* lisp/bookmark.el (bookmark-old-default-file):
Redefine as obsolete variable alias for 'bookmark-default-file'.
(bookmark-maybe-load-default-file): Don't try to rename file
'bookmark-old-default-file' (~/.emacs-bkmrks) to new name (Bug#35940).
parent d11dd6a9
Pipeline #1969 failed with stage
in 2 seconds
...@@ -1513,6 +1513,12 @@ buffer periodically when 'auto-revert-avoid-polling' is non-nil. ...@@ -1513,6 +1513,12 @@ buffer periodically when 'auto-revert-avoid-polling' is non-nil.
*** 'bookmark-file' is now an obsolete alias of *** 'bookmark-file' is now an obsolete alias of
'bookmark-default-file'. 'bookmark-default-file'.
** Bookmarks
---
*** 'bookmark-old-default-file' is now an obsolete alias of
'bookmark-default-file'.
* New Modes and Packages in Emacs 27.1 * New Modes and Packages in Emacs 27.1
......
...@@ -78,8 +78,8 @@ To specify the file in which to save them, modify the variable ...@@ -78,8 +78,8 @@ To specify the file in which to save them, modify the variable
:group 'bookmark) :group 'bookmark)
(defconst bookmark-old-default-file "~/.emacs-bkmrks" (define-obsolete-variable-alias 'bookmark-old-default-file
"The `.emacs.bmk' file used to be called this name.") 'bookmark-default-file "27.1")
(define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1") (define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1")
...@@ -1024,17 +1024,6 @@ it to the name of the bookmark currently being set, advancing ...@@ -1024,17 +1024,6 @@ it to the name of the bookmark currently being set, advancing
"If bookmarks have not been loaded from the default place, load them." "If bookmarks have not been loaded from the default place, load them."
(and (not bookmarks-already-loaded) (and (not bookmarks-already-loaded)
(null bookmark-alist) (null bookmark-alist)
(prog2
(and
;; Possibly the old bookmark file, "~/.emacs-bkmrks", needs
;; to be renamed.
(file-exists-p bookmark-old-default-file)
(not (file-exists-p bookmark-default-file))
(rename-file bookmark-old-default-file
bookmark-default-file))
;; return t so the `and' will continue...
t)
(file-readable-p bookmark-default-file) (file-readable-p bookmark-default-file)
(bookmark-load bookmark-default-file t t) (bookmark-load bookmark-default-file t t)
(setq bookmarks-already-loaded t))) (setq bookmarks-already-loaded t)))
......
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