Merge branch 'trunk' into xwidget

Conflicts:
	src/Makefile.in
	src/keyboard.c
	src/termhooks.h

1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 47ba16ade7f..719289765a3 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -507,7 +507,10 @@ This is for project include paths and spp source files."
      (lambda (F)
        (let* ((expfile (ede-expand-filename root F))
               (table (when expfile
-                       (semanticdb-file-table-object expfile)))
+                       ;; Disable EDE init on preprocessor file load
+                       ;; otherwise we recurse, cause errs, etc.
+                       (let ((ede-constructing t))
+                         (semanticdb-file-table-object expfile))))
               )
          (cond
           ((not (file-exists-p expfile))