[Emacs-diffs] emacs/lisp/international mule-cmds.el

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/03/03 01:57:22

Modified files:
        lisp/international: mule-cmds.el 

Log message:
        (select-safe-coding-system): If cdr
        part of buffer-file-coding-system-explicit is set, ignore
        default-buffer-file-coding-system and the most preferred coding
        system.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.357&r2=1.358

Patches:
Index: mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- mule-cmds.el        4 Feb 2009 07:44:03 -0000       1.357
+++ mule-cmds.el        3 Mar 2009 01:57:22 -0000       1.358
@@ -930,6 +930,8 @@
                      (append default-coding-system
                              (list (cons buffer-file-coding-system base)))))))
 
+      (unless (and buffer-file-coding-system-explicit
+                  (cdr buffer-file-coding-system-explicit))
       ;; If default-buffer-file-coding-system is not nil nor undecided,
       ;; append it to the defaults.
       (if default-buffer-file-coding-system
@@ -951,7 +953,7 @@
             (not (rassq base default-coding-system))
             (setq default-coding-system
                   (append default-coding-system
-                          (list (cons preferred base)))))))
+                            (list (cons preferred base))))))))
 
     (if select-safe-coding-system-accept-default-p
        (setq accept-default-p select-safe-coding-system-accept-default-p))