# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1163416105 0
# Node ID c7e2654270f7374d182bd87e4127290406dc3ce0
# Parent  5c5306b4cb4998287354ade243ad4382ec8cc3d3
*** empty log message ***

diff -r 5c5306b4cb49 -r c7e2654270f7 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Mon Nov 13 11:07:47 2006 +0000
+++ b/lib-src/ChangeLog	Mon Nov 13 11:08:25 2006 +0000
@@ -1,3 +1,13 @@
+2006-11-13  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (emacsclient): Depend also on emacsclientw.exe.
+	($(BLD)/emacsclientw.exe): New target.
+	(install): Install emacsclientw.exe.
+	($(BLD)/cvtmail.$(O), $(BLD)/emacstool.$(O)): Remove obsolete targets.
+	(ECLIENT_CFLAGS): Remove redundant flags.
+
+	* emacsclient.c [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
+
 2006-11-13  Jason Rumney  <jasonr@gnu.org>
 
 	* makefile.w32-in ($(BLD)/emacsclient.$(O)): Use CFLAGS.
diff -r 5c5306b4cb49 -r c7e2654270f7 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 13 11:07:47 2006 +0000
+++ b/lisp/ChangeLog	Mon Nov 13 11:08:25 2006 +0000
@@ -1,12 +1,17 @@
+2006-11-13  Juanma Barranquero  <lekktu@gmail.com>
+
+	* ediff.el (ediff-revision):
+	* files.el (set-visited-file-name):
+	* mail/rmailout.el (rmail-output-body-to-file):
+	Use `format', not `message', in `y-or-n-p' call.
+
 2006-11-13  Carsten Dominik  <dominik@science.uva.nl>
 
-	* textmodes/org.el (org-metaleft): Call `org-outdent-item' on
-	bullets.
+	* textmodes/org.el (org-metaleft): Call `org-outdent-item' on bullets.
 	(org-metaright): Call `org-indent-item' on bullets.
 	(org-timestamp-change): Set `org-last-changed-timestamp'.
 	(org-current-line): Make sure (bolp) returns correct result.
-	(org-agenda-change-all-lines): Make sure highlighting TODO always
-	works.
+	(org-agenda-change-all-lines): Make sure highlighting TODO always works.
 
 2006-11-12  Richard Stallman  <rms@gnu.org>