diff options
| author | Joakim Verona | 2013-08-23 21:12:05 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-23 21:12:05 +0200 |
| commit | 4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d (patch) | |
| tree | 31556f18852662134431eb15da905dc4d7b64cc4 /lisp/ChangeLog | |
| parent | aedb3873bb150227acd4b9496127a2e250d9da66 (diff) | |
| parent | 2d85dc347ccdffc32d3dd6fa163ea94a860540de (diff) | |
| download | emacs-4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d.tar.gz emacs-4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d3b09c3449..b47258330f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-08-23 Glenn Morris <rgm@gnu.org> | 1 | 2013-08-23 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * files.el (auto-mode-alist): Use sh-mode for .bash_history. | ||
| 4 | |||
| 3 | * files.el (interpreter-mode-alist): Use tcl-mode for expect scripts. | 5 | * files.el (interpreter-mode-alist): Use tcl-mode for expect scripts. |
| 4 | 6 | ||
| 5 | * files.el (create-file-buffer): If the result would begin with | 7 | * files.el (create-file-buffer): If the result would begin with |