summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic/senator.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cedet/semantic/senator.el')
-rw-r--r--lisp/cedet/semantic/senator.el20
1 files changed, 13 insertions, 7 deletions
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 157223ff192..544abff8dd1 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -1,9 +1,9 @@
;;; semantic/senator.el --- SEmantic NAvigaTOR
-;; Copyright (C) 2000-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
;; Author: David Ponce <david@dponce.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
;; Created: 10 Nov 2000
;; Keywords: syntax
@@ -507,7 +507,7 @@ filters in `senator-search-tag-filter-functions' remain active."
(define-overloadable-function semantic-up-reference (tag)
"Return a tag that is referred to by TAG.
A \"reference\" could be any interesting feature of TAG.
-In C++, a function may have a 'parent' which is non-local.
+In C++, a function may have a `parent' which is non-local.
If that parent which is only a reference in the function tag
is found, we can jump to it.
Some tags such as includes have other reference features.")
@@ -516,7 +516,7 @@ Some tags such as includes have other reference features.")
(defun senator-go-to-up-reference (&optional tag)
"Move up one reference from the current TAG.
A \"reference\" could be any interesting feature of TAG.
-In C++, a function may have a 'parent' which is non-local.
+In C++, a function may have a `parent' which is non-local.
If that parent which is only a reference in the function tag
is found, we can jump to it.
Some tags such as includes have other reference features."
@@ -722,8 +722,14 @@ yanked to."
(defun senator-copy-tag-to-register (register &optional kill-flag)
"Copy the current tag into REGISTER.
Optional argument KILL-FLAG will delete the text of the tag to the
-kill ring."
- (interactive "cTag to register: \nP")
+kill ring.
+
+Interactively, reads the register using `register-read-with-preview',
+if available."
+ (interactive (list (if (fboundp 'register-read-with-preview)
+ (register-read-with-preview "Tag to register: ")
+ (read-char "Tag to register: "))
+ current-prefix-arg))
(semantic-fetch-tags)
(let ((ft (semantic-obtain-foreign-tag)))
(when ft
@@ -807,7 +813,7 @@ Use a senator search function when semantic isearch mode is enabled."
(concat (if senator-isearch-semantic-mode
"senator-"
"")
- (cond (isearch-word "word-")
+ (cond (isearch-regexp-function "word-")
(isearch-regexp "re-")
(t ""))
"search-"