(auto-mode-alist): Use rst-mode for *.rst and *.rest files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae154fced75d3b6270544bc2e8a0b5ebca4dcc5b..9bbeee66b27a36e8c02c6de1f5b0ac1af326a027 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,7 @@
        Remove unused var `in-par'.  Use `point' rather than `point-marker'.
        (rst-line-block-region): Reduce redundancy.  Use the `pfxarg' arg.
        (rst-replace-lines): Simplify.
+       (auto-mode-alist): Use rst-mode for *.rst and *.rest files.
 
        * simple.el (special-mode-map): New var.
        (special-mode): New major mode.

diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index b73b334b5097a20fa57e977e327fdc25cc847c5f..36475c3460e03461ecce67eb86f1c1b705c1d1f3 100644 (file)
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -361,7 +361,9 @@ The value of this variable is used when Rst Mode is turned on."
   :group 'rst
   :type '(boolean))
 
-
+;; Use rst-mode for *.rst and *.rest files.  Many ReStructured-Text files
+;; use *.txt, but this is too generic to be set as a default.
+;;;###autoload (add-to-list 'auto-mode-alist '("\\.re?st\\'" . rst-mode))
 ;;;###autoload
 (define-derived-mode rst-mode text-mode "ReST"
   :abbrev-table rst-mode-abbrev-table