master 455495b215 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 455495b2154844f9f0e7465c9f0ccfc864c0290b
Merge: e93aa8d586 6f872ea8e7
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/files-x.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/files-x.el b/lisp/files-x.el
index a89fc26d60..8224a57450 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -502,12 +502,13 @@ from the MODE alist ignoring the input argument VALUE."
                       ((and (symbolp (car b)) (stringp (car a))) nil)
                       (t (string< (car a) (car b)))))))
              (current-buffer))
+      (when (eobp) (insert "\n"))
       (goto-char (point-min))
       (indent-sexp))))
 
 (defun dir-locals-to-string (variables)
   "Output alists of VARIABLES to string in dotted pair notation syntax."
-  (format "(%s)\n"
+  (format "(%s)"
           (mapconcat
            (lambda (mode-variables)
              (format "(%S . %s)"