Mercurial > emacs
changeset 106942:d16c45d89283
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 19 Jan 2010 22:56:21 +0000 |
| parents | 6132b66d6b9d (current diff) 6881eb43ae95 (diff) |
| children | 61b4d7e04828 |
| files | |
| diffstat | 3 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 19 22:05:33 2010 +0000 +++ b/lisp/ChangeLog Tue Jan 19 22:56:21 2010 +0000 @@ -1,3 +1,10 @@ +2010-01-19 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty + buffer throws "args out of range". + (c-set-cpp-delimiters, c-clear-cpp-delimiters): Check for EOB + playing the role of delimiter. + 2010-01-18 Stephen Leake <stephen_leake@member.fsf.org> * lisp/progmodes/ada-mode.el: Fix bug#5400.
--- a/lisp/progmodes/cc-defs.el Tue Jan 19 22:05:33 2010 +0000 +++ b/lisp/progmodes/cc-defs.el Tue Jan 19 22:56:21 2010 +0000 @@ -1217,12 +1217,14 @@ ;; This macro does a hidden buffer change. `(progn (c-put-char-property ,beg 'category 'c-cpp-delimiter) - (c-put-char-property ,end 'category 'c-cpp-delimiter))) + (if (< ,end (point-max)) + (c-put-char-property ,end 'category 'c-cpp-delimiter)))) (defmacro c-clear-cpp-delimiters (beg end) ;; This macro does a hidden buffer change. `(progn (c-clear-char-property ,beg 'category) - (c-clear-char-property ,end 'category))) + (if (< ,end (point-max)) + (c-clear-char-property ,end 'category)))) (defsubst c-comment-out-cpps () ;; Render all preprocessor constructs syntactically commented out.
--- a/src/ChangeLog Tue Jan 19 22:05:33 2010 +0000 +++ b/src/ChangeLog Tue Jan 19 22:56:21 2010 +0000 @@ -1,3 +1,10 @@ +2010-01-19 Alan Mackenzie <acm@muc.de> + + Fix spurious before-change-functions invocation from (insert ?\n). + * textprop.c (set_text_properties): rename parameter + `signal_after_change_p' to `coherent_change_p', and make the + invocation of `modify_region' conditional on it. + 2010-01-19 Jan Djärv <jan.h.d@swipnet.se> * xsettings.c (apply_xft_settings): Save settings in Vxft_settings @@ -182,13 +189,6 @@ * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must also be true before we can return early (bug #5339). -2010-01-08 Alan Mackenzie <acm@muc.de> - - Fix spurious before-change-functions invocation from (insert ?\n). - * textprop.c (set_text_properties): rename parameter - `signal_after_change_p' to `coherent_change_p', and make the - invocation of `modify_region' conditional on it. - 2010-01-06 David Reitter <david.reitter@gmail.com> * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS.