[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117206: Guard (looking-at "\\s!") from XEmacs.
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] trunk r117206: Guard (looking-at "\\s!") from XEmacs. |
Date: |
Fri, 30 May 2014 17:12:01 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117206
revision-id: address@hidden
parent: address@hidden
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Fri 2014-05-30 17:06:53 +0000
message:
Guard (looking-at "\\s!") from XEmacs.
progmodes/cc-engine.el (c-state-pp-to-literal): add guard form.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/cc-engine.el
ccengine.el-20091113204419-o5vbwnq5f7feedwu-1227
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-30 09:33:43 +0000
+++ b/lisp/ChangeLog 2014-05-30 17:06:53 +0000
@@ -1,3 +1,8 @@
+2014-05-30 Alan Mackenzie <address@hidden>
+
+ Guard (looking-at "\\s!") from XEmacs.
+ * progmodes/cc-engine.el (c-state-pp-to-literal): add guard form.
+
2014-05-30 Ken Olum <address@hidden> (tiny change)
* mail/rmail.el (rmail-delete-forward, rmail-delete-backward): The
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2014-02-02 16:28:52 +0000
+++ b/lisp/progmodes/cc-engine.el 2014-05-30 17:06:53 +0000
@@ -2219,7 +2219,8 @@
((and (not not-in-delimiter) ; inside a comment starter
(not (bobp))
(progn (backward-char)
- (and (not (looking-at "\\s!"))
+ (and (not (and (memq 'category-properties c-emacs-features)
+ (looking-at "\\s!")))
(looking-at c-comment-start-regexp))))
(setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++)
co-st (point))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117206: Guard (looking-at "\\s!") from XEmacs.,
Alan Mackenzie <=