mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)

Browse source 
(etags-tags-included-tables): Call `convert-standard-filename' on
the file names contained in TAGS so that windows Emacs can handle
TAGS files created by cygwin ctags.
This commit is contained in:
Sam Steingold 2011-07-20 12:45:00 -04:00
parent 59f1b89494
commit bfa4f1909c
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/progmodes/etags.el
View file

@ -1260,11 +1260,11 @@ buffer-local values of tags table format variables."
(defun etags-file-of-tag (&optional relative) ; Doc string?
(save-excursion
(re-search-backward "\f\n\\([^\n]+\\),[0-9]*\n")
(let ((str (buffer-substring (match-beginning 1) (match-end 1))))
(let ((str (convert-standard-filename
(buffer-substring (match-beginning 1) (match-end 1)))))
(if relative
str
(expand-file-name str
(file-truename default-directory))))))
(expand-file-name str (file-truename default-directory))))))
(defun etags-tags-completion-table () ; Doc string?
@ -1545,7 +1545,9 @@ hits the start of file."
(end-of-line)
(skip-chars-backward "^," beg)
(or (looking-at "include$")
(setq files (cons (buffer-substring beg (1- (point))) files))))
(push (convert-standard-filename
(buffer-substring beg (1- (point))))
files)))
(nreverse files)))
(defun etags-tags-included-tables () ; Doc string?
@ -1556,10 +1558,11 @@ hits the start of file."
(setq beg (point))
(end-of-line)
(skip-chars-backward "^," beg)
(if (looking-at "include$")
;; Expand in the default-directory of the tags table buffer.
(setq files (cons (expand-file-name (buffer-substring beg (1- (point))))
files))))
(when (looking-at "include$")
;; Expand in the default-directory of the tags table buffer.
(push (expand-file-name (convert-standard-filename
(buffer-substring beg (1- (point)))))
files)))
(nreverse files)))
;; Empty tags file support.