From bc74a74a5d0efb5d89c06aee1d9135be4f7e73c8 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 28 May 2013 23:44:19 -0700
Subject: [PATCH] * idlwave.el (idlwave-scan-user-lib-files,
 idlwave-write-paths): Simplify via with-temp-buffer.

---
 lisp/ChangeLog            |  3 ++
 lisp/progmodes/idlwave.el | 79 +++++++++++++++++++----------------------------
 2 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eed02c441f2..c3c2cc829cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-05-29  Glenn Morris  <rgm@gnu.org>
 
+	* progmodes/idlwave.el (idlwave-scan-user-lib-files)
+	(idlwave-write-paths): Simplify via with-temp-buffer.
+
 	* emulation/cua-gmrk.el: Also load cua-base, cua-rect at run time.
 	* emulation/cua-rect.el: Also load cua-base at run time.
 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index aeaf1acb2ac..cbcd2f9d10e 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -5481,30 +5481,21 @@ directories and save the routine info.
     (message "Creating user catalog file...")
     (kill-buffer "*idlwave-scan.pro*")
     (kill-buffer (get-buffer-create "*IDLWAVE Widget*"))
-    (let ((font-lock-maximum-size 0)
-	  (auto-mode-alist nil))
-      (find-file idlwave-user-catalog-file))
-    (if (and (boundp 'font-lock-mode)
-	     font-lock-mode)
-	(font-lock-mode 0))
-    (erase-buffer)
-    (insert ";; IDLWAVE user catalog file\n")
-    (insert (format ";; Created %s\n\n" (current-time-string)))
-
-    ;; Define the routine info list
-    (insert "\n(setq idlwave-user-catalog-routines\n    '(")
-    (let ((standard-output (current-buffer)))
-      (mapc (lambda (x)
-	      (insert "\n    ")
-	      (prin1 x)
-	      (goto-char (point-max)))
-	    idlwave-user-catalog-routines))
-    (insert (format "))\n\n;;; %s ends here\n"
-		    (file-name-nondirectory idlwave-user-catalog-file)))
-    (goto-char (point-min))
-    ;; Save the buffer
-    (save-buffer 0)
-    (kill-buffer (current-buffer)))
+    (with-temp-buffer
+      (insert ";; IDLWAVE user catalog file\n")
+      (insert (format ";; Created %s\n\n" (current-time-string)))
+
+      ;; Define the routine info list
+      (insert "\n(setq idlwave-user-catalog-routines\n    '(")
+      (let ((standard-output (current-buffer)))
+	(mapc (lambda (x)
+		(insert "\n    ")
+		(prin1 x)
+		(goto-char (point-max)))
+	      idlwave-user-catalog-routines))
+      (insert (format "))\n\n;;; %s ends here\n"
+		      (file-name-nondirectory idlwave-user-catalog-file)))
+      (write-region nil nil idlwave-user-catalog-file)))
   (message "Creating user catalog file...done")
   (message "Info for %d routines saved in %s"
 	   (length idlwave-user-catalog-routines)
@@ -5522,31 +5513,23 @@ directories and save the routine info.
 (defun idlwave-write-paths ()
   (interactive)
   (when (and idlwave-path-alist idlwave-system-directory)
-    (let ((font-lock-maximum-size 0)
-	  (auto-mode-alist nil))
-      (find-file idlwave-path-file))
-    (if (and (boundp 'font-lock-mode)
-	     font-lock-mode)
-	(font-lock-mode 0))
-    (erase-buffer)
-    (insert ";; IDLWAVE paths\n")
-    (insert (format ";; Created %s\n\n" (current-time-string)))
+    (with-temp-buffer
+      (insert ";; IDLWAVE paths\n")
+      (insert (format ";; Created %s\n\n" (current-time-string)))
     ;; Define the variable which knows the value of "!DIR"
-    (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
-		    idlwave-system-directory))
-
-    ;; Define the variable which contains a list of all scanned directories
-    (insert "\n(setq idlwave-path-alist\n    '(")
-    (let ((standard-output (current-buffer)))
-      (mapc (lambda (x)
-	      (insert "\n      ")
-	      (prin1 x)
-	      (goto-char (point-max)))
-	    idlwave-path-alist))
-    (insert "))\n")
-    (save-buffer 0)
-    (kill-buffer (current-buffer))))
-
+      (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
+		      idlwave-system-directory))
+
+      ;; Define the variable which contains a list of all scanned directories
+      (insert "\n(setq idlwave-path-alist\n    '(")
+      (let ((standard-output (current-buffer)))
+	(mapc (lambda (x)
+		(insert "\n      ")
+		(prin1 x)
+		(goto-char (point-max)))
+	      idlwave-path-alist))
+      (insert "))\n")
+      (write-region nil nil idlwave-path-file))))
 
 (defun idlwave-expand-path (path &optional default-dir)
   ;; Expand parts of path starting with '+' recursively into directory list.
-- 
2.11.4.GIT