Merge from trunk.

2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 8b914e8843e..944a9e1a02a 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-27  David Engster  <deng@randomsample.de>
+
+        * semantic/complete.el
+        (semantic-collector-calculate-completions-raw): If
+        `completionslist' is not set, refresh the cache if necessary and
+        use it for completions.  This fixes the
+        `semantic-collector-buffer-deep' collector (bug#14265).
+
 2013-03-26  Leo Liu  <sdl.web@gmail.com>
 
         * semantic/senator.el (senator-copy-tag-to-register): Move
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 1c2ddf45c9d..6c2b97a677a 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -988,14 +988,17 @@ Calculate the cache if there isn't one."
   "Calculate the completions for prefix from completionlist.
 Output must be in semanticdb Find result format."
   ;; Must output in semanticdb format
+  (unless completionlist
+    (setq completionlist
+          (or (oref obj cache)
+              (semantic-collector-calculate-cache obj))))
   (let ((table (with-current-buffer (oref obj buffer)
                  semanticdb-current-table))
         (result (semantic-find-tags-for-completion
                  prefix
                  ;; To do this kind of search with a pre-built completion
                  ;; list, we need to strip it first.
-                 (semanticdb-strip-find-results completionlist)))
-        )
+                 (semanticdb-strip-find-results completionlist))))
     (if result
         (list (cons table result)))))