3 files changed, 20 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70d34fb7117..3f603a6ad64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-16  Feng Li <fengli@gmail.com> (tiny change)
+
+        * calc/calc-ext.el (math-defintegral-2): Remove nested backquote.
+
+2011-08-16  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-state-cache-non-literal-place):
+        Correct, to avoid the inside of macros.
+
 2011-08-16  Richard Stallman  <rms@gnu.org>
 
         * epa-mail.el: Handle GnuPG group definitions.
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 6e05cdb07e5..8b816665d97 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -2887,7 +2887,7 @@ If X is not an error form, return 1."
   (cons 'progn
         (mapcar #'(lambda (func)
                     `(put ',func 'math-integral-2
-                          `(nconc
+                          (nconc
                             (get ',func 'math-integral-2)
                             (list #'(lambda (u v) ,@code)))))
                 (if (symbolp funcs) (list funcs) funcs))))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0236a2be296..0d88f85d263 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2130,13 +2130,17 @@ comment at the start of cc-engine.el for more info."
       pos))
 
 (defsubst c-state-cache-non-literal-place (pos state)
-  ;; Return a position outside of a string/comment at or before POS.
+  ;; Return a position outside of a string/comment/macro at or before POS.
   ;; STATE is the parse-partial-sexp state at POS.
-  (if (or (nth 3 state)                 ; in a string?
-          (nth 4 state))                ; in a comment?
-      (nth 8 state)
-    pos))
-
+  (let ((res (if (or (nth 3 state)      ; in a string?
+                     (nth 4 state))     ; in a comment?
+                 (nth 8 state)
+               pos)))
+    (save-excursion
+      (goto-char res)
+      (if (c-beginning-of-macro)
+          (point)
+        res))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Stuff to do with point-min, and coping with any literal there.