diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:41:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:41:30 -0800 |
| commit | 37ad855a38786722833d06dfe78786acc7e9f412 (patch) | |
| tree | de0f0c7aac92eb2c321c1d6ec3254250316d1035 /src/ChangeLog | |
| parent | 36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25 (diff) | |
| parent | f1601063f29c99be77d2513320ed6d2494926c1d (diff) | |
| download | emacs-37ad855a38786722833d06dfe78786acc7e9f412.tar.gz | |
Merge from origin/emacs-24
f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat
Conflicts:
admin/notes/repo
etc/NEWS
lisp/ChangeLog
lisp/erc/ChangeLog
src/ChangeLog
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7a30c6e897a..b1d9822f2f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,28 @@ 2015-03-03 Eli Zaretskii <eliz@gnu.org> + * search.c (find_newline): Avoid assertion violations in + CHAR_TO_BYTE when a portion of the buffer was deleted and we look + for newlines near the end of the buffer. This happens in Rmail + hen JIT font-lock fontifies a newly displayed portion of the + buffer. + +2015-03-03 Eli Zaretskii <eliz@gnu.org> + + * w32fns.c (Fw32__menu_bar_in_use): New internal function. + (Bug#19925) + +2015-03-03 Glenn Morris <rgm@gnu.org> + + * fileio.c (Fmake_temp_name): Doc tweaks. (Bug#19858) + +2015-03-03 Eli Zaretskii <eliz@gnu.org> + + * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call + mouse_position_for_popup only for X frames. (Bug#19862) + +2015-03-03 Eli Zaretskii <eliz@gnu.org> +2015-03-03 Eli Zaretskii <eliz@gnu.org> + * buffer.c (syms_of_buffer): Doc fix. (Bug#19841) 2015-03-03 Eli Zaretskii <eliz@gnu.org> |