[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d0dc74a: CC Mode: correct incorrect invocation of p
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] master d0dc74a: CC Mode: correct incorrect invocation of parse-partial-sexp. |
Date: |
Thu, 14 Jul 2016 12:44:57 +0000 (UTC) |
branch: master
commit d0dc74a3a8bc59df3ca88810710d1234a9a08920
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>
CC Mode: correct incorrect invocation of parse-partial-sexp.
Fixes bug #23944.
* lisp/progmodes/cc-engine.el (c-literal-limits): make the sixth argument of
an invocation of parse-partial-sexp 'syntax-table, not the fourth.
---
lisp/progmodes/cc-engine.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 8648bec..51d278f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2326,7 +2326,7 @@ comment at the start of cc-engine.el for more info."
((nth 7 s) 'c++)
(t 'c)))
(list s ty (nth 8 s)))
-
+
((and (not not-in-delimiter) ; inside a comment starter
(not (bobp))
(progn (backward-char)
@@ -2335,12 +2335,12 @@ comment at the start of cc-engine.el for more info."
(looking-at c-comment-start-regexp))))
(setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++))
(list s ty (point)))
-
+
(t (list s)))))))
(defun c-state-full-pp-to-literal (here &optional not-in-delimiter)
;; This function will supersede c-state-pp-to-literal.
- ;;
+ ;;
;; Do a parse-partial-sexp from a position in the buffer before HERE which
;; isn't in a literal, and return information about HERE, either:
;; (STATE TYPE (BEG . END)) if HERE is in a literal; or
@@ -4821,8 +4821,9 @@ comment at the start of cc-engine.el for more info."
(when (or (nth 3 s) (nth 4 s))
(cons (nth 8 s)
(progn (parse-partial-sexp (point) (point-max)
- nil 'syntax-table
- s)
+ nil nil
+ s
+ 'syntax-table)
(point)))))
(let ((pp-to-lit (c-state-full-pp-to-literal pos not-in-delimiter)))
(car (cddr pp-to-lit))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d0dc74a: CC Mode: correct incorrect invocation of parse-partial-sexp.,
Alan Mackenzie <=