bug#36391: [PATCH] Improve an error message in bookmark.el

bug#36391: [PATCH] Improve an error message in bookmark.el

[Stefan Kangas]

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

The attached patch improves the error message when trying to run
bookmark-load on an invalid file or buffer.

Thanks,
Stefan Kangas

[-- Attachment #2: 0001-Improve-an-error-message-in-bookmark.el.patch --]
[-- Type: application/octet-stream, Size: 952 bytes --]

From 9d99b4737dc7c163fd9f7673315bcd4e92a4239a Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 26 Jun 2019 12:33:43 +0200
Subject: [PATCH] Improve an error message in bookmark.el

* lisp/bookmark.el (bookmark-alist-from-buffer): Improve error
message.
---
 lisp/bookmark.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 5563ea646c..401e7e04a1 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -655,7 +655,9 @@ bookmark-alist-from-buffer
             (forward-char -1)
             (read (current-buffer)))
         ;; Else no hope of getting information here.
-        (error "Not bookmark format")))))
+        (if buffer-file-name
+            (error "File not in bookmark format: %s" buffer-file-name)
+          (error "Buffer not in bookmark format: %s" (buffer-name)))))))
 
 
 (defun bookmark-upgrade-version-0-alist (old-list)
-- 
2.21.0

bug#36391: [PATCH] Improve an error message in bookmark.el

[Lars Ingebrigtsen]

Stefan Kangas <stefan@marxist.se> writes:

> The attached patch improves the error message when trying to run
> bookmark-load on an invalid file or buffer.

Makes sense; I've applied it to the trunk.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no