HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* progmodes/sh-script.el (sh-mode): Use define-derived-mode.
[bpt/emacs.git]
/
lisp
/
register.el
diff --git
a/lisp/register.el
b/lisp/register.el
index
4144bba
..
1a6d84d
100644
(file)
--- a/
lisp/register.el
+++ b/
lisp/register.el
@@
-1,7
+1,7
@@
;;; register.el --- register commands for Emacs
;; Copyright (C) 1985, 1993, 1994, 2001, 2002, 2003, 2004,
;;; register.el --- register commands for Emacs
;; Copyright (C) 1985, 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009
, 2010
Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal
@@
-28,6
+28,10
@@
;; pieces of buffer state to named variables. The entry points are
;; documented in the Emacs user's manual.
;; pieces of buffer state to named variables. The entry points are
;; documented in the Emacs user's manual.
+(declare-function semantic-insert-foreign-tag "semantic/tag" (foreign-tag))
+(declare-function semantic-tag-buffer "semantic/tag" (tag))
+(declare-function semantic-tag-start "semantic/tag" (tag))
+
;;; Global key bindings
(define-key ctl-x-r-map "\C-@" 'point-to-register)
;;; Global key bindings
(define-key ctl-x-r-map "\C-@" 'point-to-register)
@@
-135,6
+139,11
@@
delete any existing frames that the frame configuration doesn't mention.
(error "Register access aborted"))
(find-file (nth 1 val))
(goto-char (nth 2 val)))
(error "Register access aborted"))
(find-file (nth 1 val))
(goto-char (nth 2 val)))
+ ((and (fboundp 'semantic-foreign-tag-p)
+ semantic-mode
+ (semantic-foreign-tag-p val))
+ (switch-to-buffer (semantic-tag-buffer val))
+ (goto-char (semantic-tag-start val)))
(t
(error "Register doesn't contain a buffer position or configuration")))))
(t
(error "Register doesn't contain a buffer position or configuration")))))
@@
-284,6
+293,10
@@
Interactively, second arg is non-nil if prefix arg is supplied."
(princ val (current-buffer)))
((and (markerp val) (marker-position val))
(princ (marker-position val) (current-buffer)))
(princ val (current-buffer)))
((and (markerp val) (marker-position val))
(princ (marker-position val) (current-buffer)))
+ ((and (fboundp 'semantic-foreign-tag-p)
+ semantic-mode
+ (semantic-foreign-tag-p val))
+ (semantic-insert-foreign-tag val))
(t
(error "Register does not contain text"))))
(if (not arg) (exchange-point-and-mark)))
(t
(error "Register does not contain text"))))
(if (not arg) (exchange-point-and-mark)))