diff options
| author | Joakim Verona | 2013-08-27 04:56:46 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-27 04:56:46 +0200 |
| commit | 5a3ec8917482d3187ab187bf0b5dc15f0fc1bb63 (patch) | |
| tree | a1cc044a11fd1d250a587a73170f47c23585be92 /lisp/ChangeLog | |
| parent | b08b88950d94aad9145163b424e544d78c172c84 (diff) | |
| parent | 9e89d835b04c20a8cd3dfad452fa827d675b0938 (diff) | |
| download | emacs-5a3ec8917482d3187ab187bf0b5dc15f0fc1bb63.tar.gz emacs-5a3ec8917482d3187ab187bf0b5dc15f0fc1bb63.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 31538258bb6..b8351f11f61 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-font-lock-keywords): Don't return nil | ||
| 4 | from a matcher-function unless there's no more matches (bug#15161). | ||
| 5 | |||
| 1 | 2013-08-26 Michael Albinus <michael.albinus@gmx.de> | 6 | 2013-08-26 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * minibuffer.el: Revert change from 2013-08-20. | 8 | * minibuffer.el: Revert change from 2013-08-20. |