[Emacs-diffs] /srv/bzr/emacs/trunk r112136: * lisp/register.el: Move semantic tag handling back to

[Leo Liu]

------------------------------------------------------------
revno: 112136
fixes bug: http://debbugs.gnu.org/14052
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 10:49:05 +0800
message:
  * lisp/register.el: Move semantic tag handling back to
  cedet/semantic/senator.el. 
  
  * lisp/cedet/semantic/senator.el (senator-copy-tag-to-register): Move
  register handling logic from register.el.  (Bug#14052)
modified:
  lisp/ChangeLog
  lisp/cedet/ChangeLog
  lisp/cedet/semantic/senator.el
  lisp/register.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-26 00:42:08 +0000
+++ b/lisp/ChangeLog    2013-03-26 02:49:05 +0000
@@ -1,3 +1,8 @@
+2013-03-26  Leo Liu  <address@hidden>
+
+       * register.el: Move semantic tag handling back to
+       cedet/semantic/senator.el.  (Bug#14052)
+
 2013-03-26  Stefan Monnier  <address@hidden>
 
        * eshell/em-prompt.el (eshell-emit-prompt): Make sure we can't insert

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-03-21 22:11:03 +0000
+++ b/lisp/cedet/ChangeLog      2013-03-26 02:49:05 +0000
@@ -1,3 +1,8 @@
+2013-03-26  Leo Liu  <address@hidden>
+
+       * semantic/senator.el (senator-copy-tag-to-register): Move
+       register handling logic from register.el.  (Bug#14052)
+
 2013-03-21  Eric Ludlam  <address@hidden>
 
        * semantic.el (navigate-menu): Yank Tag :enable. Make sure

=== modified file 'lisp/cedet/semantic/senator.el'
--- a/lisp/cedet/semantic/senator.el    2013-01-01 09:11:05 +0000
+++ b/lisp/cedet/semantic/senator.el    2013-03-26 02:49:05 +0000
@@ -727,7 +727,13 @@
   (semantic-fetch-tags)
   (let ((ft (semantic-obtain-foreign-tag)))
     (when ft
-      (set-register register ft)
+      (set-register
+       register (registerv-make
+                 ft
+                 :insert-func #'semantic-insert-foreign-tag
+                 :jump-func (lambda (v)
+                              (switch-to-buffer (semantic-tag-buffer v))
+                              (goto-char (semantic-tag-start v)))))
       (if kill-flag
           (kill-region (semantic-tag-start ft)
                        (semantic-tag-end ft))))))

=== modified file 'lisp/register.el'
--- a/lisp/register.el  2013-01-01 09:11:05 +0000
+++ b/lisp/register.el  2013-03-26 02:49:05 +0000
@@ -31,10 +31,6 @@
 
 (eval-when-compile (require 'cl-lib))
 
-(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))
-
 ;;; Code:
 
 (cl-defstruct
@@ -174,11 +170,6 @@
          (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")))))
 
@@ -349,10 +340,6 @@
       (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)))