Cleanups for save-excursion to avoid warnings in latest Emacs versions

5 files changed, 8 insertions, 14 deletions

diff --git a/generic/pg-pbrpm.el b/generic/pg-pbrpm.el
index bee0ea05..e036d7ae 100644
--- a/generic/pg-pbrpm.el
+++ b/generic/pg-pbrpm.el
@@ -78,8 +78,7 @@ Matches the region to be returned.")
 (defvar pbrpm-menu-desc nil)
 
 (defun pg-pbrpm-erase-buffer-menu ()
-  (save-excursion
-    (set-buffer pg-pbrpm-buffer-menu)
+  (with-current-buffer pg-pbrpm-buffer-menu
     (mapc 'span-delete pg-pbrpm-spans)
     (setq pg-pbrpm-spans nil)
     (erase-buffer)))
@@ -138,8 +137,8 @@ If stores, in the variable pg-pbrpm-goal-description, a list with shape
      start-hyp-text: the position of the first char of the hypothesis formula (no name)
      end-hyp: the position of the last char of the hypothesis
      hyp-name: then name of the hypothesis."
+  (with-current-buffer proof-goals-buffer
   (save-excursion
-    (set-buffer proof-goals-buffer)
     (goto-char 0)
     (let
 	((goals nil))
@@ -172,7 +171,7 @@ If stores, in the variable pg-pbrpm-goal-description, a list with shape
 		   (list start-goal end-goal goal-num
 			 (search-forward-regexp pg-pbrpm-start-concl-regexp nil t) hyps)
 		   goals))))
-	  (setq pg-pbrpm-goal-description goals)))))
+	  (setq pg-pbrpm-goal-description goals))))))
 
 (add-hook 'proof-shell-handle-delayed-output-hook 'pg-pbrpm-analyse-goal-buffer)
 
diff --git a/generic/pg-response.el b/generic/pg-response.el
index b2553ec5..e8ed6512 100644
--- a/generic/pg-response.el
+++ b/generic/pg-response.el
@@ -421,10 +421,8 @@ and start at the first error."
 (defun pg-response-has-error-location ()
   "Return non-nil if the response buffer has an error location.
 See `pg-next-error-regexp'."
-  (if (and pg-next-error-regexp
-	   (buffer-live-p proof-response-buffer))
-      (save-excursion
-	(set-buffer proof-response-buffer)
+  (if pg-next-error-regexp
+      (proof-with-current-buffer-if-exists proof-response-buffer
 	(goto-char (point-min))
 	(re-search-forward pg-next-error-regexp nil t))))
 
diff --git a/generic/pg-user.el b/generic/pg-user.el
index f3dbd755..dbda1863 100644
--- a/generic/pg-user.el
+++ b/generic/pg-user.el
@@ -933,8 +933,7 @@ If NUM is negative, move upwards.  Return new span."
       (let ((win (get-buffer-window proof-script-buffer)))
 	(unless ;; end of locked already displayed
 	    (and win (pos-visible-in-window-p (proof-unprocessed-begin)))
-	  (save-excursion
-	    (set-buffer proof-script-buffer)
+	  (with-current-buffer proof-script-buffer
 	    (cond
 	     ((proof-locked-region-empty-p)) ;; nothing if empty
 	     ((proof-locked-region-full-p)
diff --git a/generic/pg-xml.el b/generic/pg-xml.el
index e8da967b..79d15b55 100644
--- a/generic/pg-xml.el
+++ b/generic/pg-xml.el
@@ -42,8 +42,7 @@
   "Parse string in ARG, same as pg-xml-parse-buffer."
   (let
       ((tempbuffer (get-buffer-create " *xml-parse*")))
-    (save-excursion
-      (set-buffer tempbuffer)
+    (with-current-buffer tempbuffer
       (delete-region (point-min) (point-max))
       (insert arg)
       (pg-xml-parse-buffer (current-buffer) 'nomessage))))
diff --git a/generic/proof-script.el b/generic/proof-script.el
index bdd8947b..3ad877a3 100644
--- a/generic/proof-script.el
+++ b/generic/proof-script.el
@@ -738,8 +738,7 @@ to allow other files loaded by proof assistants to be marked read-only."
 ;; General to do the loading, to alleviate file handling there;
 ;; we could cache meta-data resulting from processing files;
 ;; or even, could include parsing inside PG.
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (save-excursion ;; prevent point moving if user viewing file
       (if (< (proof-unprocessed-begin) (proof-script-end))
 	(let ((span (span-make (proof-unprocessed-begin)