diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-07-23 17:23:09 +0200 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-07-23 17:23:09 +0200 |
commit | 0ee81a0ce066375eac701c06cdfbdebefe594fdc (patch) | |
tree | f0dccd24163316cfe688f927681a3032a9b1fe2f /lisp/autoinsert.el | |
parent | 894e369ddf48e191638b8e66ce732f24ff9abe2a (diff) | |
parent | 94da839793affa2a270bc26cee9c4d95d4dc4708 (diff) | |
download | emacs-0ee81a0ce066375eac701c06cdfbdebefe594fdc.tar.gz |
Merge from trunk
Diffstat (limited to 'lisp/autoinsert.el')
-rw-r--r-- | lisp/autoinsert.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index b3a594d31d4..9a8001875e0 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -126,10 +126,10 @@ If this contains a %s, that will be replaced by the matching rule." _ "\n\\begin{document}\n" _ "\n\\end{document}") - (("/bin/.*[^/]\\'" . "Shell-Script mode magic number") - lambda () + (("/bin/.*[^/]\\'" . "Shell-Script mode magic number") . + (lambda () (if (eq major-mode (default-value 'major-mode)) - (sh-mode))) + (sh-mode)))) (ada-mode . ada-header) |