aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/makefile.w32-in2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c07c9627d1c..17dc012fdab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-12-11 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (compile4-SH): Fix a typo that caused term
4 subdirectory be skipped.
5
12012-12-11 Glenn Morris <rgm@gnu.org> 62012-12-11 Glenn Morris <rgm@gnu.org>
2 7
3 * net/rcirc.el (rcirc-urls, rcirc-condition-filter): Doc fixes. 8 * net/rcirc.el (rcirc-urls, rcirc-condition-filter): Doc fixes.
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index cb2cba466f6..b6beb6b292a 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -387,7 +387,7 @@ compile3-SH: autoloads compile0-SH
387 done 387 done
388 388
389compile4-SH: autoloads compile0-SH 389compile4-SH: autoloads compile0-SH
390 for dir in $(WINS_BASIC4) $(WINS_CEDET) terms obsolete; do \ 390 for dir in $(WINS_BASIC4) $(WINS_CEDET) term obsolete; do \
391 for el in $$dir/*.el; do \ 391 for el in $$dir/*.el; do \
392 if test -f $$el; \ 392 if test -f $$el; \
393 then \ 393 then \