diff options
| author | Paul Eggert | 2015-03-29 14:14:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-03-29 14:14:15 -0700 |
| commit | 0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f (patch) | |
| tree | 1fd646daf290a63564bd8823b8a0ba32e8190ae3 /src/ChangeLog | |
| parent | 4a7004369824ea46fd5222a3f57cf3ee67e988e0 (diff) | |
| parent | 5e0314f6fabca1af214240177a28d3822d6ef3e5 (diff) | |
| download | emacs-0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f.tar.gz emacs-0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f.zip | |
Merge from origin/emacs-24
5e0314f * smie.el (smie*ward-sexp-command): Don't pretend the arg is optional
13cf575 Don't round up scroll bar width with GTK3 (Bug#20182).
921dd0d * doc/lispref/objects.texi (Equality Predicates): Fix typo in example.
Conflicts:
doc/lispref/ChangeLog
lisp/ChangeLog
src/ChangeLog
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7874910c813..c11ecb7e3ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-03-29 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * gtkutil.c (update_theme_scrollbar_width): Don't round up | ||
| 4 | scroll bar width with GTK3 (Bug#20182). | ||
| 5 | |||
| 1 | 2015-03-28 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2015-03-28 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or | 8 | * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or |