summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/makefile.w32-in4
2 files changed, 11 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 379136ee0a6..43f98adbef9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,16 @@
+2004-10-30 Stefan <monnier@iro.umontreal.ca>
+
+ * makefile.w32-in (custom-deps, autoloads): Fix *-hooks -> *-hook.
+
2004-10-30 Juri Linkov <juri@jurta.org>
* help.el (function-called-at-point):
- * help-fns.el (variable-at-point): read -> intern.
+ * help-fns.el (variable-at-point): Read -> intern.
2004-10-30 Simon Josefsson <jas@extundo.com>
- * progmodes/autoconf.el (autoconf-font-lock-keywords): Recognize
- AS_* too.
+ * progmodes/autoconf.el (autoconf-font-lock-keywords):
+ Recognize AS_* too.
2004-10-29 Simon Josefsson <jas@extundo.com>
@@ -75,8 +79,8 @@
2004-10-28 Kenichi Handa <handa@m17n.org>
- * international/utf-8.el (utf-translate-cjk-charsets): Add
- katakana-jisx0201.
+ * international/utf-8.el (utf-translate-cjk-charsets):
+ Add katakana-jisx0201.
* international/subst-jis.el: Add data for JISX0201.
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index b2694bc2b78..76a63a78b52 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -170,7 +170,7 @@ cus-load.el:
touch $@
custom-deps: cus-load.el doit
@echo Directories: $(WINS)
- -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hooks nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
+ -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
finder-data: doit
@echo Directories: $(WINS)
@@ -220,7 +220,7 @@ loaddefs.el-CMD:
autoloads: loaddefs.el doit
@echo Directories: $(WINS)
$(emacs) -l autoload \
- --eval $(ARGQUOTE)(setq find-file-hooks nil \
+ --eval $(ARGQUOTE)(setq find-file-hook nil \
find-file-suppress-same-file-warnings t \
generated-autoload-file \
$(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \