diff options
| -rw-r--r-- | leim/ChangeLog | 2 | ||||
| -rw-r--r-- | leim/Makefile.in | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/Makefile.in | 16 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 2ebda357d21..a9b9bfd1bc4 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,7 +1,7 @@ 2013-05-25 Eli Zaretskii <eliz@gnu.org> * Makefile.in (leim-list.el, check-declare): Replace - reveal-filename with unmsys--filename. + reveal-filename with unmsys--file-name. 2013-05-16 Eli Zaretskii <eliz@gnu.org> diff --git a/leim/Makefile.in b/leim/Makefile.in index 8c067a90de0..5edf1665af7 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 \".\" (unmsys--filename \"${srcdir}\"))" ; \ + --eval "(update-leim-list-file \".\" (unmsys--file-name \"${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 (unmsys--filename "$(srcdir)"))' + --eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))' diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9eaf71aad4..8130d3e585e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,6 @@ 2013-05-25 Eli Zaretskii <eliz@gnu.org> - * subr.el (unmsys--filename): Renamed from reveal-filename. + * subr.el (unmsys--file-name): Renamed from reveal-filename. * Makefile.in (custom-deps, finder-data, autoloads) ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el) diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 741f785429d..4884213daeb 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 (unmsys--filename "$(lisp)/cus-load.el"))' -f custom-make-dependencies $$wins + $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(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 (unmsys--filename "$(lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins + $(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(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 (unmsys--filename "$(lisp)/loaddefs.el"))' -f batch-update-autoloads $$wins + $(emacs) -l autoload --eval '(setq generated-autoload-file (unmsys--file-name "$(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 (unmsys--filename \"$@\"))" \ + --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \ --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 (unmsys--filename \"$@\"))" \ + --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \ --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 (unmsys--filename \"$@\"))" \ + --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \ --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 (unmsys--filename \"$@\"))" \ + --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \ --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 (unmsys--filename \"$@\"))" \ + --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) diff --git a/lisp/subr.el b/lisp/subr.el index 97564875067..23684f02b87 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4697,7 +4697,7 @@ 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 unmsys--filename (file) +(defun unmsys--file-name (file) "Produce the canonical file name for FILE from its MSYS form. On systems other than MS-Windows, just returns FILE. |