Merge: current_column: Now returns EMACS_INT, fixing some iftc

[gnu-emacs] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index eb65bb7a60fe37f807800aa8c59b1c5964c95047..0e3d54408fd27e3e9e1fc3054dcc179f65330120 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -443,9 +443,9 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 TRAMP_SRC = $(lisp)/net/tramp.el  $(lisp)/net/tramp-cache.el  \
        $(lisp)/net/tramp-cmds.el $(lisp)/net/tramp-compat.el \
        $(lisp)/net/tramp-ftp.el  $(lisp)/net/tramp-gvfs.el   \
-       $(lisp)/net/tramp-gw.el   $(lisp)/net/tramp-imap.el   \
-       $(lisp)/net/tramp-sh.el   $(lisp)/net/tramp-smb.el    \
-       $(lisp)/net/tramp-uu.el   $(lisp)/net/trampver.el
+       $(lisp)/net/tramp-gw.el   $(lisp)/net/tramp-sh.el     \
+       $(lisp)/net/tramp-smb.el  $(lisp)/net/tramp-uu.el     \
+       $(lisp)/net/trampver.el
 
 $(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC)
        "$(EMACS)" $(EMACSOPT) \