[Emacs-diffs] /srv/bzr/emacs/trunk r112414: * lisp/cedet/semantic/complete.el

[David Engster]

------------------------------------------------------------
revno: 112414
committer: David Engster <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-27 23:45:37 +0200
message:
  * lisp/cedet/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).
modified:
  lisp/cedet/ChangeLog
  lisp/cedet/semantic/complete.el

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-03-26 02:49:05 +0000
+++ b/lisp/cedet/ChangeLog      2013-04-27 21:45:37 +0000
@@ -1,3 +1,11 @@
+2013-04-27  David Engster  <address@hidden>
+
+       * 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  <address@hidden>
 
        * semantic/senator.el (senator-copy-tag-to-register): Move

=== modified file 'lisp/cedet/semantic/complete.el'
--- a/lisp/cedet/semantic/complete.el   2013-03-21 22:11:03 +0000
+++ b/lisp/cedet/semantic/complete.el   2013-04-27 21:45:37 +0000
@@ -988,14 +988,17 @@
   "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)))))