[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog register.el cedet/semantic...
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog register.el cedet/semantic... |
Date: |
Sun, 15 Nov 2009 23:54:26 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/11/15 23:54:25
Modified files:
lisp : ChangeLog register.el
lisp/cedet/semantic: senator.el
Log message:
* register.el (jump-to-register, insert-register): Handle Semantic
tags. From commented-out advice in semantic/senator.el.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16641&r2=1.16642
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/register.el?cvsroot=emacs&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/senator.el?cvsroot=emacs&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16641
retrieving revision 1.16642
diff -u -b -r1.16641 -r1.16642
--- ChangeLog 15 Nov 2009 20:28:58 -0000 1.16641
+++ ChangeLog 15 Nov 2009 23:54:21 -0000 1.16642
@@ -1,3 +1,8 @@
+2009-11-15 Chong Yidong <address@hidden>
+
+ * register.el (jump-to-register, insert-register): Handle Semantic
+ tags. From commented-out advice in semantic/senator.el.
+
2009-11-15 Dan Nicolaescu <address@hidden>
* vc.el (vc-log-show-limit): New variable.
Index: register.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/register.el,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- register.el 20 Sep 2009 18:22:41 -0000 1.65
+++ register.el 15 Nov 2009 23:54:25 -0000 1.66
@@ -28,6 +28,10 @@
;; 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)
@@ -135,6 +139,11 @@
(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")))))
@@ -284,6 +293,10 @@
(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)))
Index: cedet/semantic/senator.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/senator.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/semantic/senator.el 3 Nov 2009 21:45:33 -0000 1.5
+++ cedet/semantic/senator.el 15 Nov 2009 23:54:25 -0000 1.6
@@ -857,26 +857,6 @@
;; [(control ?,)]
;; 'senator-isearch-toggle-semantic-mode)
-;; (defadvice insert-register (around senator activate)
-;; "Insert contents of register REGISTER as a tag.
-;; If senator is not active, use the original mechanism."
-;; (let ((val (get-register (ad-get-arg 0))))
-;; (if (and senator-minor-mode (interactive-p)
-;; (semantic-foreign-tag-p val))
-;; (semantic-insert-foreign-tag val)
-;; ad-do-it)))
-
-;; (defadvice jump-to-register (around senator activate)
-;; "Insert contents of register REGISTER as a tag.
-;; If senator is not active, use the original mechanism."
-;; (let ((val (get-register (ad-get-arg 0))))
-;; (if (and senator-minor-mode (interactive-p)
-;; (semantic-foreign-tag-p val))
-;; (progn
-;; (switch-to-buffer (semantic-tag-buffer val))
-;; (goto-char (semantic-tag-start val)))
-;; ad-do-it)))
-
(provide 'semantic/senator)
;; Local variables:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog register.el cedet/semantic...,
Chong Yidong <=