summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog8
-rw-r--r--lib-src/emacsclient.c4
-rw-r--r--lib-src/makefile.w32-in4
3 files changed, 12 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 14b668d2d24..2c178ba8da9 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-01 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * makefile.w32-in (obj): Remove sunfns.o.
+
+2007-10-28 Juanma Barranquero <lekktu@gmail.com>
+
+ * makefile.w32-in (obj): Remove abbrev.o.
+
2007-10-26 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c: Add a wrapper for getenv so it also checks the
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 99e0dc3ce3d..acc322d638a 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -298,8 +298,6 @@ get_current_dir_name ()
}
#endif
-/* Message functions. */
-
#ifdef WINDOWSNT
#define REG_ROOT "SOFTWARE\\GNU\\Emacs"
@@ -440,6 +438,8 @@ w32_execvp (path, argv)
#endif /* WINDOWSNT */
+/* Display a normal or error message.
+ On Windows, use a message box if compiled as a Windows app. */
void
message (int is_error, char *message, ...)
{
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 190a293984c..8e01c9dfeaf 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -142,7 +142,7 @@ $(BLD)/ctags.$(O): ctags.c
# make-docfile blindly replaces .o with .c anyway. Keep .o in this list
# as it is required by code in doc.c.
#
-obj = sunfns.o dosfns.o msdos.o \
+obj = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
@@ -157,7 +157,7 @@ obj = sunfns.o dosfns.o msdos.o \
cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
alloc.o data.o doc.o editfns.o callint.o \
eval.o floatfns.o fns.o print.o lread.o \
- abbrev.o syntax.o bytecode.o \
+ syntax.o bytecode.o \
process.o callproc.o \
region-cache.o sound.o atimer.o \
doprnt.o strftime.o intervals.o textprop.o composite.o md5.o