diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ae429db7a7a..eba439b46d7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-12 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * international/mule.el (auto-coding-alist): Use utf-8-emacs-unix | ||
| 4 | for auto-save files. | ||
| 5 | |||
| 1 | 2013-06-12 Glenn Morris <rgm@gnu.org> | 6 | 2013-06-12 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * ido.el (ido-delete-ignored-files): Remove. | 8 | * ido.el (ido-delete-ignored-files): Remove. |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index dd0f3821728..4ce1a28c438 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -1691,7 +1691,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" | |||
| 1691 | ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion) | 1691 | ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion) |
| 1692 | ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) | 1692 | ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) |
| 1693 | ("\\.pdf\\'" . no-conversion) | 1693 | ("\\.pdf\\'" . no-conversion) |
| 1694 | ("/#[^/]+#\\'" . emacs-mule))) | 1694 | ("/#[^/]+#\\'" . utf-8-emacs-unix))) |
| 1695 | "Alist of filename patterns vs corresponding coding systems. | 1695 | "Alist of filename patterns vs corresponding coding systems. |
| 1696 | Each element looks like (REGEXP . CODING-SYSTEM). | 1696 | Each element looks like (REGEXP . CODING-SYSTEM). |
| 1697 | A file whose name matches REGEXP is decoded by CODING-SYSTEM on reading. | 1697 | A file whose name matches REGEXP is decoded by CODING-SYSTEM on reading. |