aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in7
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0e38047bda..a60628403f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -41,6 +41,9 @@
41 * Makefile.in (bootstrap-prepare): When copying from 41 * Makefile.in (bootstrap-prepare): When copying from
42 ldefs-boot.el, make sure loaddefs.el is writeable. 42 ldefs-boot.el, make sure loaddefs.el is writeable.
43 43
44 (bootstrap-prepare): Make $(lisp)/ps-print.el
45 and $(lisp)/emacs-lisp/cl-loaddefs.el writable, as well.
46
442007-07-05 Dan Nicolaescu <dann@ics.uci.edu> 472007-07-05 Dan Nicolaescu <dann@ics.uci.edu>
45 48
46 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the 49 * vc-hg.el (vc-hg-internal-status): Inline in `vc-hg-state', the
@@ -146,7 +149,7 @@
1462007-07-01 Sean O'Rourke <sorourke@cs.ucsd.edu> (tiny change) 1492007-07-01 Sean O'Rourke <sorourke@cs.ucsd.edu> (tiny change)
147 150
148 * complete.el (partial-completion-mode): Remove advice of 151 * complete.el (partial-completion-mode): Remove advice of
149 read-file-name-internal. 152 read-file-name-internal.
150 (PC-do-completion): Rebind minibuffer-completion-table. 153 (PC-do-completion): Rebind minibuffer-completion-table.
151 (PC-read-file-name-internal): New function doing what 154 (PC-read-file-name-internal): New function doing what
152 read-file-name-internal advice did. 155 read-file-name-internal advice did.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 3f56538e84e..8d407860a7c 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -275,14 +275,19 @@ $(lisp)/mh-e/mh-loaddefs.el: $(lisp)/subdirs.el $(MH_E_SRC)
275# an up-to-date copy of loaddefs.el that is uncorrupted by 275# an up-to-date copy of loaddefs.el that is uncorrupted by
276# local changes. (Because loaddefs.el is an automatically generated 276# local changes. (Because loaddefs.el is an automatically generated
277# file, we don't want to store it in the source repository). 277# file, we don't want to store it in the source repository).
278#
279# The chmod +w is to handle env var CVSREAD=1. Files named
280# are identified by being the value of `generated-autoload-file'.
278 281
279bootstrap-prepare: 282bootstrap-prepare:
280 if test -x $(EMACS); then \ 283 if test -x $(EMACS); then \
281 $(MAKE) $(MFLAGS) autoloads; \ 284 $(MAKE) $(MFLAGS) autoloads; \
282 else \ 285 else \
283 cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \ 286 cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
284 chmod +w $(lisp)/loaddefs.el; \
285 fi 287 fi
288 chmod +w $(lisp)/loaddefs.el \
289 $(lisp)/ps-print.el \
290 $(lisp)/emacs-lisp/cl-loaddefs.el
286 291
287maintainer-clean: distclean 292maintainer-clean: distclean
288 cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL) 293 cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)