summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS6
-rw-r--r--lisp/bookmark.el10
2 files changed, 8 insertions, 8 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f358a211a54..22b86b50130 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1507,6 +1507,12 @@ the new variable 'buffer-auto-revert-by-notification' to a non-nil
value. Auto Revert mode can use this information to avoid polling the
buffer periodically when 'auto-revert-avoid-polling' is non-nil.
+** Bookmarks
+
++++
+*** 'bookmark-file' is now an obsolete alias of
+'bookmark-default-file'.
+
* New Modes and Packages in Emacs 27.1
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 89f594c1866..d4fe2d9050c 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -82,15 +82,9 @@ To specify the file in which to save them, modify the variable
"The `.emacs.bmk' file used to be called this name.")
-;; defvared to avoid a compilation warning:
-(defvar bookmark-file nil
- "Old name for `bookmark-default-file'.")
-
+(define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1")
(defcustom bookmark-default-file
- (if bookmark-file
- ;; In case user set `bookmark-file' in her .emacs:
- bookmark-file
- (locate-user-emacs-file "bookmarks" ".emacs.bmk"))
+ (locate-user-emacs-file "bookmarks" ".emacs.bmk")
"File in which to save bookmarks by default."
:type 'file
:group 'bookmark)