Commit 2df48a87 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(select-safe-coding-system): If the file

has a coding cookie, use it regardless of any other setting (bug#4712).
parent 547776f9
2009-10-17 Stefan Monnier <monnier@iro.umontreal.ca>
* international/mule-cmds.el (select-safe-coding-system): If the file
has a coding cookie, use it regardless of any other setting (bug#4712).
2009-10-17 Glenn Morris <rgm@gnu.org>
* cedet/semantic/grammar.el (semantic-grammar--lex-delim-spec):
......
......@@ -889,13 +889,12 @@ It is highly recommended to fix it before writing to a file."
default-coding-system))
(if (and auto-cs (not no-other-defaults))
;; If the file has a coding cookie, try to use it before anything
;; else (i.e. before default-coding-system which will typically come
;; from file-coding-system-alist).
;; If the file has a coding cookie, use it regardless of any
;; other setting.
(let ((base (coding-system-base auto-cs)))
(or (memq base '(nil undecided))
(rassq base default-coding-system)
(push (cons auto-cs base) default-coding-system))))
(unless (memq base '(nil undecided))
(setq default-coding-system (list (cons auto-cs base)))
(setq no-other-defaults t))))
(unless no-other-defaults
;; If buffer-file-coding-system is not nil nor undecided, append it
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment