diff options
| author | Stefan Monnier | 2014-09-29 14:14:08 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-09-29 14:14:08 -0400 |
| commit | cbdc06f3be1fb1921454d15d5d9f48bef85cba9e (patch) | |
| tree | eadcc7cd3232cc8f8ac5789d5ef48cc69796a19c /src | |
| parent | 8f24b587c87f621f5bc9997589de5d4e3f73b1c3 (diff) | |
| download | emacs-cbdc06f3be1fb1921454d15d5d9f48bef85cba9e.tar.gz emacs-cbdc06f3be1fb1921454d15d5d9f48bef85cba9e.zip | |
Rename 24.5 to 25.1
Except where we expect to backport the corresponding change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 89fc763fc53..698eab54b8f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4435,8 +4435,7 @@ | |||
| 4435 | * doc.c (store_function_docstring): Warn when we don't know where to | 4435 | * doc.c (store_function_docstring): Warn when we don't know where to |
| 4436 | put a docstring. | 4436 | put a docstring. |
| 4437 | (Fsubstitute_command_keys): Don't advertise the fact that | 4437 | (Fsubstitute_command_keys): Don't advertise the fact that |
| 4438 | text-properties are dropped, since we think it's a bug that we'll fix | 4438 | text-properties are dropped, since we think it's a bug that we'll fix. |
| 4439 | in 24.5. | ||
| 4440 | 4439 | ||
| 4441 | * frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date. | 4440 | * frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date. |
| 4442 | * xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame. | 4441 | * xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame. |