martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error. Fixes

Browse Source 
bug #7185.
This commit is contained in:
Alan Mackenzie
2010-10-31 11:54:02 +00:00
parent 938c0d1089
commit e6ef5dd9ce
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@@ -1,3 +1,8 @@
2010-10-31 Alan Mackenzie <acm@muc.de>
* progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.
This fixes bug #7185.
2010-10-30 Chong Yidong <cyd@stupidchicken.com>
* startup.el (command-line): Search for package directories, and

24
lisp/progmodes/cc-cmds.el
View File

@@ -3974,17 +3974,19 @@ 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).
(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)))))
; (or (<= (- (cdr c-lit-limits) 2) (point))
; 2010-10-17 Construct removed.
; (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 hanging. Replace all space between it
;; and the last word either by one or two 'x's (when