aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier1999-11-19 20:14:12 +0000
committerStefan Monnier1999-11-19 20:14:12 +0000
commita9fb0b79abd70f29a2d5244d64d2b3ae1a465b0d (patch)
tree4205d0f5fd72044ee1caed273f57807e67ec454d
parentd7a0208b27e7e63262c6f6edb1b3575b76ed7fee (diff)
downloademacs-a9fb0b79abd70f29a2d5244d64d2b3ae1a465b0d.tar.gz
emacs-a9fb0b79abd70f29a2d5244d64d2b3ae1a465b0d.zip
(auto-mode-alist): add patterns for diff-mode.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/files.el1
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80b23efa48e..8079b444a7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
11999-11-19 Stefan Monnier <monnier@cs.yale.edu> 11999-11-19 Stefan Monnier <monnier@cs.yale.edu>
2 2
3 * files.el (auto-mode-alist): add patterns for diff-mode.
4
3 * complete.el (PC-do-complete-and-exit): use minibuffer-prompt-end to 5 * complete.el (PC-do-complete-and-exit): use minibuffer-prompt-end to
4 detect an empty prompt. 6 detect an empty prompt.
5 7
diff --git a/lisp/files.el b/lisp/files.el
index 3c3aeed60d9..540fc7ad2a7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1382,6 +1382,7 @@ in that case, this function acts as if `enable-local-variables' were t."
1382 ("\\.as2$" . snmpv2-mode) 1382 ("\\.as2$" . snmpv2-mode)
1383 ("\\.mi2$" . snmpv2-mode) 1383 ("\\.mi2$" . snmpv2-mode)
1384 ("\\.sm2$" . snmpv2-mode) 1384 ("\\.sm2$" . snmpv2-mode)
1385 ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
1385 ("\\.[eE]?[pP][sS]$" . ps-mode)) 1386 ("\\.[eE]?[pP][sS]$" . ps-mode))
1386 "\ 1387 "\
1387Alist of filename patterns vs corresponding major mode functions. 1388Alist of filename patterns vs corresponding major mode functions.