diff options
| author | Jan Djärv | 2010-01-19 15:54:57 +0100 |
|---|---|---|
| committer | Jan Djärv | 2010-01-19 15:54:57 +0100 |
| commit | bc4b76f12a306f8fbc892e6f1e00733f3ef1981f (patch) | |
| tree | ed117f27318a9e295e7df84bf5e3d40a4ce2ff6c /src/ChangeLog | |
| parent | 67477f30cb0f563fe124decf9391af4a980c7bfb (diff) | |
| parent | eeff0f485929b225f9b302e5957a654f4a367305 (diff) | |
| download | emacs-bc4b76f12a306f8fbc892e6f1e00733f3ef1981f.tar.gz emacs-bc4b76f12a306f8fbc892e6f1e00733f3ef1981f.zip | |
Merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c17788080d8..3832808dc09 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -182,6 +182,13 @@ | |||
| 182 | * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must | 182 | * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must |
| 183 | also be true before we can return early (bug #5339). | 183 | also be true before we can return early (bug #5339). |
| 184 | 184 | ||
| 185 | 2010-01-08 Alan Mackenzie <acm@muc.de> | ||
| 186 | |||
| 187 | Fix spurious before-change-functions invocation from (insert ?\n). | ||
| 188 | * textprop.c (set_text_properties): rename parameter | ||
| 189 | `signal_after_change_p' to `coherent_change_p', and make the | ||
| 190 | invocation of `modify_region' conditional on it. | ||
| 191 | |||
| 185 | 2010-01-06 David Reitter <david.reitter@gmail.com> | 192 | 2010-01-06 David Reitter <david.reitter@gmail.com> |
| 186 | 193 | ||
| 187 | * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS. | 194 | * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS. |