* progmodes/etags.el (tag-find-file-of-tag): Renamed from

find-file-of-tag to avoid name space pollution.
(tag-find-file-of-tag-noselect): Likewise.
(etags-list-tags, etags-tags-apropos): Use
tag-find-file-of-tag instead of find-file-of-tag.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 402bc2ebb29686850d0bfac43785d0b0bf3594a2..4ccfec2dc0e4f5333703948d129f26495cf57347 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-06  Masatake YAMATO  <jet@gyve.org>
+
+       * progmodes/etags.el (tag-find-file-of-tag): Renamed from 
+       find-file-of-tag to avoid name space pollution.
+       (tag-find-file-of-tag-noselect): Likewise.
+       (etags-list-tags, etags-tags-apropos): Use 
+       tag-find-file-of-tag instead of find-file-of-tag.
+       
 2003-04-06  Masatake YAMATO  <jet@gyve.org>
 
        * info.el (Info-goto-emacs-command-node): If command 

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index f1f5e36c51e20ec5f578b8cc70137623313227eb..8dfe8b6683a64d697345cd2dc4199065a6a84290 100644 (file)
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1149,7 +1149,7 @@ where they were found."
 
       ;; 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)
+      (tag-find-file-of-tag-noselect file)
       (widen)
       (push-mark)
       (funcall goto-func tag-info)
@@ -1157,7 +1157,7 @@ where they were found."
       ;; Return the buffer where the tag was found.
       (current-buffer))))
 
-(defun find-file-of-tag-noselect (file)
+(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,8 +1191,8 @@ where they were found."
          (error "File %s not found" file))
       (set-buffer the-buffer))))
 
-(defun find-file-of-tag (file)
-  (let ((buf (find-file-of-tag-noselect file)))
+(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,7 +1391,7 @@ where they were found."
                          '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))
+                                     (tag-find-file-of-tag (button-get button 'file-path))
                                      (widen)
                                      (funcall goto-func tag-info)))
                          'face 'tags-tag-face
@@ -1475,7 +1475,7 @@ where they were found."
                                '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))
+                                           (tag-find-file-of-tag (button-get button 'file-path))
                                            (widen)
                                            (funcall goto-func tag-info)))
                                'face 'tags-tag-face
@@ -1485,7 +1485,7 @@ where they were found."
          (make-text-button pt (point)
                            'file-path file-path
                            'action (lambda (button)
-                                     (find-file-of-tag (button-get button 'file-path))
+                                     (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)))