[Emacs-diffs] trunk r116014: Merge bugfixes from CEDET upstream.

[David Engster]

------------------------------------------------------------
revno: 116014 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: David Engster <address@hidden>
branch nick: trunk
timestamp: Mon 2014-01-13 21:09:40 +0100
message:
  Merge bugfixes from CEDET upstream.
modified:
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/semantic/analyze/refs.el 
refs.el-20091113204419-o5vbwnq5f7feedwu-11242
  lisp/cedet/semantic/complete.el 
complete.el-20091113204419-o5vbwnq5f7feedwu-11255
  lisp/cedet/semantic/ia.el      ia.el-20091113204419-o5vbwnq5f7feedwu-11284

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2014-01-11 03:55:50 +0000
+++ b/lisp/cedet/ChangeLog      2014-01-13 20:04:08 +0000
@@ -1,3 +1,15 @@
+2014-01-13  Eric Ludlam  <address@hidden>
+
+       * 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  <address@hidden>
 
        Spelling fixes.

=== modified file 'lisp/cedet/semantic/analyze/refs.el'
--- a/lisp/cedet/semantic/analyze/refs.el       2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/semantic/analyze/refs.el       2014-01-13 20:04:08 +0000
@@ -109,7 +109,7 @@
        )
     (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))

=== modified file 'lisp/cedet/semantic/complete.el'
--- a/lisp/cedet/semantic/complete.el   2014-01-06 06:25:30 +0000
+++ b/lisp/cedet/semantic/complete.el   2014-01-13 20:04:08 +0000
@@ -1718,9 +1718,14 @@
   "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))))

=== modified file 'lisp/cedet/semantic/ia.el'
--- a/lisp/cedet/semantic/ia.el 2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/semantic/ia.el 2014-01-13 20:04:08 +0000
@@ -123,7 +123,8 @@
              ;; 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 @@
      ((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)
       )