summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic/ia.el
diff options
context:
space:
mode:
authorDavid Engster <dengste@eml.cc>2014-01-13 21:04:08 +0100
committerDavid Engster <dengste@eml.cc>2014-01-13 21:04:08 +0100
commit0aa9ec078e7ae5b3c9fdbb0a5e61513bec6aeed2 (patch)
treeb7bb23027a7b0129b4c13363c38f8a79b7b669a3 /lisp/cedet/semantic/ia.el
parent76a0368a4f45fccd6e1eae9b98453fc7fd4f44ad (diff)
downloademacs-0aa9ec078e7ae5b3c9fdbb0a5e61513bec6aeed2.tar.gz
Merge bug fixes from CEDET upstream.
* semantic/analyze/refs.el (semantic-analyze-refs-impl): Fix Typo in a doc string. * semantic/ia.el (semantic-ia-complete-symbol): Ignore case if prefix is all lower case. (semantic-ia-fast-jump): Push mark before jumping to an include file. * semantic/complete.el (semantic-displayor-point-position): Calculate if the toolbar is on the left when calculating point position.
Diffstat (limited to 'lisp/cedet/semantic/ia.el')
-rw-r--r--lisp/cedet/semantic/ia.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index f11d34d9ed7..10e84880ab6 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -123,7 +123,8 @@ Completion options are calculated with `semantic-analyze-possible-completions'."
;; the smart completion engine sometimes fails.
(semantic-complete-symbol))
;; Use try completion to seek a common substring.
- (let ((tc (try-completion (or pre "") syms)))
+ (let* ((completion-ignore-case (string= (downcase pre) pre))
+ (tc (try-completion (or pre "") syms)))
(if (and (stringp tc) (not (string= tc (or pre ""))))
(let ((tok (semantic-find-first-tag-by-name
tc syms)))
@@ -376,6 +377,13 @@ origin of the code at point."
((semantic-tag-of-class-p (semantic-current-tag) 'include)
;; Just borrow this cool fcn.
(require 'semantic/decorate/include)
+
+ ;; Push the mark, so you can pop global mark back, or
+ ;; use semantic-mru-bookmark mode to do so.
+ (push-mark)
+ (when (fboundp 'push-tag-mark)
+ (push-tag-mark))
+
(semantic-decoration-include-visit)
)