* lisp/saveplace.el (save-place-alist-to-file): Set coding-system-for-write

  once and refer to it throughout.  Based on a patch by David Reitter
  <dreitter{_AT_}inf.ed.ac.uk>.

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8aae3ac681f..9038d2b98dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2007-12-02  Karl Fogel  <kfogel@red-bean.com>
 
+        * saveplace.el (save-place-alist-to-file): Set
+        coding-system-for-write once and refer to it throughout.
+        Based on a patch by David Reitter <dreitter{_AT_}inf.ed.ac.uk>.
+
+2007-12-02  Karl Fogel  <kfogel@red-bean.com>
+
         * saveplace.el (save-place-alist-to-file): Use `utf-8' coding
         system when writing, and set it in the first-line file variables.
         Based on a patch by David Reitter <dreitter{_AT_}inf.ed.ac.uk>
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 356963b8ba1..e846ea844fe 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -209,7 +209,8 @@ may have changed\) back to `save-place-alist'."
       (setq save-place-alist (cdr save-place-alist)))))
 
 (defun save-place-alist-to-file ()
-  (let ((file (expand-file-name save-place-file)))
+  (let ((file (expand-file-name save-place-file))
+        (coding-system-for-write 'utf-8))
     (save-excursion
       (unless save-place-quiet
         (message "Saving places to %s..." file))
@@ -217,7 +218,8 @@ may have changed\) back to `save-place-alist'."
       (delete-region (point-min) (point-max))
       (when save-place-forget-unreadable-files
         (save-place-forget-unreadable-files))
-      (insert ";;; -*- coding: utf-8 -*-\n")
+      (insert (format ";;; -*- coding: %s -*-\n"
+                      (symbol-name coding-system-for-write)))
       (let ((print-length nil)
             (print-level nil))
         (print save-place-alist (current-buffer)))
@@ -230,8 +232,7 @@ may have changed\) back to `save-place-alist'."
                t))))
         (condition-case nil
             ;; Don't use write-file; we don't want this buffer to visit it.
-            (let ((coding-system-for-write 'utf-8))
-              (write-region (point-min) (point-max) file))
+            (write-region (point-min) (point-max) file)
           (file-error (message "Can't write %s" file)))
         (kill-buffer (current-buffer))
         (unless save-place-quiet