Prevent `modify-file-local-variable-prop-line' from adding extra ';'

* lisp/files-x.el (modify-file-local-variable-prop-line): Handle
whitespace when checking if there's already a ';' before the
variable (Bug#23294).

Copyright-paperwork-exempt: yes

diff --git a/lisp/files-x.el b/lisp/files-x.el
index 2a52792222d044983882df1665233406d9e5639e..92532e85f4f86b5812704d432d3c425586936354 100644 (file)
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -377,7 +377,9 @@ from the -*- line ignoring the input argument VALUE."
           ((eq variable 'mode) (goto-char beg))
           ((null replaced-pos) (goto-char end))
           (replaced-pos (goto-char replaced-pos)))
-         (if (and (not (eq (char-before) ?\;))
+          (if (and (save-excursion
+                     (skip-chars-backward " \t")
+                     (not (eq (char-before) ?\;)))
                   (not (equal (point) (marker-position beg)))
                   ;; When existing `-*- -*-' is empty, beg > end.
                   (not (> (marker-position beg) (marker-position end))))