[Emacs-diffs] /srv/bzr/emacs/trunk r112730: Rename reveal-filename into unmsys--filename.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112730
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-05-25 10:19:50 +0300
message:
  Rename reveal-filename into unmsys--filename.
  
   lisp/subr.el (unmsys--filename): Renamed from reveal-filename.
   lisp/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.
  
   leim/Makefile.in (leim-list.el, check-declare): Replace
   reveal-filename with unmsys--filename.
modified:
  leim/ChangeLog
  leim/Makefile.in
  lisp/ChangeLog
  lisp/Makefile.in
  lisp/subr.el

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2013-05-16 12:48:54 +0000
+++ b/leim/ChangeLog    2013-05-25 07:19:50 +0000
@@ -1,3 +1,8 @@
+2013-05-25  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (leim-list.el, check-declare): Replace
+       reveal-filename with unmsys--filename.
+
 2013-05-16  Eli Zaretskii  <address@hidden>
 
        * Makefile.in (leim-list.el, check-declare): Use reveal-filename.

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2013-04-20 18:34:44 +0000
+++ b/leim/Makefile.in  2013-05-25 07:19:50 +0000
@@ -140,7 +140,7 @@
            --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 @@
 
 check-declare:
        $(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \
-         --eval '(check-declare-directory (reveal-filename "$(srcdir)"))'
+         --eval '(check-declare-directory (unmsys--filename "$(srcdir)"))'

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-25 03:08:04 +0000
+++ b/lisp/ChangeLog    2013-05-25 07:19:50 +0000
@@ -1,3 +1,12 @@
+2013-05-25  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/lisp.el (lisp-completion-at-point): Don't use

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2013-05-01 17:47:50 +0000
+++ b/lisp/Makefile.in  2013-05-25 07:19:50 +0000
@@ -164,21 +164,21 @@
 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_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 
\"address@hidden"))" \
+          --eval "(setq generated-autoload-file (unmsys--filename 
\"address@hidden"))" \
           --eval "(setq make-backup-files nil)" \
           -f batch-update-autoloads $(MH_E_DIR)
 
@@ -391,7 +391,7 @@
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
        $(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
-          --eval "(setq generated-autoload-file (reveal-filename 
\"address@hidden"))" \
+          --eval "(setq generated-autoload-file (unmsys--filename 
\"address@hidden"))" \
           --eval "(setq make-backup-files nil)" \
           -f batch-update-autoloads $(TRAMP_DIR)
 
@@ -413,21 +413,21 @@
 $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
        $(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
-          --eval "(setq generated-autoload-file (reveal-filename 
\"address@hidden"))" \
+          --eval "(setq generated-autoload-file (unmsys--filename 
\"address@hidden"))" \
           --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 
\"address@hidden"))" \
+          --eval "(setq generated-autoload-file (unmsys--filename 
\"address@hidden"))" \
           --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 
\"address@hidden"))" \
+          --eval "(setq generated-autoload-file (unmsys--filename 
\"address@hidden"))" \
           --eval "(setq make-backup-files nil)" \
           -f batch-update-autoloads $(CAL_DIR)
 

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2013-05-17 02:43:41 +0000
+++ b/lisp/subr.el      2013-05-25 07:19:50 +0000
@@ -4697,14 +4697,14 @@
 
 ;; 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))))