From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 11 May 2016 22:18:38 +0000 (+0300)
Subject: ; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion"
X-Git-Tag: emacs-25.0.94~12
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/9596ea1534d0c5146be5c1a58d0c5a70f56b44c3

; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion"

This reverts commit bf3f6a961f378f35a292c41c0bfbdae88ee1b1b9.

(Bug#22616)
---

diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index 7d5b7dc749..46373da5eb 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -265,17 +265,16 @@ a section."
 
 (defun lm-header (header)
   "Return the contents of the header named HEADER."
-  (save-excursion
-    (goto-char (point-min))
-    (let ((case-fold-search t))
-      (when (and (re-search-forward (lm-get-header-re header) (lm-code-mark) t)
-                 ;;   RCS ident likes format "$identifier: data$"
-                 (looking-at
-                  (if (save-excursion
-                        (skip-chars-backward "^$" (match-beginning 0))
-                        (= (point) (match-beginning 0)))
-                      "[^\n]+" "[^$\n]+")))
-        (match-string-no-properties 0)))))
+  (goto-char (point-min))
+  (let ((case-fold-search t))
+    (when (and (re-search-forward (lm-get-header-re header) (lm-code-mark) t)
+	       ;;   RCS ident likes format "$identifier: data$"
+	       (looking-at
+		(if (save-excursion
+		      (skip-chars-backward "^$" (match-beginning 0))
+		      (= (point) (match-beginning 0)))
+		    "[^\n]+" "[^$\n]+")))
+      (match-string-no-properties 0))))
 
 (defun lm-header-multiline (header)
   "Return the contents of the header named HEADER, with continuation lines.