Mercurial > emacs
changeset 109595:a854e7a0e7eb
cc-cmds.el (c-mask-paragraph): Fix bug #6688, Auto-fill broken in C/C++
modes.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Sat, 31 Jul 2010 09:39:24 +0000 |
| parents | fe23ee097a54 |
| children | c18e82c381e4 |
| files | lisp/ChangeLog lisp/progmodes/cc-cmds.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jul 29 21:42:38 2010 -0700 +++ b/lisp/ChangeLog Sat Jul 31 09:39:24 2010 +0000 @@ -1,3 +1,8 @@ +2010-07-31 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-cmds.el (c-mask-paragraph): Fix bug #6688: + Auto-fill broken in C/C++ modes. + 2010-07-29 Jan Djärv <jan.h.d@swipnet.se> * menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
--- a/lisp/progmodes/cc-cmds.el Thu Jul 29 21:42:38 2010 -0700 +++ b/lisp/progmodes/cc-cmds.el Sat Jul 31 09:39:24 2010 +0000 @@ -3974,16 +3974,17 @@ ;; "Invalid search bound (wrong side of point)" ;; error in the subsequent re-search. Maybe ;; another fix would be needed (2007-12-08). - (and (> (- (cdr c-lit-limits) 2) (point)) + (or (<= (- (cdr c-lit-limits) 2) (point)) + (and (search-forward-regexp (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)") (- (cdr c-lit-limits) 2) t) (not (search-forward-regexp "\\(\\s \\|\\sw\\)" (- (cdr c-lit-limits) 2) 'limit)) - ;; The comment ender IS on its own line. Exclude - ;; this line from the filling. - (set-marker end (c-point 'bol)))) + ;; The comment ender IS on its own line. Exclude + ;; this line from the filling. + (set-marker end (c-point 'bol))))) ;; The comment ender is hanging. Replace all space between it ;; and the last word either by one or two 'x's (when