aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-12 23:37:39 -0700
committerGlenn Morris2013-09-12 23:37:39 -0700
commita89f3fdfa0809ce575820da4abbd2950c6b0c97a (patch)
tree6e6f4cd7982c72b9f10c123675dd79c909b09a84
parent35c3d36e0ed6c7f5104946dd966ca46d0495f640 (diff)
downloademacs-a89f3fdfa0809ce575820da4abbd2950c6b0c97a.tar.gz
emacs-a89f3fdfa0809ce575820da4abbd2950c6b0c97a.zip
* cedet/semantic/ia.el (semantic-ia-complete-symbol-menu):
Comment it out, since it cannot work. Fixes: debbugs:14522
-rw-r--r--lisp/cedet/ChangeLog5
-rw-r--r--lisp/cedet/semantic/ia.el77
2 files changed, 44 insertions, 38 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 6be1c44743a..2094523cdaa 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
12013-09-13 Glenn Morris <rgm@gnu.org>
2
3 * semantic/ia.el (semantic-ia-complete-symbol-menu):
4 Comment it out, since it cannot work. (Bug#14522)
5
12013-09-12 Glenn Morris <rgm@gnu.org> 62013-09-12 Glenn Morris <rgm@gnu.org>
2 7
3 * semantic/find.el (semantic-find-first-tag-by-name): 8 * semantic/find.el (semantic-find-first-tag-by-name):
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index d087ac6fcde..d1ff7f1d9aa 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -149,44 +149,45 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
149 :group 'semantic 149 :group 'semantic
150 :type semantic-format-tag-custom-list) 150 :type semantic-format-tag-custom-list)
151 151
152;;;###autoload 152;; Disabled - see http://debbugs.gnu.org/14522
153(defun semantic-ia-complete-symbol-menu (point) 153;; ;;;###autoload
154 "Complete the current symbol via a menu based at POINT. 154;; (defun semantic-ia-complete-symbol-menu (point)
155Completion options are calculated with `semantic-analyze-possible-completions'." 155;; "Complete the current symbol via a menu based at POINT.
156 (interactive "d") 156;; Completion options are calculated with `semantic-analyze-possible-completions'."
157 (require 'imenu) 157;; (interactive "d")
158 (let* ((a (semantic-analyze-current-context point)) 158;; (require 'imenu)
159 (syms (semantic-analyze-possible-completions a)) 159;; (let* ((a (semantic-analyze-current-context point))
160 ) 160;; (syms (semantic-analyze-possible-completions a))
161 ;; Complete this symbol. 161;; )
162 (if (not syms) 162;; ;; Complete this symbol.
163 (progn 163;; (if (not syms)
164 (message "No smart completions found. Trying Senator.") 164;; (progn
165 (when (semantic-analyze-context-p a) 165;; (message "No smart completions found. Trying Senator.")
166 ;; This is a quick way of getting a nice completion list 166;; (when (semantic-analyze-context-p a)
167 ;; in the menu if the regular context mechanism fails. 167;; ;; This is a quick way of getting a nice completion list
168 (senator-completion-menu-popup))) 168;; ;; in the menu if the regular context mechanism fails.
169 169;; (senator-completion-menu-popup)))
170 (let* ((menu 170;;
171 (mapcar 171;; (let* ((menu
172 (lambda (tag) 172;; (mapcar
173 (cons 173;; (lambda (tag)
174 (funcall semantic-ia-completion-menu-format-tag-function tag) 174;; (cons
175 (vector tag))) 175;; (funcall semantic-ia-completion-menu-format-tag-function tag)
176 syms)) 176;; (vector tag)))
177 (ans 177;; syms))
178 (imenu--mouse-menu 178;; (ans
179 ;; XEmacs needs that the menu has at least 2 items. So, 179;; (imenu--mouse-menu
180 ;; include a nil item that will be ignored by imenu. 180;; ;; XEmacs needs that the menu has at least 2 items. So,
181 (cons nil menu) 181;; ;; include a nil item that will be ignored by imenu.
182 (senator-completion-menu-point-as-event) 182;; (cons nil menu)
183 "Completions"))) 183;; (senator-completion-menu-point-as-event)
184 (when ans 184;; "Completions")))
185 (if (not (semantic-tag-p ans)) 185;; (when ans
186 (setq ans (aref (cdr ans) 0))) 186;; (if (not (semantic-tag-p ans))
187 (delete-region (car (oref a bounds)) (cdr (oref a bounds))) 187;; (setq ans (aref (cdr ans) 0)))
188 (semantic-ia-insert-tag ans)) 188;; (delete-region (car (oref a bounds)) (cdr (oref a bounds)))
189 )))) 189;; (semantic-ia-insert-tag ans))
190;; ))))
190 191
191;;; Completions Tip 192;;; Completions Tip
192;; 193;;