(ido-save-history): Write the history file in UTF-8,

and add `coding' file-local variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8785c9fbe37b86479546668aacfc638bbaa71e5..1d1679b128c6fee2bbea26b46bd17cfc05aeb81f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-10  Juanma Barranquero  <lekktu@gmail.com>
+
+       * ido.el (ido-save-history): Write the history file in UTF-8,
+       and add `coding' file-local variable.
+
 2007-11-09  Juanma Barranquero  <lekktu@gmail.com>
 
        * international/iso-cvt.el (iso-spanish, iso-german, iso-iso2tex)

diff --git a/lisp/ido.el b/lisp/ido.el
index ca44e99b594a2e60c75056df7b751faf319ff778..9b1f6a634aac0df9850369f1214128dba2821998 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -449,7 +449,7 @@ in merged file and directory lists."
 ;(setq ido-ignore-files '("^ " "\\.c$" "\\.h$"))
 
 (defcustom ido-default-file-method  'raise-frame
-    "*How to visit a new file when using `ido-find-file'.
+  "*How to visit a new file when using `ido-find-file'.
 Possible values:
 `selected-window' Show new file in selected window
 `other-window'   Show new file in another window (same frame)
@@ -469,7 +469,7 @@ Possible values:
     :group 'ido)
 
 (defcustom ido-default-buffer-method  'raise-frame
-    "*How to switch to new buffer when using `ido-switch-buffer'.
+  "*How to switch to new buffer when using `ido-switch-buffer'.
 See `ido-default-file-method' for details."
     :type '(choice (const :tag "Show in selected window" selected-window)
                   (const :tag "Show in other window" other-window)
@@ -1309,6 +1309,7 @@ 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)
            (ido-pp 'ido-last-directory-list)
            (ido-pp 'ido-work-directory-list)
            (ido-pp 'ido-work-file-list)
@@ -1316,7 +1317,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")
+           (insert "\n;; Local Variables:\n;; coding: utf-8\n;; End:\n")
            (write-file ido-save-directory-list-file nil))
        (kill-buffer buf)))))