diff options
| author | Juanma Barranquero | 2014-03-27 18:34:22 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2014-03-27 18:34:22 +0100 |
| commit | 1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381 (patch) | |
| tree | 01db12aa0584e566f44f32c062a67f98ea836837 /lisp/ChangeLog | |
| parent | b9b37dd04e6f60ef16738efe1b396a9e0a461d86 (diff) | |
| parent | 0c4e715c98919593413a76a0ab1458b0d10ea287 (diff) | |
| download | emacs-1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381.tar.gz emacs-1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381.zip | |
Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 613108fc015..fc83e157d18 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2014-03-27 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight | ||
| 4 | special globals with font-lock-builtin-face. (Bug#17057) | ||
| 5 | |||
| 6 | * progmodes/ruby-mode.el (ruby-syntax-propertize-function): | ||
| 7 | Don't propertize `?' or `!' as symbol constituent when after | ||
| 8 | colon. (Bug#17097) | ||
| 9 | |||
| 10 | 2014-03-27 Juanma Barranquero <lekktu@gmail.com> | ||
| 11 | |||
| 12 | * frameset.el (frameset--restore-frame): Remove workaround for bug#14795 | ||
| 13 | which is no longer needed and causes trouble in GTK builds (bug#17046). | ||
| 14 | |||
| 15 | * emacs-lisp/package-x.el (package--archive-contents-from-url): | ||
| 16 | Use url-insert-file-contents; package-handle-response no longer exists. | ||
| 17 | |||
| 1 | 2014-03-26 Daniel Colascione <dancol@dancol.org> | 18 | 2014-03-26 Daniel Colascione <dancol@dancol.org> |
| 2 | 19 | ||
| 3 | * simple.el (process-menu-mode-map): New variable. | 20 | * simple.el (process-menu-mode-map): New variable. |