changeset 108758:2903660f846b

Merge from mainline.

--- a/.bzrignore	Sun May 23 23:03:20 2010 +0000
+++ b/.bzrignore	Mon May 24 22:47:09 2010 +0000
@@ -68,3 +68,4 @@
 conftest*
 confdefs.h
 core
+lib-src/stamp-*

--- a/ChangeLog	Sun May 23 23:03:20 2010 +0000
+++ b/ChangeLog	Mon May 24 22:47:09 2010 +0000
@@ -1,3 +1,8 @@
[phone]  Romain Francoise  <[e-mail]>
+
+	* make-dist: Look for version in src/emacs.c.
+	Use lisp/subr.el rather than lisp/version.el for location check.
+
 2010-05-21  Glenn Morris  <[e-mail]>
 
 	* configure.in (MKDEPDIR): Parallel build tweak.

--- a/etc/TODO	Sun May 23 23:03:20 2010 +0000
+++ b/etc/TODO	Mon May 24 22:47:09 2010 +0000
@@ -181,7 +181,14 @@
 http://lists.gnu.org/archive/html/emacs-devel/2008-08/msg00456.html
 
 * Important features:
-
+** Extended text-properties (to make overlays "obsolete")
+*** Several text-property planes
+This would get us rid of font-lock-face property (and I'd be happy to
+get rid of char-property-alias-alist as well) since font-lock would
+simply use the `face' property in the `font-lock' plane.
+Each property would come with an Elisp merge-function.  The merge
+would be performed in add-text-properties.
+*** zero-width text-properties.
 ** Having tabs above a window to switch buffers in it.
 
 ** "Perspectives" are named persistent window configurations.  We have

--- a/make-dist	Sun May 23 23:03:20 2010 +0000
+++ b/make-dist	Mon May 24 22:47:09 2010 +0000
@@ -121,8 +121,8 @@
 done
 
 ### Make sure we're running in the right place.
-if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
-  echo "${progname}: Can't find \`src/lisp.h' and \`lisp/version.el'." >&2
+if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then
+  echo "${progname}: Can't find \`src/lisp.h' and \`lisp/subr.el'." >&2
   echo "${progname} must be run in the top directory of the Emacs" >&2
   echo "distribution tree.  cd to that directory and try again." >&2
   exit 1
@@ -150,12 +150,12 @@
 fi
 
 ### Find out which version of Emacs this is.
-shortversion=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
+shortversion=`grep 'char emacs_version' src/emacs.c \
 	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
-version=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
+version=`grep 'char emacs_version' src/emacs.c \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if [ ! "${version}" ]; then
-  echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" >&2
+  echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
   exit 1
 fi
 

--- a/src/ChangeLog	Sun May 23 23:03:20 2010 +0000
+++ b/src/ChangeLog	Mon May 24 22:47:09 2010 +0000
@@ -1,3 +1,8 @@
[phone]  Stefan Monnier  <[e-mail]>
+
+	* process.c (Fmake_network_process): Set :host to nil if it's not used.
+	Suggested by Masatake YAMATO <[e-mail]>.
+
 2010-05-23  Eli Zaretskii  <[e-mail]>
 
 	* dispextern.h (init_iterator): Sync prototype with changed
@@ -15,11 +20,11 @@
 	* xdisp.c (display_line): Compare IT_CHARPOS with the position in
 	row->start.pos, rather than with MATRIX_ROW_START_CHARPOS.
 	(cursor_row_p): Use row->end.pos rather than MATRIX_ROW_END_CHARPOS.
-	(try_window_reusing_current_matrix, try_window_id): Use
-	ROW->minpos rather than ROW->start.pos.
+	(try_window_reusing_current_matrix, try_window_id):
+	Use ROW->minpos rather than ROW->start.pos.
 	(init_from_display_pos, init_iterator): Use EMACS_INT for
 	character and byte positions.
-	(find_row_edges): Renamed from find_row_end.  Accept additional
+	(find_row_edges): Rename from find_row_end.  Accept additional
 	arguments for minimum and maximum buffer positions seen by
 	display_line for this row.  Don't use iterator to find the
 	position following the maximum one; instead, increment the

--- a/src/process.c	Sun May 23 23:03:20 2010 +0000
+++ b/src/process.c	Mon May 24 22:47:09 2010 +0000
@@ -3347,11 +3347,25 @@
   /* :service SERVICE -- string, integer (port number), or t (random port).  */
   service = Fplist_get (contact, QCservice);
 
+  /* :host HOST -- hostname, ip address, or 'local for localhost.  */
+  host = Fplist_get (contact, QChost);
+  if (!NILP (host))
+    {
+      if (EQ (host, Qlocal))
+	host = build_string ("localhost");
+      CHECK_STRING (host);
+    }
+
 #ifdef HAVE_LOCAL_SOCKETS
   if (family == AF_LOCAL)
     {
-      /* Host is not used.  */
-      host = Qnil;
+      if (!NILP (host))
+	{
+	  message (":family local ignores the :host \"%s\" property",
+		   SDATA (host));
+	  contact = Fplist_put (contact, QChost, Qnil);
+	  host = Qnil;
+	}
       CHECK_STRING (service);
       bzero (&address_un, sizeof address_un);
       address_un.sun_family = AF_LOCAL;
@@ -3362,15 +3376,6 @@
     }
 #endif
 
-  /* :host HOST -- hostname, ip address, or 'local for localhost.  */
-  host = Fplist_get (contact, QChost);
-  if (!NILP (host))
-    {
-      if (EQ (host, Qlocal))
-	host = build_string ("localhost");
-      CHECK_STRING (host);
-    }
-
   /* Slow down polling to every ten seconds.
      Some kernels have a bug which causes retrying connect to fail
      after a connect.  Polling can interfere with gethostbyname too.  */