andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
has a coding cookie, use it regardless of any other setting (bug#4712).
This commit is contained in:
Stefan Monnier 2009-10-17 03:59:45 +00:00
parent 547776f9b0
commit 2df48a8729
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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):

11
lisp/international/mule-cmds.el
View file

@ -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