andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cc-cmds.el (c-mask-paragraph): Fix bug #6688, Auto-fill broken in C/C++

Browse source 
modes.
This commit is contained in:
Alan Mackenzie 2010-07-31 09:39:24 +00:00
parent 2c09a58f7e
commit 28e5cf7c6a
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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)

9
lisp/progmodes/cc-cmds.el
View file

@ -3974,16 +3974,17 @@ command to conveniently insert and align the necessary backslashes."
;; "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