* lisp/files.el (auto-mode-alist): Entry for m2-mode (Bug#8852).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394698bad5fa347e4bf392853e0c2b45c89499c1..cafd440f650948cb3871fd80144c2cadb30799a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
+       * files.el (auto-mode-alist): Entry for m2-mode (Bug#8852).
+
        * info.el (Info-apropos-toc-nodes): Minor doc fix (Bug#8833).
 
 2011-06-19  Martin Rudalics  <rudalics@gmx.at>

diff --git a/lisp/files.el b/lisp/files.el
index aafc6f9290668727fc95921a490b0ef139c3dfe0..f79046e8b8f324eda8ea3b60e9bf9183a1707824 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2333,6 +2333,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.ebrowse\\'" . ebrowse-tree-mode)
      ("#\\*mail\\*" . mail-mode)
      ("\\.g\\'" . antlr-mode)
+     ("\\.m2\\'" . m2-mode)
      ("\\.ses\\'" . ses-mode)
      ("\\.docbook\\'" . sgml-mode)
      ("\\.com\\'" . dcl-mode)