aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-07-23 19:14:36 +0000
committerRichard M. Stallman2002-07-23 19:14:36 +0000
commit9e7638c33d5a6de64971af50a8fdfe3e80d03709 (patch)
tree4c804744e31be3343d67a09d965187d0eb8a5144
parent49c24f48f22c22ec1d3d57741398e45e032e2a9e (diff)
downloademacs-9e7638c33d5a6de64971af50a8fdfe3e80d03709.tar.gz
emacs-9e7638c33d5a6de64971af50a8fdfe3e80d03709.zip
(select-safe-coding-system):
Don't ask for confirmation of mismatch if find-file-literally was used.
-rw-r--r--lisp/international/mule-cmds.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 2be8e5f7f63..f5820af3fc2 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -721,7 +721,9 @@ and TO is ignored."
721 (setq coding-system buffer-file-coding-system)) 721 (setq coding-system buffer-file-coding-system))
722 ;; Check we're not inconsistent with what `coding:' spec &c would 722 ;; Check we're not inconsistent with what `coding:' spec &c would
723 ;; give when file is re-read. 723 ;; give when file is re-read.
724 (unless (stringp from) 724 ;; But don't do this if we explicitly ignored the cookie
725 ;; by using `find-file-literally'.
726 (unless (or (stringp from) find-file-literally)
725 (let ((auto-cs (save-excursion 727 (let ((auto-cs (save-excursion
726 (save-restriction 728 (save-restriction
727 (widen) 729 (widen)