aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS6
-rw-r--r--lisp/bookmark.el15
2 files changed, 8 insertions, 13 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 22b86b50130..c9da98b0adc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1513,6 +1513,12 @@ buffer periodically when 'auto-revert-avoid-polling' is non-nil.
1513*** 'bookmark-file' is now an obsolete alias of 1513*** 'bookmark-file' is now an obsolete alias of
1514'bookmark-default-file'. 1514'bookmark-default-file'.
1515 1515
1516** Bookmarks
1517
1518---
1519*** 'bookmark-old-default-file' is now an obsolete alias of
1520'bookmark-default-file'.
1521
1516 1522
1517* New Modes and Packages in Emacs 27.1 1523* New Modes and Packages in Emacs 27.1
1518 1524
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 00884506e4d..5a9859d83df 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -78,8 +78,8 @@ To specify the file in which to save them, modify the variable
78 :group 'bookmark) 78 :group 'bookmark)
79 79
80 80
81(defconst bookmark-old-default-file "~/.emacs-bkmrks" 81(define-obsolete-variable-alias 'bookmark-old-default-file
82 "The `.emacs.bmk' file used to be called this name.") 82 'bookmark-default-file "27.1")
83 83
84 84
85(define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1") 85(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 "If bookmarks have not been loaded from the default place, load them." 1024 "If bookmarks have not been loaded from the default place, load them."
1025 (and (not bookmarks-already-loaded) 1025 (and (not bookmarks-already-loaded)
1026 (null bookmark-alist) 1026 (null bookmark-alist)
1027 (prog2
1028 (and
1029 ;; Possibly the old bookmark file, "~/.emacs-bkmrks", needs
1030 ;; to be renamed.
1031 (file-exists-p bookmark-old-default-file)
1032 (not (file-exists-p bookmark-default-file))
1033 (rename-file bookmark-old-default-file
1034 bookmark-default-file))
1035 ;; return t so the `and' will continue...
1036 t)
1037
1038 (file-readable-p bookmark-default-file) 1027 (file-readable-p bookmark-default-file)
1039 (bookmark-load bookmark-default-file t t) 1028 (bookmark-load bookmark-default-file t t)
1040 (setq bookmarks-already-loaded t))) 1029 (setq bookmarks-already-loaded t)))