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 /doc/lispref/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 'doc/lispref/ChangeLog')
| -rw-r--r-- | doc/lispref/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9e1b7b074e2..c24bb646fa6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-03-29 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * objects.texi (Equality Predicates): Fix typo in example. | ||
| 4 | |||
| 1 | 2015-03-25 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2015-03-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * positions.texi (Excursions, Narrowing): `save-excursion' does not | 7 | * positions.texi (Excursions, Narrowing): `save-excursion' does not |