summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2007-11-10 00:19:44 +0000
committerJuanma Barranquero <lekktu@gmail.com>2007-11-10 00:19:44 +0000
commitd725608c0ecfdb7328b5ec49c06f508e18ab6dcd (patch)
tree1d786e30cd3cd92bafc4f26822d20d0064cd8361
parent5015055ea560a3dabb2d4bdb200d749fad374949 (diff)
downloademacs-d725608c0ecfdb7328b5ec49c06f508e18ab6dcd.tar.gz
emacs-d725608c0ecfdb7328b5ec49c06f508e18ab6dcd.tar.bz2
emacs-d725608c0ecfdb7328b5ec49c06f508e18ab6dcd.zip
(ido-save-history): Save the history file in UTF-8,
not the current filename coding system.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ido.el9
2 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91f99cf8545..ae30079d91b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-10 Juanma Barranquero <lekktu@gmail.com>
+
+ * ido.el (ido-save-history): Save the history file in UTF-8, not
+ the current filename coding system.
+
2007-11-09 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (interprogram-cut-function, interprogram-paste-function):
diff --git a/lisp/ido.el b/lisp/ido.el
index 3c6eb6c576e..0a077f9dab6 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1305,13 +1305,11 @@ 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)
- (coding-system (or file-name-coding-system
- default-file-name-coding-system)))
+ (version-control 'never))
(unwind-protect
(with-current-buffer buf
(erase-buffer)
- (setq buffer-file-coding-system coding-system)
+ (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)
@@ -1319,8 +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 (format "\n;; Local Variables:\n;; coding: %s\n;; End:\n"
- coding-system))
+ (insert "\n;; Local Variables:\n;; coding: utf-8\n;; End:\n")
(write-file ido-save-directory-list-file nil))
(kill-buffer buf)))))