2 files changed, 18 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b138d78a070..d96ad569543 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-20  Sam Steingold  <sds@gnu.org>
+
+        * 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  <larsi@gnus.org>
 
         * proced.el (proced-update): Revert yesterday's bug#1779 patch,
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index da073ceb258..a3300077909 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -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.