5 files changed, 27 insertions, 13 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index f86fb23eb5e..2ebda357d21 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (leim-list.el, check-declare): Replace
+        reveal-filename with unmsys--filename.
+
 2013-05-16  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (leim-list.el, check-declare): Use reveal-filename.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index a660d9b56e0..8c067a90de0 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -140,7 +140,7 @@ leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
             --eval "(update-leim-list-file \".\")" ; \
         else \
           ${RUN_EMACS} -l ${buildlisppath}/international/quail \
-            --eval "(update-leim-list-file \".\" (reveal-filename \"${srcdir}\"))" ; \
+            --eval "(update-leim-list-file \".\" (unmsys--filename \"${srcdir}\"))" ; \
         fi
         sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
@@ -199,4 +199,4 @@ extraclean: maintainer-clean
 
 check-declare:
         $(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \
-          --eval '(check-declare-directory (reveal-filename "$(srcdir)"))'
+          --eval '(check-declare-directory (unmsys--filename "$(srcdir)"))'
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efa6f06cbb1..f9eaf71aad4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2013-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (unmsys--filename): Renamed from reveal-filename.
+
+        * Makefile.in (custom-deps, finder-data, autoloads)
+        ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el)
+        ($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el)
+        ($(CAL_DIR)/hol-loaddefs.el): All users changed.
+
 2013-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 138ad5abfa6..741f785429d 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -164,21 +164,21 @@ $(lisp)/cus-load.el:
 custom-deps: doit
         cd $(lisp); $(setwins_almost); \
         echo Directories: $$wins; \
-        $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file (reveal-filename "$(lisp)/cus-load.el"))' -f custom-make-dependencies $$wins
+        $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file (unmsys--filename "$(lisp)/cus-load.el"))' -f custom-make-dependencies $$wins
 
 $(lisp)/finder-inf.el:
         $(MAKE) $(MFLAGS) finder-data
 finder-data: doit
         cd $(lisp); $(setwins_almost); \
         echo Directories: $$wins; \
-        $(emacs) -l finder --eval '(setq generated-finder-keywords-file (reveal-filename "$(lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins
+        $(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--filename "$(lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins
 
 # The chmod +w is to handle env var CVSREAD=1.
 autoloads: $(LOADDEFS) doit
         cd $(lisp) && chmod +w $(AUTOGEN_VCS)
         cd $(lisp); $(setwins_almost); \
         echo Directories: $$wins; \
-        $(emacs) -l autoload --eval '(setq generated-autoload-file (reveal-filename "$(lisp)/loaddefs.el"))' -f batch-update-autoloads $$wins
+        $(emacs) -l autoload --eval '(setq generated-autoload-file (unmsys--filename "$(lisp)/loaddefs.el"))' -f batch-update-autoloads $$wins
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so
 # we know that if we have an emacs executable, we also have a subdirs.el.
@@ -373,7 +373,7 @@ mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
 $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
-           --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \
+           --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(MH_E_DIR)
 
@@ -391,7 +391,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el    $(TRAMP_DIR)/tramp-adb.el	\
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
-           --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \
+           --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(TRAMP_DIR)
 
@@ -413,21 +413,21 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el  \
 $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
-           --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \
+           --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
-           --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \
+           --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
-           --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \
+           --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(CAL_DIR)
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 9b2c8157ac8..97564875067 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4697,14 +4697,14 @@ as alpha versions."
 
 ;; This is used in lisp/Makefile.in and in leim/Makefile.in to
 ;; generate file names for autoloads, custom-deps, and finder-data.
-(defun reveal-filename (file)
-  "Produce the real file name for FILE.
+(defun unmsys--filename (file)
+  "Produce the canonical file name for FILE from its MSYS form.
 
 On systems other than MS-Windows, just returns FILE.
 On MS-Windows, converts /d/foo/bar form of file names
 passed by MSYS Make into d:/foo/bar that Emacs can grok.
 
-This function is called from lisp/Makefile."
+This function is called from lisp/Makefile and leim/Makefile."
   (when (and (eq system-type 'windows-nt)
              (string-match "\\`/[a-zA-Z]/" file))
     (setq file (concat (substring file 1 2) ":" (substring file 2))))