(ido-save-history): Write the history file in the current filename

coding system, and add `coding' file-local variable.

diff --git a/lisp/ido.el b/lisp/ido.el
index 27e9d66e25caa39048f669f57174709ea5649dfa..3c6eb6c576ed012cb929b107d8aaabd6e437c460 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)
@@ -1305,10 +1305,13 @@ Value is an integer which is number of chars to right of prompt.")
   (interactive)
   (when (and ido-last-directory-list ido-save-directory-list-file)
     (let ((buf (get-buffer-create " *ido session*"))
-         (version-control 'never))
+         (version-control 'never)
+         (coding-system (or file-name-coding-system
+                            default-file-name-coding-system)))
       (unwind-protect
          (with-current-buffer buf
            (erase-buffer)
+           (setq buffer-file-coding-system coding-system)
            (ido-pp 'ido-last-directory-list)
            (ido-pp 'ido-work-directory-list)
            (ido-pp 'ido-work-file-list)
@@ -1316,7 +1319,8 @@ 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 (format "\n;; Local Variables:\n;; coding: %s\n;; End:\n"
+                           coding-system))
            (write-file ido-save-directory-list-file nil))
        (kill-buffer buf)))))