branch: elpa/vm
commit 94077ac519b722b4412b30ffa9bfc5153de92276
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
lisp/vm-macro.el (vm-save-restriction, vm-save-buffer-excursion): Delete
The first worked around a bug fixed eons ago, and the second
has been available under an another time for about as long.
---
contrib/vm-bogofilter.el | 6 +++---
lisp/vm-delete.el | 2 +-
lisp/vm-digest.el | 6 +++---
lisp/vm-edit.el | 10 ++++-----
lisp/vm-folder.el | 54 ++++++++++++++++++++++++------------------------
lisp/vm-grepmail.el | 2 +-
lisp/vm-imap.el | 2 +-
lisp/vm-macro.el | 40 -----------------------------------
lisp/vm-mime.el | 16 +++++++-------
lisp/vm-misc.el | 8 +++----
lisp/vm-page.el | 14 ++++++-------
lisp/vm-pgg.el | 2 +-
lisp/vm-pine.el | 2 +-
lisp/vm-pop.el | 2 +-
lisp/vm-reply.el | 2 +-
lisp/vm-rfaddons.el | 2 +-
lisp/vm-save.el | 8 +++----
lisp/vm-sort.el | 2 +-
lisp/vm-window.el | 4 ++--
19 files changed, 72 insertions(+), 112 deletions(-)
diff --git a/contrib/vm-bogofilter.el b/contrib/vm-bogofilter.el
index a8f76cfe29..bd8e885505 100644
--- a/contrib/vm-bogofilter.el
+++ b/contrib/vm-bogofilter.el
@@ -267,7 +267,7 @@ are explicitly marked as spams by the vm-bogofilter-is-spam
function."
"The function used to do the actual filtering. It is used as a value for
vm-retrieved-spooled-mail-hook."
(save-excursion
- (vm-save-restriction
+ (save-restriction
(let ((tail-cons (vm-last vm-message-list))
(buffer-read-only nil))
(widen)
@@ -342,8 +342,8 @@ vm-retrieved-spooled-mail-hook."
(set-buffer buffer)
(erase-buffer))
(set-buffer (vm-buffer-of message))
- (vm-save-restriction
- (vm-save-buffer-excursion
+ (save-restriction
+ (save-current-buffer
(widen)
(goto-char (vm-headers-of message))
(narrow-to-region (point) (vm-text-end-of message))
diff --git a/lisp/vm-delete.el b/lisp/vm-delete.el
index b3c54a714b..751a4b7ad0 100644
--- a/lisp/vm-delete.el
+++ b/lisp/vm-delete.el
@@ -471,7 +471,7 @@ ignored."
'uid)
vm-imap-retrieved-messages)))))
(vm-increment vm-modification-counter)
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((buffer-read-only nil))
(delete-region (vm-start-of real-m)
diff --git a/lisp/vm-digest.el b/lisp/vm-digest.el
index 9a6ab3fb09..2fd1afdf5c 100644
--- a/lisp/vm-digest.el
+++ b/lisp/vm-digest.el
@@ -210,7 +210,7 @@ all of them will be burst."
start part-list
(folder-type vm-folder-type))
(unwind-protect
- (vm-save-restriction
+ (save-restriction
(save-excursion
(widen)
(setq work-buffer (vm-make-work-buffer))
@@ -485,7 +485,7 @@ RFC 1153. Otherwise assume RFC 934 digests."
separator-regexp "^------------------------------\n")
(setq prologue-separator-regexp "\\(^-[^ ].*\n+\\)+"
separator-regexp "\\(^-[^ ].*\n+\\)+"))
- (vm-save-restriction
+ (save-restriction
(save-excursion
(widen)
(unwind-protect
@@ -795,7 +795,7 @@ burst."
(vm-delete-message 1))))
(setq mlist (cdr mlist)))
(set-buffer-modified-p nil) ; work-buffer
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-goto-new-folder-frame-maybe 'folder)
(vm-mode)
(if (vm-should-generate-summary)
diff --git a/lisp/vm-edit.el b/lisp/vm-edit.el
index de65f6008f..5d2233f6ac 100644
--- a/lisp/vm-edit.el
+++ b/lisp/vm-edit.el
@@ -73,7 +73,7 @@ replace the original, use C-c C-] and the edit will be
aborted."
:fail t)
(if (and edit-buf (buffer-name edit-buf))
(set-buffer edit-buf)
- (vm-save-restriction
+ (save-restriction
(widen)
(setq edit-buf
(generate-new-buffer
@@ -276,7 +276,7 @@ thread have their cached data discarded."
(set-buffer (vm-buffer-of (vm-real-message-of (car mp))))
(if (not (memq (vm-real-message-of (car mp)) vm-message-list))
(error "The original copy of this message has been expunged."))
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (vm-headers-of (vm-real-message-of (car mp))))
(let ((vm-message-pointer mp)
@@ -299,11 +299,11 @@ thread have their cached data discarded."
;; window. This works well for non MIME
;; messages, but the cursor drifts badly for
;; MIME and for refilled messages.
- (vm-save-buffer-excursion
+ (save-current-buffer
(and vm-presentation-buffer
(set-buffer vm-presentation-buffer))
- (vm-save-restriction
- (vm-save-buffer-excursion
+ (save-restriction
+ (save-current-buffer
(widen)
(let ((osw (selected-window))
(new-win (vm-get-visible-buffer-window
diff --git a/lisp/vm-folder.el b/lisp/vm-folder.el
index fdfa7a6077..f23292bc85 100644
--- a/lisp/vm-folder.el
+++ b/lisp/vm-folder.el
@@ -1244,7 +1244,7 @@ vm-folder-type is initialized here."
;;
;; For free standing messages, unwanted headers are
;; stripped from the message, unremembered.
- (vm-save-restriction
+ (save-restriction
(let ((header-alist (vm-build-header-order-alist keep-list))
(buffer-read-only nil)
(work-buffer nil)
@@ -1775,7 +1775,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(time nil)
time lim oldpoint)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-min))
(vm-skip-past-folder-header)
@@ -1806,7 +1806,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(let ((case-fold-search t)
lim)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(if (eq vm-folder-type 'babyl)
(progn
@@ -1862,7 +1862,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(n nil)
lim oldpoint)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-min))
(vm-skip-past-folder-header)
@@ -1899,7 +1899,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(let ((case-fold-search t)
ob lim oldpoint)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-min))
(vm-skip-past-folder-header)
@@ -1929,7 +1929,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(let ((case-fold-search t)
ob lim oldpoint)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-min))
(vm-skip-past-folder-header)
@@ -1957,7 +1957,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(defun vm-gobble-visible-header-variables ()
(save-excursion
- (vm-save-restriction
+ (save-restriction
(let ((case-fold-search t)
lim)
(widen)
@@ -2075,7 +2075,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
(let ((case-fold-search t)
summary lim)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-min))
(vm-skip-past-folder-header)
@@ -2141,7 +2141,7 @@ Supports version 4 format of attribute storage, for
backward compatibility."
message M into the folder buffer. The optional argument
FOR-OTHER-FOLDER indicates <someting unknown>. USR 2010-03-06"
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(vm-mime-qp-encoder-program nil) ; use internal code
@@ -2253,7 +2253,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(let ((vm-key-functions '(vm-sort-compare-physical-order-r)))
(setq mp (sort newlist 'vm-sort-compare-xxxxxx)))
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(vm-mime-qp-encoder-program nil) ; use internal code
@@ -2426,7 +2426,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-labels ()
(if vm-message-list
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2485,7 +2485,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-bookmark ()
(if vm-message-pointer
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2528,7 +2528,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-last-modified ()
(if vm-message-list
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2571,7 +2571,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-pop-retrieved ()
(if vm-message-list
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2624,7 +2624,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-imap-retrieved ()
(if vm-message-list
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2678,7 +2678,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-summary ()
(if vm-message-list
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2725,7 +2725,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-header-variables ()
(if vm-message-list
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2773,7 +2773,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-stuff-message-order ()
(if (cdr vm-message-list)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -2831,7 +2831,7 @@ pending input. So, presumably this is non-interactive.
USR 2012-12-22"
(defun vm-remove-message-order ()
(if (cdr vm-message-list)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((old-buffer-modified-p (buffer-modified-p))
(case-fold-search t)
@@ -3704,10 +3704,10 @@ This function is only used in background tasks. USR
2012-12-22."
;; Note that deleted messages are not expunged.
(defun vm-write-file-hook ()
(if (and (eq major-mode 'vm-mode) (not vm-inhibit-write-file-hook))
- ;; The vm-save-restriction isn't really necessary here, since
+ ;; The save-restriction isn't really necessary here, since
;; the stuff routines clean up after themselves, but should remain
;; as a safeguard against the time when other stuff is added here.
- (vm-save-restriction
+ (save-restriction
(let ((buffer-read-only))
(vm-discard-fetched-messages)
(vm-inform 7 "%s: Stuffing cached data..." (buffer-name))
@@ -4148,7 +4148,7 @@ Same as \\[vm-recover-folder]."
(defun vm-gobble-crash-box (crash-box)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((opoint-max (point-max)) crash-buf
(buffer-read-only nil)
@@ -4692,7 +4692,7 @@ files."
(error "Folder %s is not the same format as this folder."
folder))
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-max))
(let ((coding-system-for-read (vm-binary-coding-system)))
@@ -4743,7 +4743,7 @@ files."
(let ((tail-cons (vm-last vm-message-list))
b-list new-messages)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(vm-build-message-list)
(when (or (null tail-cons) (cdr tail-cons))
@@ -5095,7 +5095,7 @@ Interactively TYPE will be read from the minibuffer."
(modulus (+ (% (vm-abs (random)) 11) 5))
text-end opoint)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(setq vm-folder-type type)
(goto-char (point-min))
@@ -5430,7 +5430,7 @@ Gives an error if unable to retrieve message."
(message "External messages currently available only for imap folders.")
(save-excursion
(set-buffer (vm-buffer-of mm))
- (vm-save-restriction
+ (save-restriction
(widen)
(narrow-to-region (marker-position (vm-headers-of mm))
(marker-position (vm-text-end-of mm)))
@@ -5570,7 +5570,7 @@ the folder is saved."
(vm-set-body-to-be-discarded-flag mm nil)
(save-current-buffer
(set-buffer (vm-buffer-of mm))
- (vm-save-restriction
+ (save-restriction
(widen)
(let ((inhibit-read-only t)
;; (buffer-read-only nil) ; seems redundant
diff --git a/lisp/vm-grepmail.el b/lisp/vm-grepmail.el
index 45d73c3238..ce0c0d2a37 100644
--- a/lisp/vm-grepmail.el
+++ b/lisp/vm-grepmail.el
@@ -249,7 +249,7 @@ END the end position in the process output buffer."
(save-excursion
(set-buffer vm-grepmail-folder-buffer)
(let ((buffer-read-only nil))
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-max))
(insert-buffer-substring message-buffer start end)
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index d5c6f207be..a2be767c61 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -3537,7 +3537,7 @@ headers-only form."
(save-excursion
(vm-inform 6 "%s: Retrieving new messages... "
(buffer-name folder-buffer))
- (vm-save-restriction
+ (save-restriction
(widen)
(setq old-eob (point-max))
(goto-char (point-max))
diff --git a/lisp/vm-macro.el b/lisp/vm-macro.el
index c1a82d78e6..a6665b2050 100644
--- a/lisp/vm-macro.el
+++ b/lisp/vm-macro.el
@@ -186,46 +186,6 @@ current-buffer in `vm-user-interaction-buffer'."
;;; can't use defsubst where quoting is needed in some places but
;; not others.
-;; save-restriction flubs restoring the clipping region if you
-;; (widen) and modify text outside the old region.
-;; This should do it right.
-(defmacro vm-save-restriction (&rest forms)
- (let ((vm-sr-clip (make-symbol "vm-sr-clip"))
- (vm-sr-min (make-symbol "vm-sr-min"))
- (vm-sr-max (make-symbol "vm-sr-max")))
- `(let ((,vm-sr-clip (> (buffer-size) (- (point-max) (point-min))))
- ;; this shouldn't be necessary but the
- ;; byte-compiler turns these into interned symbols
- ;; which utterly defeats the purpose of the
- ;; make-symbol calls above. Soooo, until the compiler
- ;; is fixed, these must be made into (let ...)
- ;; temporaries so that nested calls to this macros
- ;; won't misbehave.
- ,vm-sr-min ,vm-sr-max)
- (and ,vm-sr-clip
- (setq ,vm-sr-min (set-marker (make-marker) (point-min)))
- (setq ,vm-sr-max (set-marker (make-marker) (point-max))))
- (unwind-protect
- (progn ,@forms)
- (widen)
- (and ,vm-sr-clip
- (progn
- (narrow-to-region ,vm-sr-min ,vm-sr-max)
- (set-marker ,vm-sr-min nil)
- (set-marker ,vm-sr-max nil)))))))
-
-(put 'vm-save-restriction 'edebug-form-spec t)
-
-(defmacro vm-save-buffer-excursion (&rest forms)
- `(let ((vm-sbe-buffer (current-buffer)))
- (unwind-protect
- (progn ,@forms)
- (and (not (eq vm-sbe-buffer (current-buffer)))
- (buffer-name vm-sbe-buffer)
- (set-buffer vm-sbe-buffer)))))
-
-(put 'vm-save-buffer-excursion 'edebug-form-spec t)
-
(defmacro vm-assert (expression)
(list 'or 'vm-assertion-checking-off
(list 'or expression
diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index 449f00f838..7fd17d8555 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -2627,7 +2627,7 @@ in the buffer. The function is expected to make the
message
(let ((vm-display-using-mime nil))
(vm-show-current-message)))
(setq m (car vm-message-pointer))
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (vm-text-of m))
(let ((buffer-read-only nil)
@@ -3363,7 +3363,7 @@ emacs-w3m."
vm-digest-identifier-header-format
(vm-mm-layout-message layout))))
(vm-mime-burst-layout layout ident-header))
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-goto-new-folder-frame-maybe 'folder)
(vm-mode)
(if (vm-should-generate-summary)
@@ -3419,7 +3419,7 @@ emacs-w3m."
(setq vm-folder-type vm-default-folder-type)
(vm-mime-burst-layout layout nil)
(set-buffer-modified-p nil)
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-goto-new-folder-frame-maybe 'folder)
(vm-mode)
(if (vm-should-generate-summary)
@@ -3876,7 +3876,7 @@ it to an internal object by retrieving the body.
USR, 2011-03-28"
(insert (vm-trailing-message-separator))
(set-buffer-modified-p nil)
(vm-inform 6 "Assembling message... done")
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-goto-new-folder-frame-maybe 'folder)
(vm-mode)
(if (vm-should-generate-summary)
@@ -6803,7 +6803,7 @@ describes what was deleted."
opos
(buffer-read-only nil))
(save-excursion
- (vm-save-restriction
+ (save-restriction
(goto-char (vm-extent-start-position e))
(setq opos (point))
(setq label (vm-mime-sprintf
@@ -6832,7 +6832,7 @@ describes what was deleted."
(not (eq (marker-buffer (vm-mm-layout-body-start layout))
(current-buffer))))
(error "MIME body is not in the message"))
- (vm-save-restriction
+ (save-restriction
(widen)
(if (vm-mm-layout-is-converted layout)
(setq layout (vm-mm-layout-unconverted-layout layout)))
@@ -6992,7 +6992,7 @@ should be encoded together."
(setq end (or (and (re-search-forward "^[^ \t:]+:" body-start t)
(match-beginning 0))
body-start)))
- (vm-save-restriction
+ (save-restriction
(narrow-to-region start end)
(vm-mime-encode-words))
(goto-char end)))))
@@ -8166,7 +8166,7 @@ the first sub part of a multipart/alternative is a
text/plain part."
(set-buffer (vm-buffer-of m))
(let ((inhibit-read-only t)
(buffer-read-only nil))
- (vm-save-restriction
+ (save-restriction
(widen)
(if (vm-mm-layout-is-converted layout)
(setq layout (vm-mm-layout-unconverted-layout layout)))
diff --git a/lisp/vm-misc.el b/lisp/vm-misc.el
index 01c3fd1638..2f2a62ba15 100644
--- a/lisp/vm-misc.el
+++ b/lisp/vm-misc.el
@@ -376,7 +376,7 @@ need to add quotes or leave them undecoded. RWF"
(defun vm-write-string (where string)
(if (bufferp where)
- (vm-save-buffer-excursion
+ (save-current-buffer
(set-buffer where)
(goto-char (point-max))
(let ((buffer-read-only nil))
@@ -822,7 +822,7 @@ If HACK-ADDRESSES is t, then the strings are considered to
be mail addresses,
(defun vm-run-hook-on-message (hook-variable message)
(with-current-buffer (vm-buffer-of message)
- (vm-save-restriction
+ (save-restriction
(widen)
(save-excursion
(narrow-to-region (vm-headers-of message) (vm-text-end-of message))
@@ -834,7 +834,7 @@ If HACK-ADDRESSES is t, then the strings are considered to
be mail addresses,
(defun vm-run-hook-on-message-with-args (hook-variable message &rest args)
(with-current-buffer (vm-buffer-of message)
- (vm-save-restriction
+ (save-restriction
(widen)
(save-excursion
(narrow-to-region (vm-headers-of message) (vm-text-end-of message))
@@ -1574,7 +1574,7 @@ filling of GNU Emacs does not work correctly here."
(- (window-width (get-buffer-window (current-buffer))) 1)))
)
(save-excursion
- (vm-save-restriction
+ (save-restriction
;; longlines-wrap-region contains a (forward-line -1) which is causing
;; wrapping of headers which is wrong, so we restrict it here!
(narrow-to-region start end)
diff --git a/lisp/vm-page.el b/lisp/vm-page.el
index 8cf4d389f1..9bae59d044 100644
--- a/lisp/vm-page.el
+++ b/lisp/vm-page.el
@@ -740,7 +740,7 @@ preview or the full message, governed by the the variables
;; (when (not need-preview)
;; (vm-inform 1 "External messages cannot be previewed")
;; (setq need-preview nil)))
- (vm-save-buffer-excursion
+ (save-current-buffer
(setq vm-system-state 'previewing)
(setq vm-mime-decoded nil)
@@ -782,7 +782,7 @@ preview or the full message, governed by the the variables
(vm-set-mime-layout-of
(car vm-message-pointer) new-layout))))
(vm-make-presentation-copy (car vm-message-pointer))
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-replace-buffer-in-windows (current-buffer)
vm-presentation-buffer))
(set-buffer vm-presentation-buffer)
@@ -917,13 +917,13 @@ is done if necessary. (USR, 2010-01-14)"
;; FIXME at this point, the folder buffer is being used for
;; display. Filling will corrupt the folder.
(debug "VM internal error #2010. Please report it")))
- (vm-save-restriction
+ (save-restriction
(widen)
(vm-fill-paragraphs-containing-long-lines
vm-fill-paragraphs-containing-long-lines
(vm-text-of (car vm-message-pointer))
(vm-text-end-of (car vm-message-pointer)))))
- (vm-save-buffer-excursion
+ (save-current-buffer
(save-excursion
(save-excursion
(goto-char (point-min))
@@ -969,7 +969,7 @@ is done if necessary. (USR, 2010-01-14)"
(vm-select-folder-buffer-and-validate 1 (vm-interactive-p))
(vm-display nil nil '(vm-expose-hidden-headers)
'(vm-expose-hidden-headers))
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-replace-buffer-in-windows (current-buffer)
vm-presentation-buffer))
(and vm-presentation-buffer
@@ -1053,7 +1053,7 @@ is done if necessary. (USR, 2010-01-14)"
(push-mark)
(vm-display (current-buffer) t '(vm-beginning-of-message)
'(vm-beginning-of-message reading-message))
- (vm-save-buffer-excursion
+ (save-current-buffer
(let ((osw (selected-window)))
(unwind-protect
(progn
@@ -1080,7 +1080,7 @@ as necessary."
(push-mark)
(vm-display (current-buffer) t '(vm-end-of-message)
'(vm-end-of-message reading-message))
- (vm-save-buffer-excursion
+ (save-current-buffer
(let ((osw (selected-window)))
(unwind-protect
(progn
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index e988d503a7..ab5f0b7d9e 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -425,7 +425,7 @@ Switch mode on/off according to ARG.
(layout (vm-mm-layout m)))
;; make a presentation copy
(vm-make-presentation-copy m)
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-replace-buffer-in-windows (current-buffer)
vm-presentation-buffer))
(set-buffer vm-presentation-buffer)
diff --git a/lisp/vm-pine.el b/lisp/vm-pine.el
index 677e0699dc..19e739bf68 100644
--- a/lisp/vm-pine.el
+++ b/lisp/vm-pine.el
@@ -638,7 +638,7 @@ Optional argument DONT-KILL is positive, then do not kill
source message."
(set-buffer folder-buffer)
(vm-error-if-folder-read-only)
(let ((buffer-read-only nil))
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-max))
(vm-write-string (current-buffer) (vm-leading-message-separator))
diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index e03cf6c67b..f432e8b368 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -1174,7 +1174,7 @@ LOCAL-EXPUNGE-LIST: A list of message descriptors for
messages in the
(folder-buffer (current-buffer)))
(if (and do-retrieves retrieve-list)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
(goto-char (point-max))
(condition-case error-data
diff --git a/lisp/vm-reply.el b/lisp/vm-reply.el
index 92e264ec12..30dd73da3c 100644
--- a/lisp/vm-reply.el
+++ b/lisp/vm-reply.el
@@ -2069,7 +2069,7 @@ message."
;; point of no return, don't kill it if the user quits
(setq temp-buffer nil)
(let ((vm-auto-decode-mime-messages t))
- (vm-save-buffer-excursion
+ (save-current-buffer
(vm-goto-new-folder-frame-maybe 'folder)
(vm-mode)))
(vm-inform 5
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index 4ae8b5f4ed..3db400d546 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -437,7 +437,7 @@ This does only work with my modified VM, i.e. a hacked
;; (let ((buffer-read-only nil)
;; (fill-column width))
;; (save-excursion
-;; (vm-save-restriction
+;; (save-restriction
;; ;; longlines-wrap-region contains a (forward-line -1) which is
causing
;; ;; wrapping of headers which is wrong, so we restrict it here!
;; (narrow-to-region start end)
diff --git a/lisp/vm-save.el b/lisp/vm-save.el
index cde3230d08..fe6cba47a9 100644
--- a/lisp/vm-save.el
+++ b/lisp/vm-save.el
@@ -393,7 +393,7 @@ The saved messages are flagged as `filed'."
(set-buffer (vm-buffer-of m))
;; FIXME the following isn't really necessary
(vm-assert (vm-body-retrieved-of m))
- (vm-save-restriction
+ (save-restriction
(widen)
;; have to stuff the attributes in all cases because
;; the deleted attribute may have been stuffed
@@ -433,7 +433,7 @@ The saved messages are flagged as `filed'."
(when vm-folder-read-only
(signal 'folder-read-only (list (current-buffer))))
(let ((buffer-read-only nil))
- (vm-save-restriction
+ (save-restriction
(widen)
(save-excursion
(goto-char (point-max))
@@ -574,7 +574,7 @@ This command should NOT be used to save message to mail
folders; use
(set-buffer (vm-buffer-of m))
;; FIXME the following shouldn't be necessary any more
(vm-assert (vm-body-retrieved-of m))
- (vm-save-restriction
+ (save-restriction
(widen)
(if (null file-buffer)
(write-region
@@ -585,7 +585,7 @@ This command should NOT be used to save message to mail
folders; use
(set-buffer file-buffer)
(save-excursion
(let (buffer-read-only)
- (vm-save-restriction
+ (save-restriction
(widen)
(save-excursion
(goto-char (point-max))
diff --git a/lisp/vm-sort.el b/lisp/vm-sort.el
index 4aa3482145..48fb02d500 100644
--- a/lisp/vm-sort.el
+++ b/lisp/vm-sort.el
@@ -191,7 +191,7 @@ the folder undisturbed."
;; and variables containg markers before you modify this code.
(defun vm-physically-move-message (m m-dest)
(save-excursion
- (vm-save-restriction
+ (save-restriction
(widen)
;; Make sure vm-headers-of and vm-text-of are non-nil in
diff --git a/lisp/vm-window.el b/lisp/vm-window.el
index 54971c8d94..db43d67354 100644
--- a/lisp/vm-window.el
+++ b/lisp/vm-window.el
@@ -90,7 +90,7 @@
;; configuration is done, and only then if the value of
;; this-command is found in the COMMANDS list.
(and (stringp buffer) (setq buffer (get-buffer buffer)))
- (vm-save-buffer-excursion
+ (save-current-buffer
(let* ((w (and buffer (vm-get-buffer-window buffer)))
(wf (and w (vm-window-frame w))))
(if (and w display (not do-not-raise))
@@ -133,7 +133,7 @@
(switch-to-buffer buffer))))
(defun vm-undisplay-buffer (buffer)
- (vm-save-buffer-excursion
+ (save-current-buffer
(let ((vm-mutable-frame-configuration
(and vm-mutable-frame-configuration pop-up-frames)))
(vm-maybe-delete-windows-or-frames-on buffer))
