From f412a5677093d3be2df074fccdfb7b431e38be10 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Mon, 3 Nov 2008 19:03:36 +0000 Subject: [PATCH] (c-forward-label): Fix for QT macros. --- lisp/progmodes/cc-engine.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 43052386408..c45913e1827 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5954,7 +5954,8 @@ comment at the start of cc-engine.el for more info." label-end qt-symbol-idx macro-start ; if we're in one. - label-type) + label-type + kwd) (cond ;; "case" or "default" (Doesn't apply to AWK). ((looking-at c-label-kwds-regexp) @@ -6107,12 +6108,13 @@ comment at the start of cc-engine.el for more info." ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon. (forward-char) (setq label-type - (if (string= "signals" ; Special QT macro - (buffer-substring-no-properties start label-end)) + (if (or (string= "signals" ; Special QT macro + (setq kwd (buffer-substring-no-properties start label-end))) + (string= "Q_SIGNALS" kwd)) 'qt-1kwd-colon 'goto-target))) ((and qt-symbol-idx - (search-forward-regexp "\\=slots\\>" limit t) + (search-forward-regexp "\\=\\(slots\\|Q_SLOTS\\)\\>" limit t) (progn (c-forward-syntactic-ws limit) (looking-at ":\\([^:]\\|\\'\\)"))) ; A single colon (forward-char) -- 2.11.4.GIT