summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2019-07-01 19:10:36 +0200
committerEli Zaretskii <eliz@gnu.org>2019-07-06 11:43:31 +0300
commit2aa0b01f255fcbc8f5bdccc1bdb6a913b9709b4f (patch)
tree31120da64ec26e3f0936e5a2bd7f9aaebfe83f0e
parentdfc322d77fd1ce3aa4d852e0ff07bb36944f6432 (diff)
downloademacs-2aa0b01f255fcbc8f5bdccc1bdb6a913b9709b4f.tar.gz
Prefer progress-reporter to 'message' in bookmark.el
* lisp/bookmark.el (bookmark-upgrade-file-format-from-0) (bookmark-bmenu-execute-deletions): Use progress-reporter. (Bug#36462)
-rw-r--r--lisp/bookmark.el22
1 files changed, 10 insertions, 12 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 92d0da35949..d6922a9c97c 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -675,18 +675,17 @@ affect point."
(defun bookmark-upgrade-file-format-from-0 ()
"Upgrade a bookmark file of format 0 (the original format) to format 1.
This expects to be called from `point-min' in a bookmark file."
- (message "Upgrading bookmark format from 0 to %d..."
- bookmark-file-format-version)
- (let* ((old-list (bookmark-alist-from-buffer))
+ (let* ((reporter (make-progress-reporter
+ (format "Upgrading bookmark format from 0 to %d..."
+ bookmark-file-format-version)))
+ (old-list (bookmark-alist-from-buffer))
(new-list (bookmark-upgrade-version-0-alist old-list)))
(delete-region (point-min) (point-max))
(bookmark-insert-file-format-version-stamp buffer-file-coding-system)
(pp new-list (current-buffer))
- (save-buffer))
- (goto-char (point-min))
- (message "Upgrading bookmark format from 0 to %d...done"
- bookmark-file-format-version)
- )
+ (save-buffer)
+ (goto-char (point-min))
+ (progress-reporter-done reporter)))
(defun bookmark-grok-file-format-version ()
@@ -2109,8 +2108,8 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
(defun bookmark-bmenu-execute-deletions ()
"Delete bookmarks flagged `D'."
(interactive)
- (message "Deleting bookmarks...")
- (let ((o-point (point))
+ (let ((reporter (make-progress-reporter "Deleting bookmarks..."))
+ (o-point (point))
(o-str (save-excursion
(beginning-of-line)
(unless (= (following-char) ?D)
@@ -2132,8 +2131,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
(forward-char o-col))
(goto-char o-point))
(beginning-of-line)
- (message "Deleting bookmarks...done")
- ))
+ (progress-reporter-done reporter)))
(defun bookmark-bmenu-rename ()