When possible, prefer UTF-8 as the safe encoding for saving

* lisp/international/mule-cmds.el (select-safe-coding-system):
If possible, offer UTF-8 as the default encoding.  (Bug#31807)

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8e69a1c7ab2ac152da8ec6ef1d9c48c2f9fc3cb9..cf6a8c78d09d999ae136f99dff1f1015718af3ec 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -988,6 +988,11 @@ It is highly recommended to fix it before writing to a file."
 
       ;; If all the defaults failed, ask a user.
       (when (not coding-system)
+        ;; If UTF-8 is in CODINGS, but is not its first member, make
+        ;; it the first one, so it is offered as the default.
+        (and (memq 'utf-8 codings) (not (eq 'utf-8 (car codings)))
+             (setq codings (append '(utf-8) (delq 'utf-8 codings))))
+
        (setq coding-system (select-safe-coding-system-interactively
                             from to codings unsafe rejected (car codings))))