From: David Engster <dengste@eml.cc>
Date: Mon, 13 Jan 2014 20:04:08 +0000 (+0100)
Subject: Merge bug fixes from CEDET upstream.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/0aa9ec078e7ae5b3c9fdbb0a5e61513bec6aeed2

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.
---

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 2dc68d484c..12914a9362 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,15 @@
+2014-01-13  Eric Ludlam  <zappo@gnu.org>
+
+	* 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.
+
 2014-01-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Spelling fixes.
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 69ca84023f..7a35b50e91 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -109,7 +109,7 @@ Optional argument IN-BUFFER indicates that the returned tag should be in an acti
 	)
     (semanticdb-find-result-mapc
      (lambda (T DB)
-       "Examine T in the database DB, and sont it."
+       "Examine T in the database DB, and sort it."
        (let* ((ans (semanticdb-normalize-one-tag DB T))
 	      (aT (cdr ans))
 	      (aDB (car ans))
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index a5e9bd1787..ff9bc25b45 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1718,9 +1718,14 @@ Display mechanism using tooltip for a list of possible completions.")
   "Return the location of POINT as positioned on the selected frame.
 Return a cons cell (X . Y)"
   (let* ((frame (selected-frame))
-	 (left (or (car-safe (cdr-safe (frame-parameter frame 'left)))
-		   (frame-parameter frame 'left)))
-         (top (or (car-safe (cdr-safe (frame-parameter frame 'top)))
+	 (toolbarleft
+	  (if (eq (cdr (assoc 'tool-bar-position default-frame-alist)) 'left)
+	      (tool-bar-pixel-width)
+	    0))
+	 (left (+ (or (car-safe (cdr-safe (frame-parameter frame 'left)))
+		      (frame-parameter frame 'left))
+		  toolbarleft))
+	 (top (or (car-safe (cdr-safe (frame-parameter frame 'top)))
 		  (frame-parameter frame 'top)))
 	 (point-pix-pos (posn-x-y (posn-at-point)))
 	 (edges (window-inside-pixel-edges (selected-window))))
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index f11d34d9ed..10e84880ab 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)
       )