diff options
| author | Chong Yidong | 2012-08-05 11:03:31 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-08-05 11:03:31 +0800 |
| commit | a9dd575408cbc905c0c79ee91b045c79d0e971a7 (patch) | |
| tree | 4d4a71359cf7802d4d2acf4a929a2e8e33c8bbda | |
| parent | 7c2dc8bd36acd9bee84354d052593b430d4ad527 (diff) | |
| download | emacs-a9dd575408cbc905c0c79ee91b045c79d0e971a7.tar.gz emacs-a9dd575408cbc905c0c79ee91b045c79d0e971a7.zip | |
* files.el (set-auto-mode): Fix invalid setq call.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fb1f0868d5b..22fedc4095c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-05 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * files.el (set-auto-mode): Fix invalid setq call. | ||
| 4 | |||
| 1 | 2012-08-04 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-08-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * isearch.el: Misc simplification; use defstruct. | 7 | * isearch.el: Misc simplification; use defstruct. |
diff --git a/lisp/files.el b/lisp/files.el index 0c895669542..2b4ae460c3e 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2734,7 +2734,7 @@ we don't actually set it to the same mode the buffer already has." | |||
| 2734 | (cadr mode)) | 2734 | (cadr mode)) |
| 2735 | (setq mode (car mode) | 2735 | (setq mode (car mode) |
| 2736 | name (substring name 0 (match-beginning 0))) | 2736 | name (substring name 0 (match-beginning 0))) |
| 2737 | (setq name)) | 2737 | (setq name nil)) |
| 2738 | (when mode | 2738 | (when mode |
| 2739 | (set-auto-mode-0 mode keep-mode-if-same) | 2739 | (set-auto-mode-0 mode keep-mode-if-same) |
| 2740 | (setq done t)))))) | 2740 | (setq done t)))))) |