From 9155e80d790aa289f0613ebb3e6d6ba647127bc9 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Fri, 30 May 2014 17:06:53 +0000 Subject: [PATCH] Guard (looking-at "\\s!") from XEmacs. progmodes/cc-engine.el (c-state-pp-to-literal): add guard form. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/cc-engine.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eeca63a1bc9..9e1ccb26270 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-05-30 Alan Mackenzie + + Guard (looking-at "\\s!") from XEmacs. + * progmodes/cc-engine.el (c-state-pp-to-literal): add guard form. + 2014-05-30 Ken Olum (tiny change) * mail/rmail.el (rmail-delete-forward, rmail-delete-backward): The diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index f86e4b2c48a..6b406b0d89c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2219,7 +2219,8 @@ comment at the start of cc-engine.el for more info." ((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)) -- 2.39.2