# HG changeset patch
# User Katsumi Yamaoka <katsumi@flagship2>
# Date 1274702400 0
# Node ID 1a5381cbfe12ea815a45a9b73513090112131a0e
# Parent  0aaff477ec9ffd01562607ad0d7b9e332996196b# Parent  f7bbe35cec2355702a88552cbc87d2be454cef91
Merge from mainline.

diff -r 0aaff477ec9f -r 1a5381cbfe12 ChangeLog
--- a/ChangeLog	Sun May 23 11:52:45 2010 +0000
+++ b/ChangeLog	Mon May 24 12:00:00 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-24  Romain Francoise  <romain@orebokech.com>
+
+	* 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  <rgm@gnu.org>
 
 	* configure.in (MKDEPDIR): Parallel build tweak.
diff -r 0aaff477ec9f -r 1a5381cbfe12 make-dist
--- a/make-dist	Sun May 23 11:52:45 2010 +0000
+++ b/make-dist	Mon May 24 12:00:00 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
 
diff -r 0aaff477ec9f -r 1a5381cbfe12 src/ChangeLog
--- a/src/ChangeLog	Sun May 23 11:52:45 2010 +0000
+++ b/src/ChangeLog	Mon May 24 12:00:00 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* dispextern.h (init_iterator): Sync prototype with changed
+	definition.
+
 2010-05-19  Eli Zaretskii  <eliz@gnu.org>
 
 	Redesign and reimplement bidi-aware edge positions of glyph rows.
diff -r 0aaff477ec9f -r 1a5381cbfe12 src/dispextern.h
--- a/src/dispextern.h	Sun May 23 11:52:45 2010 +0000
+++ b/src/dispextern.h	Mon May 24 12:00:00 2010 +0000
@@ -2911,8 +2911,8 @@
 void redisplay_preserve_echo_area P_ ((int));
 int set_cursor_from_row P_ ((struct window *, struct glyph_row *,
 			     struct glyph_matrix *, int, int, int, int));
-void init_iterator P_ ((struct it *, struct window *, int,
-			int, struct glyph_row *, enum face_id));
+void init_iterator P_ ((struct it *, struct window *, EMACS_INT,
+			EMACS_INT, struct glyph_row *, enum face_id));
 void init_iterator_to_row_start P_ ((struct it *, struct window *,
 				     struct glyph_row *));
 int get_next_display_element P_ ((struct it *));