Mercurial > emacs
changeset 45611:b234841ccaef
(auto-mode-alist): Strip trailing ".in" from the file
name when deciding the mode (for config.h.in, Makefile.in etc).
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Sat, 01 Jun 2002 18:04:35 +0000 |
| parents | e9b72e7f6062 |
| children | e1b3f85895a5 |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jun 01 17:49:22 2002 +0000 +++ b/lisp/ChangeLog Sat Jun 01 18:04:35 2002 +0000 @@ -1,3 +1,8 @@ +2002-06-01 Sam Steingold <sds@gnu.org> + + * files.el (auto-mode-alist): Strip trailing ".in" from the file + name when deciding the mode (for config.h.in, Makefile.in etc). + 2002-06-01 Thien-Thi Nguyen <ttn@gnu.org> * progmodes/prolog.el (prolog-mode-syntax-table): Add flags to
--- a/lisp/files.el Sat Jun 01 17:49:22 2002 +0000 +++ b/lisp/files.el Sat Jun 01 18:04:35 2002 +0000 @@ -303,7 +303,7 @@ If it matches, `replace-match' is used to replace the matching part with REPLACEMENT. If the optional element UNIQUIFY is non-nil, the auto-save file name is -constructed by taking the directory part of the replaced file-name, +constructed by taking the directory part of the replaced file-name, concatenated with the buffer file name with all directory separators changed to `!' to prevent clashes. This will not work correctly if your filesystem truncates the resulting name. @@ -483,7 +483,7 @@ (unless dir (setq dir default-directory)) (unless default-dirname - (setq default-dirname + (setq default-dirname (if initial (concat dir initial) default-directory))) (read-file-name prompt dir default-dirname mustmatch initial 'file-directory-p)) @@ -1179,7 +1179,7 @@ (unless (or (eq read-only buffer-file-read-only) (eq read-only buffer-read-only)) (when (or nowarn - (let ((question + (let ((question (format "File %s is %s on disk. Change buffer mode? " buffer-file-name (if read-only "read-only" "writable")))) @@ -1461,7 +1461,8 @@ (mapc (lambda (elt) (cons (purecopy (car elt)) (cdr elt))) - '(("\\.te?xt\\'" . text-mode) + '(("\\.in\\'" nil t) + ("\\.te?xt\\'" . text-mode) ("\\.c\\'" . c-mode) ("\\.h\\'" . c-mode) ("\\.tex\\'" . tex-mode) @@ -1492,7 +1493,7 @@ ("\\.m\\'" . objc-mode) ("\\.java\\'" . java-mode) ("\\.mk\\'" . makefile-mode) - ("\\(M\\|m\\|GNUm\\)akefile\\(\\.in\\)?\\'" . makefile-mode) + ("\\(M\\|m\\|GNUm\\)akefile\\'" . makefile-mode) ("\\.am\\'" . makefile-mode) ;For Automake. ;; Less common extensions come here ;; so more common ones above are found faster.