diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
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 @@ 1999-11-19 Stefan Monnier <monnier@cs.yale.edu> + * files.el (auto-mode-alist): add patterns for diff-mode. + * complete.el (PC-do-complete-and-exit): use minibuffer-prompt-end to detect an empty prompt. 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." ("\\.as2$" . snmpv2-mode) ("\\.mi2$" . snmpv2-mode) ("\\.sm2$" . snmpv2-mode) + ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode) ("\\.[eE]?[pP][sS]$" . ps-mode)) "\ Alist of filename patterns vs corresponding major mode functions. |