* lisp/minibuffer.el (completions-format): Change default from nil to

[gnu-emacs] / lib-src / makefile.w32-in

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 0c4870f2fff34da60076c67293dc63e22a98a008..cad3b838208d282880a6293e3e60536281a85c09 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION                = 23.1.96
+VERSION                = 24.0.50
 
 LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
@@ -195,8 +195,8 @@ OTHER_PLATFORM_SUPPORT = \
        $(lispsource)term/pc-win.elc \
        $(lispsource)x-dnd.elc \
        $(lispsource)term/x-win.elc \
-       ${lispsource}emacs-lisp/easymenu.elc \
-       ${lispsource}term/ns-win.elc
+       $(lispsource)emacs-lisp/easymenu.elc \
+       $(lispsource)term/ns-win.elc
 
 
 lisp1= \
@@ -279,8 +279,8 @@ lisp2 = \
        $(lispsource)textmodes/text-mode.elc \
        $(lispsource)emacs-lisp/timer.elc \
        $(lispsource)jka-cmpr-hook.elc \
-       $(lispsource)vc-hooks.elc \
-       $(lispsource)ediff-hook.elc \
+       $(lispsource)vc/vc-hooks.elc \
+       $(lispsource)vc/ediff-hook.elc \
        $(lispsource)epa-hook.elc \
        $(TOOLTIP_SUPPORT) \
        $(WINNT_SUPPORT) \