From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 19 Jun 2011 18:53:49 +0000 (-0400)
Subject: * lisp/files.el (auto-mode-alist): Entry for m2-mode (Bug#8852).
X-Git-Tag: emacs-pretest-24.0.90~104^2~509
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ca009e5a83198b1d5bb57ee4f53d275eb8623ae;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394698bad5f..cafd440f650 100644
--- 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 aafc6f92906..f79046e8b8f 100644
--- 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)