[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/etags.el
From: |
Masatake YAMATO |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/etags.el |
Date: |
Sat, 05 Apr 2003 13:19:31 -0500 |
Index: emacs/lisp/progmodes/etags.el
diff -c emacs/lisp/progmodes/etags.el:1.173 emacs/lisp/progmodes/etags.el:1.174
*** emacs/lisp/progmodes/etags.el:1.173 Fri Apr 4 15:01:36 2003
--- emacs/lisp/progmodes/etags.el Sat Apr 5 13:19:30 2003
***************
*** 1149,1155 ****
;; Get the local value in the tags table buffer before switching
buffers.
(setq goto-func goto-tag-location-function)
! (find-file-of-tag-noselect file)
(widen)
(push-mark)
(funcall goto-func tag-info)
--- 1149,1155 ----
;; Get the local value in the tags table buffer before switching
buffers.
(setq goto-func goto-tag-location-function)
! (tag-find-file-of-tag-noselect file)
(widen)
(push-mark)
(funcall goto-func tag-info)
***************
*** 1157,1163 ****
;; Return the buffer where the tag was found.
(current-buffer))))
! (defun find-file-of-tag-noselect (file)
;; Find the right line in the specified file.
;; If we are interested in compressed-files,
;; we search files with extensions.
--- 1157,1163 ----
;; Return the buffer where the tag was found.
(current-buffer))))
! (defun tag-find-file-of-tag-noselect (file)
;; Find the right line in the specified file.
;; If we are interested in compressed-files,
;; we search files with extensions.
***************
*** 1191,1198 ****
(error "File %s not found" file))
(set-buffer the-buffer))))
! (defun find-file-of-tag (file)
! (let ((buf (find-file-of-tag-noselect file)))
(condition-case nil
(switch-to-buffer buf)
(error (pop-to-buffer buf)))))
--- 1191,1198 ----
(error "File %s not found" file))
(set-buffer the-buffer))))
! (defun tag-find-file-of-tag (file)
! (let ((buf (tag-find-file-of-tag-noselect file)))
(condition-case nil
(switch-to-buffer buf)
(error (pop-to-buffer buf)))))
***************
*** 1391,1397 ****
'action (lambda (button)
(let ((tag-info (button-get button
'tag-info))
(goto-func (button-get button
'goto-func)))
! (find-file-of-tag (button-get button
'file-path))
(widen)
(funcall goto-func tag-info)))
'face 'tags-tag-face
--- 1391,1397 ----
'action (lambda (button)
(let ((tag-info (button-get button
'tag-info))
(goto-func (button-get button
'goto-func)))
! (tag-find-file-of-tag (button-get button
'file-path))
(widen)
(funcall goto-func tag-info)))
'face 'tags-tag-face
***************
*** 1475,1481 ****
'action (lambda (button)
(let ((tag-info (button-get button
'tag-info))
(goto-func (button-get button
'goto-func)))
! (find-file-of-tag (button-get
button 'file-path))
(widen)
(funcall goto-func tag-info)))
'face 'tags-tag-face
--- 1475,1481 ----
'action (lambda (button)
(let ((tag-info (button-get button
'tag-info))
(goto-func (button-get button
'goto-func)))
! (tag-find-file-of-tag (button-get
button 'file-path))
(widen)
(funcall goto-func tag-info)))
'face 'tags-tag-face
***************
*** 1485,1491 ****
(make-text-button pt (point)
'file-path file-path
'action (lambda (button)
! (find-file-of-tag (button-get button
'file-path))
;; Get the local value in the tags table
;; buffer before switching buffers.
(goto-char (point-min)))
--- 1485,1491 ----
(make-text-button pt (point)
'file-path file-path
'action (lambda (button)
! (tag-find-file-of-tag (button-get button
'file-path))
;; Get the local value in the tags table
;; buffer before switching buffers.
(goto-char (point-min)))