[Emacs-diffs] /srv/bzr/emacs/trunk r105295: * lisp/progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)

[Sam Steingold]

------------------------------------------------------------
revno: 105295
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-20 12:45:00 -0400
message:
  * lisp/progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)
  (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.
modified:
  lisp/ChangeLog
  lisp/progmodes/etags.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-20 09:53:51 +0000
+++ b/lisp/ChangeLog    2011-07-20 16:45:00 +0000
@@ -1,3 +1,10 @@
+2011-07-20  Sam Steingold  <address@hidden>
+
+       * progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)
+       (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.
+
 2011-07-20  Lars Magne Ingebrigtsen  <address@hidden>
 
        * proced.el (proced-update): Revert yesterday's bug#1779 patch,

=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el   2011-07-17 02:21:43 +0000
+++ b/lisp/progmodes/etags.el   2011-07-20 16:45:00 +0000
@@ -1260,11 +1260,11 @@
 (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 @@
       (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 @@
       (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.