From f537955316db7ac17bf8334ee05b3ff8547c1009 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 27 May 2013 23:55:48 -0700 Subject: [PATCH] * cc-vars.el (c-macro-names-with-semicolon): Move definition before use. --- lisp/ChangeLog | 3 +++ lisp/progmodes/cc-vars.el | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e7b049ad9b..22e7dd46bbe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-05-28 Glenn Morris + * progmodes/cc-vars.el (c-macro-names-with-semicolon): + Move definition before use. + * play/dunnet.el (byte-compile-warnings): Don't disable them all. (dun-unix-verbs): Remove dun-zippy. (dun-zippy): Remove function. diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 66ff217c73e..f830cc7edc1 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1622,6 +1622,24 @@ names).")) ) (make-variable-buffer-local 'c-macro-with-semi-re) +(defvar c-macro-names-with-semicolon + '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") + "List of #defined symbols whose expansion ends with a semicolon. +Alternatively it can be a string, a regular expression which +matches all such symbols. + +The \"symbols\" must be syntactically valid identifiers in the +target language \(C, C++, Objective C), or \(as the case may be) +the regular expression must match only valid identifiers. + +If you change this variable's value, call the function +`c-make-macros-with-semi-re' to set the necessary internal +variables. + +Note that currently \(2008-11-04) this variable is a prototype, +and is likely to disappear or change its form soon.") +(make-variable-buffer-local 'c-macro-names-with-semicolon) + (defun c-make-macro-with-semi-re () ;; Convert `c-macro-names-with-semicolon' into the regexp ;; `c-macro-with-semi-re' (or just copy it if it's already a re). @@ -1643,24 +1661,6 @@ names).")) c-macro-names-with-semicolon: %s" c-macro-names-with-semicolon)))))) -(defvar c-macro-names-with-semicolon - '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") - "List of #defined symbols whose expansion ends with a semicolon. -Alternatively it can be a string, a regular expression which -matches all such symbols. - -The \"symbols\" must be syntactically valid identifiers in the -target language \(C, C++, Objective C), or \(as the case may be) -the regular expression must match only valid identifiers. - -If you change this variable's value, call the function -`c-make-macros-with-semi-re' to set the necessary internal -variables. - -Note that currently \(2008-11-04) this variable is a prototype, -and is likely to disappear or change its form soon.") -(make-variable-buffer-local 'c-macro-names-with-semicolon) - (defvar c-file-style nil "Variable interface for setting style via File Local Variables. In a file's Local Variable section, you can set this variable to a -- 2.39.2