(ido-save-history): Use emacs-mule coding system instead of

utf-8 to save filenames (it's safer in Emacs 22).  Set the
`coding' local variable on the first line of the file.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1535a87904a..0a96ba61341 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ido.el (ido-save-history): Use emacs-mule coding system
+        instead of utf-8 to save filenames (it's safer in Emacs 22).
+        Set the `coding' local variable on the first line of the file.
+
 2007-12-04  Karl Fogel  <kfogel@red-bean.com>
 
         * saveplace.el (save-place-alist-to-file): Save with 'emacs-mule'
diff --git a/lisp/ido.el b/lisp/ido.el
index 9b1f6a634aa..41149038b0e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1309,7 +1309,8 @@ Value is an integer which is number of chars to right of prompt.")
       (unwind-protect
           (with-current-buffer buf
             (erase-buffer)
-            (setq buffer-file-coding-system 'utf-8)
+            (insert ";;; -*- coding: emacs-mule -*-\n")
+            (setq buffer-file-coding-system 'emacs-mule)
             (ido-pp 'ido-last-directory-list)
             (ido-pp 'ido-work-directory-list)
             (ido-pp 'ido-work-file-list)
@@ -1317,7 +1318,7 @@ Value is an integer which is number of chars to right of prompt.")
             (if (listp ido-unc-hosts-cache)
                 (ido-pp 'ido-unc-hosts-cache)
               (insert "\n;; ----- ido-unc-hosts-cache -----\nt\n"))
-            (insert "\n;; Local Variables:\n;; coding: utf-8\n;; End:\n")
+            (insert "\n")
             (write-file ido-save-directory-list-file nil))
         (kill-buffer buf)))))