Merge branch master of git.sv.gnu.org:/srv/git/emacs.

[gnu-emacs] / lisp / cedet / semantic / ia.el

diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 10e84880ab62bdf560b2aba73add1edd1c818d26..2216fa9e96472e6fdfdcf65e5d4571eeacbea8b8 100644 (file)
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -1,6 +1,6 @@
 ;;; semantic/ia.el --- Interactive Analysis functions
 
-;;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
+;;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -150,45 +150,47 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
   :group 'semantic
   :type semantic-format-tag-custom-list)
 
-;; Disabled - see http://debbugs.gnu.org/14522
-;; ;;;###autoload
-;; (defun semantic-ia-complete-symbol-menu (point)
-;;   "Complete the current symbol via a menu based at POINT.
-;; Completion options are calculated with `semantic-analyze-possible-completions'."
-;;   (interactive "d")
-;;   (require 'imenu)
-;;   (let* ((a (semantic-analyze-current-context point))
-;;      (syms (semantic-analyze-possible-completions a))
-;;      )
-;;     ;; Complete this symbol.
-;;     (if (not syms)
-;;     (progn
-;;       (message "No smart completions found.  Trying Senator.")
-;;       (when (semantic-analyze-context-p a)
-;;         ;; This is a quick way of getting a nice completion list
-;;         ;; in the menu if the regular context mechanism fails.
-;;         (senator-completion-menu-popup)))
-;;
-;;       (let* ((menu
-;;           (mapcar
-;;            (lambda (tag)
-;;              (cons
-;;               (funcall semantic-ia-completion-menu-format-tag-function tag)
-;;               (vector tag)))
-;;            syms))
-;;          (ans
-;;           (imenu--mouse-menu
-;;            ;; XEmacs needs that the menu has at least 2 items.  So,
-;;            ;; include a nil item that will be ignored by imenu.
-;;            (cons nil menu)
-;;            (senator-completion-menu-point-as-event)
-;;            "Completions")))
-;;     (when ans
-;;       (if (not (semantic-tag-p ans))
-;;           (setq ans (aref (cdr ans) 0)))
-;;       (delete-region (car (oref a bounds)) (cdr (oref a bounds)))
-;;       (semantic-ia-insert-tag ans))
-;;     ))))
+;;;###autoload
+(defun semantic-ia-complete-symbol-menu (point)
+  "Complete the current symbol via a menu based at POINT.
+Completion options are calculated with `semantic-analyze-possible-completions'."
+  (interactive "d")
+  (require 'imenu)
+  (let* ((a (semantic-analyze-current-context point))
+        (syms (semantic-analyze-possible-completions a))
+        )
+    ;; Complete this symbol.
+    (if (not syms)
+       (progn
+         (message "No smart completions found.")
+          ;; Disabled - see http://debbugs.gnu.org/14522
+         ;; (message "No smart completions found.  Trying Senator.")
+         ;; (when (semantic-analyze-context-p a)
+         ;;   ;; This is a quick way of getting a nice completion list
+         ;;   ;; in the menu if the regular context mechanism fails.
+         ;;   (senator-completion-menu-popup))
+          )
+
+      (let* ((menu
+             (mapcar
+              (lambda (tag)
+                (cons
+                 (funcall semantic-ia-completion-menu-format-tag-function tag)
+                 (vector tag)))
+              syms))
+            (ans
+             (imenu--mouse-menu
+              ;; XEmacs needs that the menu has at least 2 items.  So,
+              ;; include a nil item that will be ignored by imenu.
+              (cons nil menu)
+              `(down-mouse-1 ,(posn-at-point))
+              "Completions")))
+       (when ans
+         (if (not (semantic-tag-p ans))
+             (setq ans (aref (cdr ans) 0)))
+         (delete-region (car (oref a bounds)) (cdr (oref a bounds)))
+         (semantic-ia-insert-tag ans))
+       ))))
 
 ;;; Completions Tip
 ;;