diff options
| author | Paul Eggert | 2015-03-18 11:45:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-03-18 11:45:36 -0700 |
| commit | 81deba3d7a2b187d58fe26bd8b4eafb5687095e1 (patch) | |
| tree | 82feff9e8228de216840a6c96ba7c006ce337e24 /src/ChangeLog | |
| parent | 8dfff871bdf0e420c6f5570e72afc80471d40d51 (diff) | |
| parent | 1a941d6c9eab9a35682408d6b85a1a98cfb6b01d (diff) | |
| download | emacs-81deba3d7a2b187d58fe26bd8b4eafb5687095e1.tar.gz emacs-81deba3d7a2b187d58fe26bd8b4eafb5687095e1.zip | |
Merge from origin/emacs-24
1a941d6 Fix incorrect usage of @key in the User Manual (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo. (Bug#20108)
2fdec80 Improve indexing in Emacs manual (Bug#20105)
cc11321 Fix --no-bitmap-icon
Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/misc/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 1b1a9c59033..bdec3c9cde1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-03-18 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is | ||
| 4 | nil/not present in the parameter alist. (Bug#19680) | ||
| 5 | |||
| 1 | 2015-03-18 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2015-03-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * alloc.c (purecopy): Handle hash-tables. | 8 | * alloc.c (purecopy): Handle hash-tables. |