mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00
Code Issues Releases Activity

cc-cmds.el (c-mask-paragraph, c-fill-paragraph): Fix for the case that a

Browse Source 
C style comment has its delimiters alone on their respective lines.
This commit is contained in:
Alan Mackenzie 2010-08-06 19:48:59 +00:00
parent 97ec208ffc
commit bd4c5e3e06
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2010-08-06 Alan Mackenzie <bug-cc-mode@gnu.org>
* progmodes/cc-cmds.el (c-mask-paragraph, c-fill-paragraph): Fix
for the case that a C style comment has its delimiters alone on
their respective lines.
2010-08-06 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-start-file-process ): Set connection

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

@ -4001,6 +4001,14 @@ command to conveniently insert and align the necessary backslashes."
(goto-char ender-start)
(current-column)))
(point-rel (- ender-start here))
(sentence-ends-comment
(save-excursion
(goto-char ender-start)
(and (search-backward-regexp
(c-sentence-end) (c-point 'bol) t)
(goto-char (match-end 0))
(looking-at "[ \t]*")
(= (match-end 0) ender-start))))
spaces)
(save-excursion
@ -4043,7 +4051,9 @@ command to conveniently insert and align the necessary backslashes."
(setq spaces
(max
(min spaces
(if sentence-end-double-space 2 1))
(if (and sentence-ends-comment
sentence-end-double-space)
2 1))
1)))
;; Insert the filler first to keep marks right.
(insert-char ?x spaces t)
@ -4253,8 +4263,11 @@ Optional prefix ARG means justify paragraph as well."
(let ((fill-paragraph-function
;; Avoid infinite recursion.
(if (not (eq fill-paragraph-function 'c-fill-paragraph))
fill-paragraph-function)))
(c-mask-paragraph t nil 'fill-paragraph arg))
fill-paragraph-function))
(start-point (point-marker)))
(c-mask-paragraph
t nil (lambda () (fill-region-as-paragraph (point-min) (point-max) arg)))
(goto-char start-point))
;; Always return t. This has the effect that if filling isn't done
;; above, it isn't done at all, and it's therefore effectively
;; disabled in normal code.