From 2a8784129daf270d0a20ce3531e488de51de7520 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Fri, 1 May 2020 14:44:56 +0100
Subject: [PATCH] ; Fix recent additions with lisp-data-mode

* lisp/bookmark.el (bookmark-insert-file-format-version-stamp)
(save-place-alist-to-file): Delimit file-local variables on the -*-
line with semicolons.
* lisp/files.el (auto-mode-alist): Use shy regexp group.
---
 lisp/bookmark.el  | 2 +-
 lisp/files.el     | 4 ++--
 lisp/saveplace.el | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index f2384973e9c..0fa77ed3224 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -736,7 +736,7 @@ CODING is the symbol of the coding-system in which the file is encoded."
   (insert
    (format
     ";;;; Emacs Bookmark Format Version %d\
-;;;; -*- coding: %S mode: lisp-data -*-\n"
+;;;; -*- coding: %S; mode: lisp-data -*-\n"
     bookmark-file-format-version (coding-system-base coding)))
   (insert ";;; This format is meant to be slightly human-readable;\n"
           ";;; nevertheless, you probably don't want to edit it.\n"
diff --git a/lisp/files.el b/lisp/files.el
index 56d4679ad7d..c34fe003880 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2657,9 +2657,9 @@ since only a single case-insensitive search through the alist is made."
      ("\\.ltx\\'" . latex-mode)
      ("\\.dtx\\'" . doctex-mode)
      ("\\.org\\'" . org-mode)
-     ;; .dir-locals.el is not really elisp.  Could use the
+     ;; .dir-locals.el is not really Elisp.  Could use the
      ;; `dir-locals-file' constant if it weren't defined below.
-     ("\\.dir-locals\\(-2\\)?\\.el\\'" . lisp-data-mode)
+     ("\\.dir-locals\\(?:-2\\)?\\.el\\'" . lisp-data-mode)
      ("eww-bookmarks\\'" . lisp-data-mode)
      ("tramp\\'" . lisp-data-mode)
      ("places\\'" . lisp-data-mode)
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index f78639db246..46738ab03dc 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -248,8 +248,8 @@ may have changed) back to `save-place-alist'."
       (delete-region (point-min) (point-max))
       (when save-place-forget-unreadable-files
 	(save-place-forget-unreadable-files))
-      (insert (format ";;; -*- coding: %s mode: lisp-data -*-\n"
-                      (symbol-name coding-system-for-write)))
+      (insert (format ";;; -*- coding: %s; mode: lisp-data -*-\n"
+                      coding-system-for-write))
       (let ((print-length nil)
             (print-level nil))
         (pp save-place-alist (current-buffer)))
-- 
2.39.5