aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Kangas2019-07-01 19:10:36 +0200
committerEli Zaretskii2019-07-06 11:43:31 +0300
commit2aa0b01f255fcbc8f5bdccc1bdb6a913b9709b4f (patch)
tree31120da64ec26e3f0936e5a2bd7f9aaebfe83f0e /lisp
parentdfc322d77fd1ce3aa4d852e0ff07bb36944f6432 (diff)
downloademacs-2aa0b01f255fcbc8f5bdccc1bdb6a913b9709b4f.tar.gz
emacs-2aa0b01f255fcbc8f5bdccc1bdb6a913b9709b4f.zip
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)
Diffstat (limited to 'lisp')
-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."
675(defun bookmark-upgrade-file-format-from-0 () 675(defun bookmark-upgrade-file-format-from-0 ()
676 "Upgrade a bookmark file of format 0 (the original format) to format 1. 676 "Upgrade a bookmark file of format 0 (the original format) to format 1.
677This expects to be called from `point-min' in a bookmark file." 677This expects to be called from `point-min' in a bookmark file."
678 (message "Upgrading bookmark format from 0 to %d..." 678 (let* ((reporter (make-progress-reporter
679 bookmark-file-format-version) 679 (format "Upgrading bookmark format from 0 to %d..."
680 (let* ((old-list (bookmark-alist-from-buffer)) 680 bookmark-file-format-version)))
681 (old-list (bookmark-alist-from-buffer))
681 (new-list (bookmark-upgrade-version-0-alist old-list))) 682 (new-list (bookmark-upgrade-version-0-alist old-list)))
682 (delete-region (point-min) (point-max)) 683 (delete-region (point-min) (point-max))
683 (bookmark-insert-file-format-version-stamp buffer-file-coding-system) 684 (bookmark-insert-file-format-version-stamp buffer-file-coding-system)
684 (pp new-list (current-buffer)) 685 (pp new-list (current-buffer))
685 (save-buffer)) 686 (save-buffer)
686 (goto-char (point-min)) 687 (goto-char (point-min))
687 (message "Upgrading bookmark format from 0 to %d...done" 688 (progress-reporter-done reporter)))
688 bookmark-file-format-version)
689 )
690 689
691 690
692(defun bookmark-grok-file-format-version () 691(defun bookmark-grok-file-format-version ()
@@ -2109,8 +2108,8 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
2109(defun bookmark-bmenu-execute-deletions () 2108(defun bookmark-bmenu-execute-deletions ()
2110 "Delete bookmarks flagged `D'." 2109 "Delete bookmarks flagged `D'."
2111 (interactive) 2110 (interactive)
2112 (message "Deleting bookmarks...") 2111 (let ((reporter (make-progress-reporter "Deleting bookmarks..."))
2113 (let ((o-point (point)) 2112 (o-point (point))
2114 (o-str (save-excursion 2113 (o-str (save-excursion
2115 (beginning-of-line) 2114 (beginning-of-line)
2116 (unless (= (following-char) ?D) 2115 (unless (= (following-char) ?D)
@@ -2132,8 +2131,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
2132 (forward-char o-col)) 2131 (forward-char o-col))
2133 (goto-char o-point)) 2132 (goto-char o-point))
2134 (beginning-of-line) 2133 (beginning-of-line)
2135 (message "Deleting bookmarks...done") 2134 (progress-reporter-done reporter)))
2136 ))
2137 2135
2138 2136
2139(defun bookmark-bmenu-rename () 2137(defun bookmark-bmenu-rename ()