[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100947: cc-cmds.el (c-mask-paragraph
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100947: cc-cmds.el (c-mask-paragraph): Fix bug #6688, Auto-fill broken in C/C++ |
Date: |
Sat, 31 Jul 2010 09:39:24 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100947
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Sat 2010-07-31 09:39:24 +0000
message:
cc-cmds.el (c-mask-paragraph): Fix bug #6688, Auto-fill broken in C/C++
modes.
modified:
lisp/ChangeLog
lisp/progmodes/cc-cmds.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-07-29 16:49:59 +0000
+++ b/lisp/ChangeLog 2010-07-31 09:39:24 +0000
@@ -1,3 +1,8 @@
+2010-07-31 Alan Mackenzie <address@hidden>
+
+ * progmodes/cc-cmds.el (c-mask-paragraph): Fix bug #6688:
+ Auto-fill broken in C/C++ modes.
+
2010-07-29 Jan Djärv <address@hidden>
* menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
=== modified file 'lisp/progmodes/cc-cmds.el'
--- a/lisp/progmodes/cc-cmds.el 2010-05-12 11:06:12 +0000
+++ b/lisp/progmodes/cc-cmds.el 2010-07-31 09:39:24 +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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100947: cc-cmds.el (c-mask-paragraph): Fix bug #6688, Auto-fill broken in C/C++,
Alan Mackenzie <=