aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2013-05-25 19:05:19 +0300
committerEli Zaretskii2013-05-25 19:05:19 +0300
commitbc1dd793bd596a61522441facf118447221d38b2 (patch)
treea236eef3dea109ffbe4076701645b973865d23ed /lisp
parent6799bb2634354c06b863be027971eac0cdb04283 (diff)
downloademacs-bc1dd793bd596a61522441facf118447221d38b2.tar.gz
emacs-bc1dd793bd596a61522441facf118447221d38b2.zip
Rename unmsys--filename to unmsys--file-name.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/Makefile.in16
-rw-r--r--lisp/subr.el2
3 files changed, 10 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9eaf71aad4..8130d3e585e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
12013-05-25 Eli Zaretskii <eliz@gnu.org> 12013-05-25 Eli Zaretskii <eliz@gnu.org>
2 2
3 * subr.el (unmsys--filename): Renamed from reveal-filename. 3 * subr.el (unmsys--file-name): Renamed from reveal-filename.
4 4
5 * Makefile.in (custom-deps, finder-data, autoloads) 5 * Makefile.in (custom-deps, finder-data, autoloads)
6 ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el) 6 ($(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:
164custom-deps: doit 164custom-deps: doit
165 cd $(lisp); $(setwins_almost); \ 165 cd $(lisp); $(setwins_almost); \
166 echo Directories: $$wins; \ 166 echo Directories: $$wins; \
167 $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file (unmsys--filename "$(lisp)/cus-load.el"))' -f custom-make-dependencies $$wins 167 $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(lisp)/cus-load.el"))' -f custom-make-dependencies $$wins
168 168
169$(lisp)/finder-inf.el: 169$(lisp)/finder-inf.el:
170 $(MAKE) $(MFLAGS) finder-data 170 $(MAKE) $(MFLAGS) finder-data
171finder-data: doit 171finder-data: doit
172 cd $(lisp); $(setwins_almost); \ 172 cd $(lisp); $(setwins_almost); \
173 echo Directories: $$wins; \ 173 echo Directories: $$wins; \
174 $(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--filename "$(lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins 174 $(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins
175 175
176# The chmod +w is to handle env var CVSREAD=1. 176# The chmod +w is to handle env var CVSREAD=1.
177autoloads: $(LOADDEFS) doit 177autoloads: $(LOADDEFS) doit
178 cd $(lisp) && chmod +w $(AUTOGEN_VCS) 178 cd $(lisp) && chmod +w $(AUTOGEN_VCS)
179 cd $(lisp); $(setwins_almost); \ 179 cd $(lisp); $(setwins_almost); \
180 echo Directories: $$wins; \ 180 echo Directories: $$wins; \
181 $(emacs) -l autoload --eval '(setq generated-autoload-file (unmsys--filename "$(lisp)/loaddefs.el"))' -f batch-update-autoloads $$wins 181 $(emacs) -l autoload --eval '(setq generated-autoload-file (unmsys--file-name "$(lisp)/loaddefs.el"))' -f batch-update-autoloads $$wins
182 182
183# This is required by the bootstrap-emacs target in ../src/Makefile, so 183# This is required by the bootstrap-emacs target in ../src/Makefile, so
184# we know that if we have an emacs executable, we also have a subdirs.el. 184# 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
373$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) 373$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
374 $(emacs) -l autoload \ 374 $(emacs) -l autoload \
375 --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ 375 --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
376 --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \ 376 --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \
377 --eval "(setq make-backup-files nil)" \ 377 --eval "(setq make-backup-files nil)" \
378 -f batch-update-autoloads $(MH_E_DIR) 378 -f batch-update-autoloads $(MH_E_DIR)
379 379
@@ -391,7 +391,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \
391$(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) 391$(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
392 $(emacs) -l autoload \ 392 $(emacs) -l autoload \
393 --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ 393 --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
394 --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \ 394 --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \
395 --eval "(setq make-backup-files nil)" \ 395 --eval "(setq make-backup-files nil)" \
396 -f batch-update-autoloads $(TRAMP_DIR) 396 -f batch-update-autoloads $(TRAMP_DIR)
397 397
@@ -413,21 +413,21 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \
413$(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC) 413$(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
414 $(emacs) -l autoload \ 414 $(emacs) -l autoload \
415 --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ 415 --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
416 --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \ 416 --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \
417 --eval "(setq make-backup-files nil)" \ 417 --eval "(setq make-backup-files nil)" \
418 -f batch-update-autoloads $(CAL_DIR) 418 -f batch-update-autoloads $(CAL_DIR)
419 419
420$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) 420$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
421 $(emacs) -l autoload \ 421 $(emacs) -l autoload \
422 --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ 422 --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
423 --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \ 423 --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \
424 --eval "(setq make-backup-files nil)" \ 424 --eval "(setq make-backup-files nil)" \
425 -f batch-update-autoloads $(CAL_DIR) 425 -f batch-update-autoloads $(CAL_DIR)
426 426
427$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) 427$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
428 $(emacs) -l autoload \ 428 $(emacs) -l autoload \
429 --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ 429 --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
430 --eval "(setq generated-autoload-file (unmsys--filename \"$@\"))" \ 430 --eval "(setq generated-autoload-file (unmsys--file-name \"$@\"))" \
431 --eval "(setq make-backup-files nil)" \ 431 --eval "(setq make-backup-files nil)" \
432 -f batch-update-autoloads $(CAL_DIR) 432 -f batch-update-autoloads $(CAL_DIR)
433 433
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."
4697 4697
4698;; This is used in lisp/Makefile.in and in leim/Makefile.in to 4698;; This is used in lisp/Makefile.in and in leim/Makefile.in to
4699;; generate file names for autoloads, custom-deps, and finder-data. 4699;; generate file names for autoloads, custom-deps, and finder-data.
4700(defun unmsys--filename (file) 4700(defun unmsys--file-name (file)
4701 "Produce the canonical file name for FILE from its MSYS form. 4701 "Produce the canonical file name for FILE from its MSYS form.
4702 4702
4703On systems other than MS-Windows, just returns FILE. 4703On systems other than MS-Windows, just returns FILE.