Allow several mode: elements in the local variable section

* etc/NEWS (mode): Fall back on outline-mode in older Emacsen.
* lisp/files.el (hack-local-variables--find-variables): Use the
final mode: line (which is the same as having several mode: bits
in the header line.

2 files changed, 9 insertions, 0 deletions

diff --git a/test/lisp/files-resources/file-mode-multiple b/test/lisp/files-resources/file-mode-multiple
new file mode 100644
index 00000000000..ac051ccbcbd
--- /dev/null
+++ b/test/lisp/files-resources/file-mode-multiple
@@ -0,0 +1,5 @@
+Local variables:
+mode: text
+mode: test-mode-undef
+mode: outline
+end:
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index f76d047f302..c886bd79851 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1821,5 +1821,9 @@ Prompt users for any modified buffer with `buffer-offer-save' non-nil."
   ;; Check that the mode cookie doesn't override the explicit setting.
   (should (eq major-mode 'emacs-lisp-mode)))
 
+(ert-deftest files-test-set-mode-multiple ()
+  (find-file (ert-resource-file "file-mode-multiple"))
+  (should (eq major-mode 'outline-mode)))
+
 (provide 'files-tests)
 ;;; files-tests.el ends here