2 new commits in cc-mode:
https://bitbucket.org/xemacs/cc-mode/changeset/e5984b8a18d4/
changeset: e5984b8a18d4
user: acm
date: 2012-12-09 22:12:34
summary: Make CC Mode not hang when _some_ lines end in CRLF.
cc-engine.el (c-backward-comments): Add code to work around
`forward-comment' not recognizing ^M as whitespace.
affected #: 1 file
diff -r 6bf70f1270efe5b5d6ec57d59153918ef0c8a145 -r
e5984b8a18d4489a66329d3ab3d696764c896092 cc-engine.el
--- a/cc-engine.el
+++ b/cc-engine.el
@@ -1454,8 +1454,21 @@
;; return t when moving backwards at bob.
(not (bobp))
- (if (let (open-paren-in-column-0-is-defun-start)
- (forward-comment -1))
+ (if (let (open-paren-in-column-0-is-defun-start moved-comment)
+ (while
+ (and (not (setq moved-comment (forward-comment -1)))
+ ;; Cope specifically with ^M^J here -
+ ;; forward-comment sometimes gets stuck after ^Ms,
+ ;; sometimes after ^M^J.
+ (or
+ (when (eq (char-before) ?\r)
+ (backward-char)
+ t)
+ (when (and (eq (char-before) ?\n)
+ (eq (char-before (1- (point))) ?\r))
+ (backward-char 2)
+ t))))
+ moved-comment)
(if (looking-at "\\*/")
;; Emacs <= 20 and XEmacs move back over the
;; closer of a block comment that lacks an opener.
https://bitbucket.org/xemacs/cc-mode/changeset/8049c203893b/
changeset: 8049c203893b
user: acm
date: 2012-12-09 22:43:30
summary: Merge.
affected #: 3 files
diff -r e5984b8a18d4489a66329d3ab3d696764c896092 -r
8049c203893b1808307707a3bab2155dcb2f7f17 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -89,3 +89,4 @@
f1a6c0e647399eba8c3511db89520f0efc63d535 cc-mode-1_54
c6a1f4bc808ef2c7d08ba5147537e99b40c78ce4 cc-mode-1_55
2475272d8bae991446e6b5fe927fb9a489b6df5d cc-mode-1_56
+a9aff1813e2a4aa3d8af1ae40b69bcaf033f7905 cc-mode-1_57
diff -r e5984b8a18d4489a66329d3ab3d696764c896092 -r
8049c203893b1808307707a3bab2155dcb2f7f17 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-11 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.57 released.
+
2012-09-03 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.56 released.
diff -r e5984b8a18d4489a66329d3ab3d696764c896092 -r
8049c203893b1808307707a3bab2155dcb2f7f17 Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.56
+VERSION = 1.57
AUTHOR_VERSION = 5.32.2
MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org>
PACKAGE = cc-mode
Repository URL:
https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches