diff options
Diffstat (limited to 'lisp/cedet/semantic/util.el')
| -rw-r--r-- | lisp/cedet/semantic/util.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el index 6b1cc61198c..6cae8a8bdf9 100644 --- a/lisp/cedet/semantic/util.el +++ b/lisp/cedet/semantic/util.el @@ -328,8 +328,8 @@ If TAG is not specified, use the tag at point." (if (semantic-tag-p tok) (if (semantic-tag-with-position-p tok) (let ((o (semantic-tag-overlay tok))) - (if (and (semantic-overlay-p o) - (not (semantic-overlay-live-p o))) + (if (and (overlayp o) + (not (overlay-buffer o))) (let ((debug-on-error t)) (error "Tag %s is invalid!" (semantic-tag-name tok))) ;; else, tag is OK. @@ -348,7 +348,7 @@ NOTFIRST indicates that this was not the first call in the recursive use." (interactive) (if (and (not cache) (not over) (not notfirst)) (setq cache semantic--buffer-cache - over (semantic-overlays-in (point-min) (point-max)))) + over (overlays-in (point-min) (point-max)))) (while cache (let ((chil (semantic-tag-components-with-overlays (car cache)))) (if (not (memq (semantic-tag-overlay (car cache)) over)) @@ -361,8 +361,8 @@ NOTFIRST indicates that this was not the first call in the recursive use." ;; Strip out all overlays which aren't semantic overlays (let ((o nil)) (while over - (when (and (semantic-overlay-get (car over) 'semantic) - (not (eq (semantic-overlay-get (car over) 'semantic) + (when (and (overlay-get (car over) 'semantic) + (not (eq (overlay-get (car over) 'semantic) 'unmatched))) (setq o (cons (car over) o))) (setq over (cdr over))) |