aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii1998-08-04 10:27:45 +0000
committerEli Zaretskii1998-08-04 10:27:45 +0000
commitbe02cd54b3109b000f2dfaf828a538bbdd11b3f7 (patch)
tree7dfc7f216cefd748e52b8247e2fafbb4e39a1fe7
parentfabcd845a0661439937e410ff77d339f1fde3677 (diff)
downloademacs-be02cd54b3109b000f2dfaf828a538bbdd11b3f7.tar.gz
emacs-be02cd54b3109b000f2dfaf828a538bbdd11b3f7.zip
(find-new-buffer-file-coding-system): When
inhibit-eol-conversion is non-nil and the buffer didn't already set a fully-qualified coding system, force -unix eol-type.
-rw-r--r--lisp/international/mule.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 2de253aa92d..d6ea0b46197 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -962,8 +962,9 @@ Return nil if there's no need of setting new buffer-file-coding-system."
962 962
963 (setq found-eol (coding-system-eol-type coding)) 963 (setq found-eol (coding-system-eol-type coding))
964 (if (null (numberp found-eol)) 964 (if (null (numberp found-eol))
965 ;; But eol-type is not found. 965 ;; But eol-type is not found.
966 (setq found-eol nil)) 966 ;; If EOL conversions are inhibited, force unix eol-type.
967 (setq found-eol (if inhibit-eol-conversion 0)))
967 (if (eq (coding-system-type coding) t) 968 (if (eq (coding-system-type coding) t)
968 (setq found-coding 'undecided) 969 (setq found-coding 'undecided)
969 (setq found-coding (coding-system-base coding))) 970 (setq found-coding (coding-system-base coding)))