diff options
| author | Eli Zaretskii | 2020-02-29 09:51:43 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2020-02-29 09:51:43 +0200 |
| commit | 9908b5a61438ab82964d43bcfbcbe968d9bf601b (patch) | |
| tree | 66b696cf1610ca31dfd167149a34956f872a2897 /lisp | |
| parent | d767c357ca8ca59097d8ee7c06309efc1688f368 (diff) | |
| parent | 6dc2ebe00e88d9fb6923bea9125700eb286726c7 (diff) | |
| download | emacs-9908b5a61438ab82964d43bcfbcbe968d9bf601b.tar.gz emacs-9908b5a61438ab82964d43bcfbcbe968d9bf601b.zip | |
Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/international/mule.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 66594791209..86f3d2a34bf 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -2601,7 +2601,7 @@ This function is intended to be added to `auto-coding-functions'." | |||
| 2601 | (detect-coding-region (point-min) size t))))) | 2601 | (detect-coding-region (point-min) size t))))) |
| 2602 | ;; Pure ASCII always comes back as undecided. | 2602 | ;; Pure ASCII always comes back as undecided. |
| 2603 | (if (memq detected | 2603 | (if (memq detected |
| 2604 | '(utf-8 'utf-8-with-signature 'utf-8-hfs undecided)) | 2604 | '(utf-8 utf-8-with-signature utf-8-hfs undecided)) |
| 2605 | 'utf-8 | 2605 | 'utf-8 |
| 2606 | (warn "File contents detected as %s. | 2606 | (warn "File contents detected as %s. |
| 2607 | Consider adding an encoding attribute to the xml declaration, | 2607 | Consider adding an encoding attribute to the xml declaration, |