bug#35917: [PATCH] bookmark.el: Make bookmark-file variable obsolete

bug#35917: [PATCH] bookmark.el: Make bookmark-file variable obsolete

[Stefan Kangas]

[-- Attachment #1.1: Type: text/plain, Size: 239 bytes --]

The `bookmark-file' variable has had the following docstring since
1995-06-19:
"Old name for `bookmark-default-file'."

I suggest that it's now time to make it an obsolete variable alias for
`bookmark-default-file'.

Thanks,
Stefan Kangas

[-- Attachment #1.2: Type: text/html, Size: 330 bytes --]

[-- Attachment #2: 0001-Make-bookmark-file-variable-obsolete.patch --]
[-- Type: text/x-patch, Size: 1670 bytes --]

From 0915997975dc3f533f588c06188c00f9209d161c Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 26 May 2019 13:40:04 +0200
Subject: [PATCH] Make bookmark-file variable obsolete

* bookmark.el (bookmark-file): Redefine as obsolete variable alias for
`bookmark-default-file'.
---
 etc/NEWS         |  6 ++++++
 lisp/bookmark.el | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 222b86ee2b..dd6987b10b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1478,6 +1478,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'.
+
 \f
 * New Modes and Packages in Emacs 27.1
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b1fe690dac..1fc42f7009 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -82,15 +82,9 @@ bookmark-old-default-file
   "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)
-- 
2.11.0

bug#35917: [PATCH] bookmark.el: Make bookmark-file variable obsolete

[Stefan Kangas]

[-- Attachment #1: Type: text/plain, Size: 112 bytes --]

New version of patch which adds the full path of lisp/bookmark.el to
the commit message.

Thanks,
Stefan Kangas

[-- Attachment #2: 0001-Make-bookmark-file-variable-obsolete-2.patch --]
[-- Type: text/x-patch, Size: 1690 bytes --]

From 580d4304639982c4f9eb71dcb1149b49bed3852f Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 26 May 2019 13:40:04 +0200
Subject: [PATCH] Make `bookmark-file' variable obsolete

* lisp/bookmark.el (bookmark-file): Redefine as obsolete variable
alias for `bookmark-default-file'.  (Bug#35917)
---
 etc/NEWS         |  6 ++++++
 lisp/bookmark.el | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 222b86ee2b..dd6987b10b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1478,6 +1478,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'.
+
 \f
 * New Modes and Packages in Emacs 27.1
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b1fe690dac..1fc42f7009 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -82,15 +82,9 @@ bookmark-old-default-file
   "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)
-- 
2.11.0

bug#35917: [PATCH] bookmark.el: Make bookmark-file variable obsolete

[Paul Eggert]

Thanks, I installed that.