Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 100451.
------------------------------------------------------------
revno: 100451
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 23:48:25 -0700
message:
  * configure.in: Comments.
diff:
=== modified file 'configure.in'
--- configure.in	2010-05-26 06:41:58 +0000
+++ configure.in	2010-05-26 06:48:25 +0000
@@ -3369,15 +3369,15 @@
 AC_SUBST(POST_EDIT_LDFLAGS)
 
 test "x$LINKER" = "x" && LINKER=ld
-## FIXME? What setting of YMF_PASS_LDFLAGS should this have?
+## FIXME? What setting of EDIT_LDFLAGS should this have?
 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"
 
 AC_SUBST(LINKER)
 
 
-## FIXME? The logic here is not precisely the same as that above
-## setting YMF_PASS_LDFLAGS.  There is no check here for a pre-defined
-## LINKER.  Should we only be setting LIB_GCC if LD ~ -nostdlib?
+## FIXME? The logic here is not precisely the same as that above.
+## There is no check here for a pre-defined LINKER.
+## Should we only be setting LIB_GCC if LD ~ -nostdlib?
 LIB_GCC=
 if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
------------------------------------------------------------
revno: 100450
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 23:41:58 -0700
message:
  Replace YMF_PASS_LDFLAGS with autoconf.
  
  * configure.in (YMF_PASS_LDFLAGS): Remove.
  (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
  * configure: Regenerate.
  
  * src/Makefile.in (YMF_PASS_LDFLAGS): Remove.
  (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
  
  * msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-05-26 03:50:16 +0000
+++ ChangeLog	2010-05-26 06:41:58 +0000
@@ -1,5 +1,8 @@
 2010-05-26  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (YMF_PASS_LDFLAGS): Remove.
+	(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
+
 	* configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS):
 	Add $GNUSTEP_LOCAL_HEADERS.
 	(LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.

=== modified file 'configure'
--- configure	2010-05-26 03:58:41 +0000
+++ configure	2010-05-26 06:41:58 +0000
@@ -818,7 +818,8 @@
 PRE_ALLOC_OBJ
 POST_ALLOC_OBJ
 LD_SWITCH_SYSTEM_TEMACS
-YMF_PASS_LDFLAGS
+PRE_EDIT_LDFLAGS
+POST_EDIT_LDFLAGS
 LINKER
 LIB_GCC
 MOUSE_SUPPORT
@@ -26655,11 +26656,9 @@
     ;;
 esac
 
-## A macro which other sections of Makefile can redefine to munge the
-## flags before they are passed to LD.  This is helpful if you have
-## redefined LD to something odd, like "gcc".
-## (The YMF prefix is a holdover from the old name "ymakefile".)
-YMF_PASS_LDFLAGS=flags
+
+PRE_EDIT_LDFLAGS=
+POST_EDIT_LDFLAGS=
 if test "x$ORDINARY_LINK" = "xyes"; then
 
   LINKER="\$(CC)"
@@ -26687,11 +26686,13 @@
   ## shell''s ``for'' construct.  Note that sane people do not have '.' in
   ## their paths, so we must use ./prefix-args.
   ## TODO either make prefix-args check ORDINARY_LINK internally,
-  ## or remove it altogether (bug#6184), removing the need for this macro.
-  YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`'
+  ## or remove it altogether (bug#6184), removing the need for this hack.
+  PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
+  POST_EDIT_LDFLAGS='`'
 fi
 
 
+
 test "x$LINKER" = "x" && LINKER=ld
 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have?
 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"

=== modified file 'configure.in'
--- configure.in	2010-05-26 03:58:41 +0000
+++ configure.in	2010-05-26 06:41:58 +0000
@@ -3335,11 +3335,9 @@
     ;;
 esac
 
-## A macro which other sections of Makefile can redefine to munge the
-## flags before they are passed to LD.  This is helpful if you have
-## redefined LD to something odd, like "gcc".
-## (The YMF prefix is a holdover from the old name "ymakefile".) 
-YMF_PASS_LDFLAGS=flags
+
+PRE_EDIT_LDFLAGS=
+POST_EDIT_LDFLAGS=
 if test "x$ORDINARY_LINK" = "xyes"; then
 
   LINKER="\$(CC)"
@@ -3363,10 +3361,12 @@
   ## shell''s ``for'' construct.  Note that sane people do not have '.' in
   ## their paths, so we must use ./prefix-args.
   ## TODO either make prefix-args check ORDINARY_LINK internally,
-  ## or remove it altogether (bug#6184), removing the need for this macro.
-  YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`'
+  ## or remove it altogether (bug#6184), removing the need for this hack.
+  PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
+  POST_EDIT_LDFLAGS='`'
 fi
-AC_SUBST(YMF_PASS_LDFLAGS)
+AC_SUBST(PRE_EDIT_LDFLAGS)
+AC_SUBST(POST_EDIT_LDFLAGS)
 
 test "x$LINKER" = "x" && LINKER=ld
 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have?

=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog	2010-05-26 03:42:07 +0000
+++ msdos/ChangeLog	2010-05-26 06:41:58 +0000
@@ -1,5 +1,7 @@
 2010-05-26  Glenn Morris  <rgm@gnu.org>
 
+	* sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
+
 	* sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
 	No longer present.
 
@@ -9,7 +11,7 @@
 
 2010-05-21  Glenn Morris  <rgm@gnu.org>
 
-	* sed1v2.inp(@ns_frag@): Edit to nothing.
+	* sed1v2.inp (@ns_frag@): Edit to nothing.
 
 	* sed1x.inp (OLDXMENU): Replace any initial value.
 	* sed1v2.inp (OLDXMENU): Edit to "nothing".

=== modified file 'msdos/sed1v2.inp'
--- msdos/sed1v2.inp	2010-05-26 03:42:07 +0000
+++ msdos/sed1v2.inp	2010-05-26 06:41:58 +0000
@@ -147,6 +147,8 @@
 s/@YMF_PASS_LDFLAGS@/flags/
 s/@deps_frag@//
 s/@ns_frag@//
+s/@PRE_EDIT_LDFLAGS@//
+s/@POST_EDIT_LDFLAGS@//
 s/bootstrap-emacs/b-emacs/
 s/bootstrap-temacs/b-temacs/
 s/bootstrap-doc/b-doc/

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-26 03:42:07 +0000
+++ src/ChangeLog	2010-05-26 06:41:58 +0000
@@ -1,5 +1,8 @@
 2010-05-26  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (YMF_PASS_LDFLAGS): Remove.
+	(temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
+
 	* Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
 	Remove.
 	(TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-05-26 03:42:07 +0000
+++ src/Makefile.in	2010-05-26 06:41:58 +0000
@@ -634,10 +634,14 @@
 buildobj.h: Makefile
 	echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@
 
+/* We cannot define variables for PRE_EDIT and POST_EDIT.
+   If !ORDINARY_LINK && !LINKER && GCC, they add a
+   \`./prefix-args -Xlinker ... \` wrapper, otherwise they are empty.
+   One alternative to this approach would be to always call prefix-args, 
+   and have it DTRT in all cases, by testing the above defines.  */
 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
-	$(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \
+	$(LD) @PRE_EDIT_LDFLAGS@ ${TEMACS_LDFLAGS} @POST_EDIT_LDFLAGS@ \
 	  ${TEMACS_LDFLAGS2} \
 	  -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
------------------------------------------------------------
revno: 100449
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 21:06:09 -0700
message:
  * lisp/emulation/edt.el (edt-load-keys): Use locate-library.
  This simplifies the code, and handles compressed .el.gz files, which
  the previous version did not.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 22:50:56 +0000
+++ lisp/ChangeLog	2010-05-26 04:06:09 +0000
@@ -1,3 +1,7 @@
+2010-05-26  Glenn Morris  <rgm@gnu.org>
+
+	* emulation/edt.el (edt-load-keys): Use locate-library.
+
 2010-05-25  Chong Yidong  <cyd@stupidchicken.com>
 
 	* log-edit.el (log-edit-strip-single-file-name): Default to nil.

=== modified file 'lisp/emulation/edt.el'
--- lisp/emulation/edt.el	2010-05-05 04:27:16 +0000
+++ lisp/emulation/edt.el	2010-05-26 04:06:09 +0000
@@ -1,7 +1,8 @@
 ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19
 
 ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
@@ -2056,40 +2057,32 @@
 
      Ack!!  You're running the Enhanced EDT Emulation without loading an
      EDT key mapping file.  To create an EDT key mapping file, run the
-     edt-mapper.el program.  It is safest to run it from an Emacs loaded
+     edt-mapper program.  It is safest to run it from an Emacs loaded
      without any of your own customizations found in your .emacs file, etc.
      The reason for this is that some user customizations confuse edt-mapper.
      You can do this by quitting Emacs and then invoking Emacs again as
      follows:
 
-          emacs -q -l edt-mapper.el
+          emacs -q -l edt-mapper
 
      [NOTE:  If you do nothing out of the ordinary in your .emacs file, and
-     the search for edt-mapper.el is successful, you can try running it now.]
+     the search for edt-mapper is successful, you can try running it now.]
 
-     The file edt-mapper.el includes these same directions on how to
+     The library edt-mapper includes these same directions on how to
      use it!  Perhaps it's lying around here someplace. \n     ")
-	 (let ((file "edt-mapper.el")
-	       (found nil)
-	       (path nil)
-	       (search-list (append (list (expand-file-name ".")) load-path)))
-	   (while (and (not found) search-list)
-	     (setq path (concat (car search-list)
-				(if (string-match "/$" (car search-list)) "" "/")
-				file))
-	     (if (and (file-exists-p path) (not (file-directory-p path)))
-		 (setq found t))
-	     (setq search-list (cdr search-list)))
-	   (cond (found
-		  (insert (format
-			   "Ah yes, there it is, in \n\n       %s \n\n" path))
-		  (if (edt-y-or-n-p "Do you want to run it now? ")
-		      (load-file path)
-		    (error "EDT Emulation not configured")))
-		 (t
-		  (insert "Nope, I can't seem to find it.  :-(\n\n")
-		  (sit-for 20)
-		  (error "EDT Emulation not configured")))))))
+         (let ((path (locate-library
+                      "edt-mapper"
+                      nil (append (list (expand-file-name ".")) load-path))))
+           (if path
+               (progn
+                 (insert (format
+                          "Ah yes, there it is, in \n\n       %s \n\n" path))
+                 (if (edt-y-or-n-p "Do you want to run it now? ")
+                     (load-file path)
+                   (error "EDT Emulation not configured")))
+             (insert "Nope, I can't seem to find it.  :-(\n\n")
+             (sit-for 20)
+             (error "EDT Emulation not configured"))))))
 
 ;;;
 ;;;  Turning the EDT Emulation on and off.
------------------------------------------------------------
revno: 100448
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 20:58:41 -0700
message:
  * configure, configure.in: Fix typo in previous.
diff:
=== modified file 'configure'
--- configure	2010-05-26 03:53:25 +0000
+++ configure	2010-05-26 03:58:41 +0000
@@ -26624,7 +26624,7 @@
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
 
-if test "$NS_IMPL_GNUSTEP=yes"; then
+if test "$NS_IMPL_GNUSTEP" = "yes"; then
   LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
 fi
 

=== modified file 'configure.in'
--- configure.in	2010-05-26 03:50:16 +0000
+++ configure.in	2010-05-26 03:58:41 +0000
@@ -3304,7 +3304,7 @@
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
 
-if test "$NS_IMPL_GNUSTEP=yes"; then
+if test "$NS_IMPL_GNUSTEP" = "yes"; then
   LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
 fi
------------------------------------------------------------
revno: 100447
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 20:53:25 -0700
message:
  Regenerate configure.
diff:
=== modified file 'configure'
--- configure	2010-05-25 03:56:27 +0000
+++ configure	2010-05-26 03:53:25 +0000
@@ -720,8 +720,6 @@
 XMKMF
 LD_SWITCH_X_SITE_AUX
 LD_SWITCH_X_SITE_AUX_RPATH
-NS_IMPL_GNUSTEP_INC
-NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
 TEMACS_LDFLAGS2
 NS_OBJ
 NS_SUPPORT
@@ -9935,8 +9933,6 @@
 HAVE_NS=no
 NS_IMPL_COCOA=no
 NS_IMPL_GNUSTEP=no
-NS_IMPL_GNUSTEP_INC=
-NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
 tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
@@ -9955,22 +9951,18 @@
      ns_appbindir=${ns_appdir}
      ns_appresdir=${ns_appdir}Resources
      ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
-          GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
-     GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
+          GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
      GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
-     ## Pull in stuff from GNUstep-make.
-     ## FIXME? Cleaner to use AC_SUBST_FILE for this?
-     NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
-GUI_LIB=gnu
-include $GNUSTEP_MAKEFILES/Additional/base.make
-include $GNUSTEP_MAKEFILES/Additional/gui.make
-shared=no
-"
-          NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread"
-     CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
-     CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
-     REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
-     LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
+          GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
+     GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
+     test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
+       GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
+     test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
+       GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
+     CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+     CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+     REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+     LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
      LIB_STANDARD=
      START_FILES=
      TEMACS_LDFLAGS2=
@@ -10162,8 +10154,6 @@
 fi
 
 
-
-
 ns_frag=/dev/null
 NS_OBJ=
 NS_SUPPORT=
@@ -26634,6 +26624,11 @@
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
 
+if test "$NS_IMPL_GNUSTEP=yes"; then
+  LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
+fi
+
+
 
 
 LINKER=
------------------------------------------------------------
revno: 100446
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 20:50:16 -0700
message:
  Add GNUSTEP_LOCAL_HEADERS/LIBRARIES to build flags.
  * configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS):
  Add $GNUSTEP_LOCAL_HEADERS.
  (LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-05-26 03:42:07 +0000
+++ ChangeLog	2010-05-26 03:50:16 +0000
@@ -1,5 +1,9 @@
 2010-05-26  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS):
+	Add $GNUSTEP_LOCAL_HEADERS.
+	(LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.
+
 	* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
 	(GNUSTEP_MAKEFILES): Remove.
 	(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS

=== modified file 'configure.in'
--- configure.in	2010-05-26 03:42:07 +0000
+++ configure.in	2010-05-26 03:50:16 +0000
@@ -1492,10 +1492,17 @@
      dnl FIXME sourcing this several times in subshells seems inefficient.
      GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
      GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
-     CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
-     CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
-     REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
-     LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
+     dnl I seemed to need these as well with GNUstep-startup 0.25.
+     GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
+     GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
+     test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
+       GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
+     test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
+       GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
+     CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+     CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+     REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+     LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
      LIB_STANDARD=
      START_FILES=
      TEMACS_LDFLAGS2=
@@ -3298,7 +3305,7 @@
 esac
 
 if test "$NS_IMPL_GNUSTEP=yes"; then
-  LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} -L${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
+  LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
 fi
 
 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
------------------------------------------------------------
revno: 100445
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 20:42:07 -0700
message:
  Remove some NS_IMPL_GNUSTEP build dead code.
  
  * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
  (GNUSTEP_MAKEFILES): Remove.
  (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
  stuff to here.
  
  * src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
  Remove.
  (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
  
  * msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
  No longer present.
  
  Comments:
  See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html.
  Nothing from gui.make was used at all in src/Makefile.in.  The only
  thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only
  set shared _after_ sourcing base.make, it was always empty.  We can
  move the remaining flags, set in configure, to the standard variable
  LD_SWITCH_SYSTEM_TEMACS.
diff:
=== modified file 'ChangeLog'
--- ChangeLog	2010-05-25 03:53:12 +0000
+++ ChangeLog	2010-05-26 03:42:07 +0000
@@ -1,3 +1,10 @@
+2010-05-26  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
+	(GNUSTEP_MAKEFILES): Remove.
+	(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
+	stuff to here.
+
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...

=== modified file 'configure.in'
--- configure.in	2010-05-25 03:53:12 +0000
+++ configure.in	2010-05-26 03:42:07 +0000
@@ -1468,8 +1468,6 @@
 HAVE_NS=no
 NS_IMPL_COCOA=no
 NS_IMPL_GNUSTEP=no
-NS_IMPL_GNUSTEP_INC=
-NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
 tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
@@ -1491,20 +1489,9 @@
      ns_appbindir=${ns_appdir}
      ns_appresdir=${ns_appdir}Resources
      ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
-     dnl FIXME sourcing this 3 times in subshells seems inefficient.
-     GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
+     dnl FIXME sourcing this several times in subshells seems inefficient.
      GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
      GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
-     ## Pull in stuff from GNUstep-make.
-     ## FIXME? Cleaner to use AC_SUBST_FILE for this?
-     NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
-GUI_LIB=gnu
-include $GNUSTEP_MAKEFILES/Additional/base.make
-include $GNUSTEP_MAKEFILES/Additional/gui.make
-shared=no
-"
-     dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes.
-     NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread"
      CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
      CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
      REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
@@ -1525,8 +1512,6 @@
     NS_HAVE_NSINTEGER=no
   fi
 fi
-AC_SUBST(NS_IMPL_GNUSTEP_INC)
-AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
 AC_SUBST(TEMACS_LDFLAGS2)
 
 ns_frag=/dev/null
@@ -3311,6 +3296,11 @@
 
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
+
+if test "$NS_IMPL_GNUSTEP=yes"; then
+  LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} -L${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
+fi
+
 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
 
 

=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog	2010-05-25 03:46:15 +0000
+++ msdos/ChangeLog	2010-05-26 03:42:07 +0000
@@ -1,3 +1,8 @@
+2010-05-26  Glenn Morris  <rgm@gnu.org>
+
+	* sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+	No longer present.
+
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
 	* sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.

=== modified file 'msdos/sed1v2.inp'
--- msdos/sed1v2.inp	2010-05-25 03:46:15 +0000
+++ msdos/sed1v2.inp	2010-05-26 03:42:07 +0000
@@ -129,8 +129,6 @@
 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
 /^@SET_MAKE@$/s/@SET_MAKE@//
-/^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@//
-/^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@//
 /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
 /^.\${libsrc}make-doc/s!>.*$!!
 /^[ 	]*$/d

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-26 01:14:51 +0000
+++ src/ChangeLog	2010-05-26 03:42:07 +0000
@@ -1,3 +1,9 @@
+2010-05-26  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+	Remove.
+	(TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+
 2010-05-26  Kenichi Handa  <handa@m17n.org>
 
 	* composite.c (composition_compute_stop_pos): Fix condition for

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-05-26 03:36:05 +0000
+++ src/Makefile.in	2010-05-26 03:42:07 +0000
@@ -111,14 +111,8 @@
 ## which are only good with temacs.
 LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
 
-## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.
-@NS_IMPL_GNUSTEP_INC@
-
-## This uses ${CONFIG_SYSTEM_LIBS} from NS_IMPL_GNUSTEP_INC.
-NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
-
 ## Flags to pass to ld only for temacs.
-TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) $(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
+TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
 
 ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
------------------------------------------------------------
revno: 100444
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2010-05-25 20:36:05 -0700
message:
  * src/Makefile.in: Fix comment typo.
diff:
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-05-25 04:25:15 +0000
+++ src/Makefile.in	2010-05-26 03:36:05 +0000
@@ -114,7 +114,7 @@
 ## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.
 @NS_IMPL_GNUSTEP_INC@
 
-## This uses ${CONFIG_SYSTEM_LIBS} from @NS_IMPL_GNUSTEP_INC@.
+## This uses ${CONFIG_SYSTEM_LIBS} from NS_IMPL_GNUSTEP_INC.
 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
 
 ## Flags to pass to ld only for temacs.
------------------------------------------------------------
revno: 100443 [merge]
committer: Kenichi Handa <handa@etlken>
branch nick: trunk
timestamp: Wed 2010-05-26 10:16:07 +0900
message:
  Fix for finding a static composition.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-25 04:25:15 +0000
+++ src/ChangeLog	2010-05-26 01:14:51 +0000
@@ -1,3 +1,8 @@
+2010-05-26  Kenichi Handa  <handa@m17n.org>
+
+	* composite.c (composition_compute_stop_pos): Fix condition for
+	backward scanning.
+
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):

=== modified file 'src/composite.c'
--- src/composite.c	2010-05-25 00:32:24 +0000
+++ src/composite.c	2010-05-26 01:14:51 +0000
@@ -1124,7 +1124,7 @@
 	    }
 	}
     }
-  else
+  else if (charpos > endpos)
     {
       /* Search backward for a pattern that may be composed and the
 	 position of (possibly) the last character of the match is
------------------------------------------------------------
revno: 100442
committer: Chong Yidong <cyd@stupidchicken.com>
branch nick: trunk
timestamp: Tue 2010-05-25 18:50:56 -0400
message:
  Rename relative filenames in ChangeLog entries according to root.
  
  * lisp/log-edit.el (log-edit-strip-single-file-name): Default to nil.
  (log-edit-changelog-entries): Doc fix.
  (log-edit-changelog-insert-entries): Args changed.  Rename
  relative filenames in ChangeLog entries.  Delete tabs.
  (log-edit-insert-changelog-entries): Reorganize return value of
  `log-edit-changelog-entries' to pass filenames to
  log-edit-changelog-insert-entries.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 19:13:41 +0000
+++ lisp/ChangeLog	2010-05-25 22:50:56 +0000
@@ -1,3 +1,13 @@
+2010-05-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* log-edit.el (log-edit-strip-single-file-name): Default to nil.
+	(log-edit-changelog-entries): Doc fix.
+	(log-edit-changelog-insert-entries): Args changed.  Rename
+	relative filenames in ChangeLog entries.  Delete tabs.
+	(log-edit-insert-changelog-entries): Reorganize return value of
+	`log-edit-changelog-entries' to pass filenames to
+	log-edit-changelog-insert-entries.
+
 2010-05-25  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
 	* dired.el (dired-mode-map): Rebind "\C-t\C-t" from

=== modified file 'lisp/log-edit.el'
--- lisp/log-edit.el	2010-04-21 02:05:24 +0000
+++ lisp/log-edit.el	2010-05-25 22:50:56 +0000
@@ -149,12 +149,12 @@
   :type '(hook :options (log-edit-set-common-indentation
 			 log-edit-add-to-changelog)))
 
-(defcustom log-edit-strip-single-file-name t
+(defcustom log-edit-strip-single-file-name nil
   "If non-nil, remove file name from single-file log entries."
   :type 'boolean
   :safe 'booleanp
   :group 'log-edit
-  :version "23.2")
+  :version "24.1")
 
 (defvar cvs-changelog-full-paragraphs t)
 (make-obsolete-variable 'cvs-changelog-full-paragraphs
@@ -691,7 +691,7 @@
 (defun log-edit-changelog-entries (file)
   "Return the ChangeLog entries for FILE, and the ChangeLog they came from.
 The return value looks like this:
-  (LOGBUFFER (ENTRYSTART . ENTRYEND) ...)
+  (LOGBUFFER (ENTRYSTART ENTRYEND) ...)
 where LOGBUFFER is the name of the ChangeLog buffer, and each
 \(ENTRYSTART . ENTRYEND\) pair is a buffer region."
   (let ((changelog-file-name
@@ -749,34 +749,51 @@
 
 	      (cons (current-buffer) texts))))))))
 
-(defun log-edit-changelog-insert-entries (buffer regions)
-  "Insert those regions in BUFFER specified in REGIONS.
-Sort REGIONS front-to-back first."
-  (let ((regions (sort regions 'car-less-than-car))
-        (last))
-    (dolist (region regions)
-      (when (and last (< last (car region))) (newline))
-      (setq last (elt region 1))
-      (apply 'insert-buffer-substring buffer region))))
+(defun log-edit-changelog-insert-entries (buffer beg end &rest files)
+  "Insert the text from BUFFER between BEG and END.
+Rename relative filenames in the ChangeLog entry as FILES."
+  (let ((opoint (point))
+	(log-name (buffer-file-name buffer))
+	(case-fold-search nil)
+	bound)
+    (insert-buffer-substring buffer beg end)
+    (setq bound (point-marker))
+    (when log-name
+      (dolist (f files)
+	(save-excursion
+	  (goto-char opoint)
+	  (when (re-search-forward
+		 (concat "\\(^\\|[ \t]\\)\\("
+			 (file-relative-name f (file-name-directory log-name))
+			 "\\)[, :\n]")
+		 bound t)
+	    (replace-match f t t nil 2)))))
+    ;; Eliminate tabs at the beginning of the line.
+    (save-excursion
+      (goto-char opoint)
+      (while (re-search-forward "^\\(\t+\\)" bound t)
+	(replace-match "")))))
 
 (defun log-edit-insert-changelog-entries (files)
   "Given a list of files FILES, insert the ChangeLog entries for them."
-  (let ((buffer-entries nil))
-
-    ;; Add each buffer to buffer-entries, and associate it with the list
-    ;; of entries we want from that file.
+  (let ((log-entries nil))
+    ;; Note that any ChangeLog entry can apply to more than one file.
+    ;; Here we construct a log-entries list with elements of the form
+    ;;   ((LOGBUFFER ENTRYSTART ENTRYEND) FILE1 FILE2...)
     (dolist (file files)
       (let* ((entries (log-edit-changelog-entries file))
-             (pair (assq (car entries) buffer-entries)))
-        (if pair
-            (setcdr pair (cvs-union (cdr pair) (cdr entries)))
-          (push entries buffer-entries))))
-
-    ;; Now map over each buffer in buffer-entries, sort the entries for
-    ;; each buffer, and extract them as strings.
-    (dolist (buffer-entry buffer-entries)
-      (log-edit-changelog-insert-entries (car buffer-entry) (cdr buffer-entry))
-      (when (cdr buffer-entry) (newline)))))
+	     (buf (car entries))
+	     key entry)
+	(dolist (region (cdr entries))
+	  (setq key (cons buf region))
+	  (if (setq entry (assoc key log-entries))
+	      (setcdr entry (append (cdr entry) (list file)))
+	    (push (list key file) log-entries)))))
+    ;; Now map over log-entries, and extract the strings.
+    (dolist (log-entry (nreverse log-entries))
+      (apply 'log-edit-changelog-insert-entries
+	     (append (car log-entry) (cdr log-entry)))
+      (insert "\n"))))
 
 (defun log-edit-extract-headers (headers comment)
   "Extract headers from COMMENT to form command line arguments.
------------------------------------------------------------
revno: 100441
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Tue 2010-05-25 21:13:41 +0200
message:
  lisp/ChangeLog: Fix typos.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 17:43:58 +0000
+++ lisp/ChangeLog	2010-05-25 19:13:41 +0000
@@ -26,7 +26,7 @@
 2010-05-25  Christian Lynbech  <christian.lynbech@tieto.com>  (tiny change)
 
 	* net/tramp.el (tramp-handle-insert-directory): Don't use
-	`forward-word', it's default syntax could be changed.
+	`forward-word', its default syntax could be changed.
 
 2010-05-25  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -62,19 +62,19 @@
 
 	Replace Lisp calls to delete-backward-char by delete-char.
 	* bs.el, expand.el, ido.el, image-dired.el, lpr.el, pcomplete.el,
-	skeleton.el, term.el, time.el, wid-edit.el, woman.el,
-	calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el,
-	calc/calc.el, emacs-cl-extra.el, emacs-cl-loaddefs.el,
-	emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el,
-	eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el,
-	gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el,
-	language/ethio-util.el, mh-e/mh-alias.el, mh-e/mh-search.el,
-	net/imap.el, net/rcirc.el, obsolete/complete.el, play/decipher.el,
-	progmodes/ada-mode.el, progmodes/cc-awk.el, progmodes/dcl-mode.el,
-	progmodes/ps-mode.el, progmodes/verilog-mode.el,
-	progmodes/vhdl-mode.el, textmodes/bibtex.el, textmodes/fill.el,
-	textmodes/reftex-auc.el, textmodes/rst.el, textmodes/sgml-mode.el,
-	textmodes/table.el, textmodes/texinfmt.el: Replace Lisp calls to
+	* skeleton.el, term.el, time.el, wid-edit.el, woman.el,
+	* calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el,
+	* calc/calc.el, emacs-cl-extra.el, emacs-cl-loaddefs.el,
+	* emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el,
+	* eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el,
+	* gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el,
+	* language/ethio-util.el, mh-e/mh-alias.el, mh-e/mh-search.el,
+	* net/imap.el, net/rcirc.el, obsolete/complete.el, play/decipher.el,
+	* progmodes/ada-mode.el, progmodes/cc-awk.el, progmodes/dcl-mode.el,
+	* progmodes/ps-mode.el, progmodes/verilog-mode.el,
+	* progmodes/vhdl-mode.el, textmodes/bibtex.el, textmodes/fill.el,
+	* textmodes/reftex-auc.el, textmodes/rst.el, textmodes/sgml-mode.el,
+	* textmodes/table.el, textmodes/texinfmt.el: Replace Lisp calls to
 	delete-backward-char by calls to delete-char.
 
 2010-05-25  Kenichi Handa  <handa@m17n.org>
------------------------------------------------------------
revno: 100440
author: Thierry Volpiatto  <thierry.volpiatto@gmail.com>
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Tue 2010-05-25 20:43:58 +0300
message:
  * dired.el (dired-mode-map): Rebind "\C-t\C-t" from
  `image-dired-dired-insert-marked-thumbs' to
  `image-dired-dired-toggle-marked-thumbs'.
  
  * image-dired.el: Require cl when compiling.
  (image-dired-dired-toggle-marked-thumbs): Rename from
  `image-dired-dired-insert-marked-thumbs'.  Add ARG.  Doc fix.
  Use interactive spec "P".  Set LOCALP arg of `dired-get-filename'
  to 'no-dir.  Skip files whose names don't match
  `image-file-name-regexp'.  When file has a thumbnail overlay,
  delete it.  (Bug#5270)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 16:03:53 +0000
+++ lisp/ChangeLog	2010-05-25 17:43:58 +0000
@@ -1,3 +1,17 @@
+2010-05-25  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+	* dired.el (dired-mode-map): Rebind "\C-t\C-t" from
+	`image-dired-dired-insert-marked-thumbs' to
+	`image-dired-dired-toggle-marked-thumbs'.
+
+	* image-dired.el: Require cl when compiling.
+	(image-dired-dired-toggle-marked-thumbs): Rename from
+	`image-dired-dired-insert-marked-thumbs'.  Add ARG.  Doc fix.
+	Use interactive spec "P".  Set LOCALP arg of `dired-get-filename'
+	to 'no-dir.  Skip files whose names don't match
+	`image-file-name-regexp'.  When file has a thumbnail overlay,
+	delete it.  (Bug#5270)
+
 2010-05-25  Juri Linkov  <juri@jurta.org>
 
 	* image-mode.el (image-mode): Add image-after-revert-hook to

=== modified file 'lisp/dired.el'
--- lisp/dired.el	2010-05-20 21:33:58 +0000
+++ lisp/dired.el	2010-05-25 17:43:58 +0000
@@ -1409,7 +1409,7 @@
     (define-key map "\C-t." 'image-dired-display-thumb)
     (define-key map "\C-tc" 'image-dired-dired-comment-files)
     (define-key map "\C-tf" 'image-dired-mark-tagged-files)
-    (define-key map "\C-t\C-t" 'image-dired-dired-insert-marked-thumbs)
+    (define-key map "\C-t\C-t" 'image-dired-dired-toggle-marked-thumbs)
     (define-key map "\C-te" 'image-dired-dired-edit-comment-and-tags)
     ;; encryption and decryption (epa-dired)
     (define-key map ":d" 'epa-dired-do-decrypt)

=== modified file 'lisp/image-dired.el'
--- lisp/image-dired.el	2010-05-25 02:11:08 +0000
+++ lisp/image-dired.el	2010-05-25 17:43:58 +0000
@@ -157,6 +157,7 @@
 (require 'widget)
 
 (eval-when-compile
+  (require 'cl)
   (require 'wid-edit))
 
 (defgroup image-dired nil
@@ -632,26 +633,32 @@
     (call-process shell-file-name nil nil nil shell-command-switch command)))
 
 ;;;###autoload
-(defun image-dired-dired-insert-marked-thumbs ()
-  "Insert thumbnails before file names of marked files in the dired buffer."
-  (interactive)
+(defun image-dired-dired-toggle-marked-thumbs (&optional arg)
+  "Toggle thumbnails in front of file names in the dired buffer.
+If no marked file could be found, insert or hide thumbnails on the
+current line.  ARG, if non-nil, specifies the files to use instead
+of the marked files.  If ARG is an integer, use the next ARG (or
+previous -ARG, if ARG<0) files."
+  (interactive "P")
   (dired-map-over-marks
-   (let* ((image-pos (dired-move-to-filename))
-          (image-file (dired-get-filename))
-          (thumb-file (image-dired-get-thumbnail-image image-file))
+   (let* ((image-pos  (dired-move-to-filename))
+          (image-file (dired-get-filename 'no-dir t))
+          thumb-file
           overlay)
-     ;; If image is not already added, then add it.
-     (unless (delq nil (mapcar (lambda (o) (overlay-get o 'put-image))
-                               ;; Can't use (overlays-at (point)), BUG?
-                               (overlays-in (point) (1+ (point)))))
-       (put-image thumb-file image-pos)
-       (setq
-	overlay
-	(car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o))
-			       (overlays-in (point) (1+ (point)))))))
-       (overlay-put overlay 'image-file image-file)
-       (overlay-put overlay 'thumb-file thumb-file)))
-   nil)
+     (when (and image-file (string-match-p (image-file-name-regexp) image-file))
+       (setq thumb-file (image-dired-get-thumbnail-image image-file))
+       ;; If image is not already added, then add it.
+       (let ((cur-ov (overlays-in (point) (1+ (point)))))
+         (if cur-ov
+             (delete-overlay (car cur-ov))
+	   (put-image thumb-file image-pos)
+	   (setq overlay (loop for o in (overlays-in (point) (1+ (point)))
+			       when (overlay-get o 'put-image) collect o into ov
+			       finally return (car ov)))
+	   (overlay-put overlay 'image-file image-file)
+	   (overlay-put overlay 'thumb-file thumb-file)))))
+   arg             ; Show or hide image on ARG next files.
+   'show-progress) ; Update dired display after each image is updated.
   (add-hook 'dired-after-readin-hook 'image-dired-dired-after-readin-hook nil t))
 
 (defun image-dired-dired-after-readin-hook ()
------------------------------------------------------------
revno: 100439
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Tue 2010-05-25 19:03:53 +0300
message:
  * image-mode.el (image-mode): Add image-after-revert-hook to after-revert-hook.
  (image-after-revert-hook): New function.  (Bug#5669)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 15:54:53 +0000
+++ lisp/ChangeLog	2010-05-25 16:03:53 +0000
@@ -1,5 +1,11 @@
 2010-05-25  Juri Linkov  <juri@jurta.org>
 
+	* image-mode.el (image-mode): Add image-after-revert-hook to
+	after-revert-hook.
+	(image-after-revert-hook): New function.  (Bug#5669)
+
+2010-05-25  Juri Linkov  <juri@jurta.org>
+
 	* image.el (image-animated-p): When delay between animated images
 	is 0, set it to 10 (0.1 sec).  (Bug#6258)
 

=== modified file 'lisp/image-mode.el'
--- lisp/image-mode.el	2010-05-22 16:48:01 +0000
+++ lisp/image-mode.el	2010-05-25 16:03:53 +0000
@@ -357,6 +357,7 @@
 	(image-mode-setup-winprops)
 
 	(add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
+	(add-hook 'after-revert-hook 'image-after-revert-hook nil t)
 	(run-mode-hooks 'image-mode-hook)
 	(message "%s" (concat
 		       (substitute-command-keys
@@ -503,6 +504,14 @@
   (if (image-get-display-property)
       (image-mode-as-text)
     (image-mode)))
+
+(defun image-after-revert-hook ()
+  (when (image-get-display-property)
+    (image-toggle-display-text)
+    ;; Update image display.
+    (redraw-frame (selected-frame))
+    (image-toggle-display-image)))
+
 
 ;;; Support for bookmark.el
 (declare-function bookmark-make-record-default "bookmark"
------------------------------------------------------------
revno: 100438
committer: Juri Linkov <juri@jurta.org>
branch nick: trunk
timestamp: Tue 2010-05-25 18:54:53 +0300
message:
  * image.el (image-animated-p): When delay between animated images is 0,
  set it to 10 (0.1 sec).  (Bug#6258)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 13:29:04 +0000
+++ lisp/ChangeLog	2010-05-25 15:54:53 +0000
@@ -1,3 +1,8 @@
+2010-05-25  Juri Linkov  <juri@jurta.org>
+
+	* image.el (image-animated-p): When delay between animated images
+	is 0, set it to 10 (0.1 sec).  (Bug#6258)
+
 2010-05-25  Christian Lynbech  <christian.lynbech@tieto.com>  (tiny change)
 
 	* net/tramp.el (tramp-handle-insert-directory): Don't use

=== modified file 'lisp/image.el'
--- lisp/image.el	2010-05-22 16:48:01 +0000
+++ lisp/image.el	2010-05-25 15:54:53 +0000
@@ -685,10 +685,13 @@
     (let* ((metadata (image-metadata image))
 	   (images (plist-get metadata 'count))
 	   (extdata (plist-get metadata 'extension-data))
-	   (anim (plist-get extdata #xF9)))
-      (and (integerp images) (> images 1)
-	   (stringp anim) (>= (length anim) 4)
-	   (cons images (+ (aref anim 1) (* (aref anim 2) 256))))))))
+	   (anim (plist-get extdata #xF9))
+	   (tmo (and (integerp images) (> images 1)
+		     (stringp anim) (>= (length anim) 4)
+		     (+ (aref anim 1) (* (aref anim 2) 256)))))
+      (when tmo
+	(if (eq tmo 0) (setq tmo 10))
+	(cons images tmo))))))
 
 
 (provide 'image)
------------------------------------------------------------
revno: 100437
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Tue 2010-05-25 15:33:55 +0200
message:
  * net/tramp.el (tramp-handle-insert-directory): Don't use
  `forward-word', it's default syntax could be changed.
diff:
=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-05-25 08:45:35 +0000
+++ lisp/net/tramp.el	2010-05-25 13:33:55 +0000
@@ -4300,13 +4300,11 @@
 	(forward-line -2)
 	(when (looking-at "//SUBDIRED//")
 	  (forward-line -1))
-	(when (looking-at "//DIRED//")
-	  (let ((end (tramp-compat-line-end-position))
-		(linebeg (point)))
+	(when (looking-at "//DIRED//\\s-+")
+	  (let ((databeg (match-end 0))
+		(end (tramp-compat-line-end-position)))
 	    ;; Now read the numeric positions of file names.
-	    (goto-char linebeg)
-	    (forward-word 1)
-	    (forward-char 3)
+	    (goto-char databeg)
 	    (while (< (point) end)
 	      (let ((start (+ beg (read (current-buffer))))
 		    (end (+ beg (read (current-buffer)))))
------------------------------------------------------------
revno: 100436
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Tue 2010-05-25 15:29:04 +0200
message:
  * net/tramp.el (tramp-handle-insert-directory): Don't use
  `forward-word', it's default syntax could be changed.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 08:45:35 +0000
+++ lisp/ChangeLog	2010-05-25 13:29:04 +0000
@@ -1,3 +1,8 @@
+2010-05-25  Christian Lynbech  <christian.lynbech@tieto.com>  (tiny change)
+
+	* net/tramp.el (tramp-handle-insert-directory): Don't use
+	`forward-word', it's default syntax could be changed.
+
 2010-05-25  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-progress-reporter-update): New defun.
------------------------------------------------------------
revno: 100435
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Tue 2010-05-25 10:45:35 +0200
message:
  * net/tramp.el (tramp-progress-reporter-update): New defun.
  (with-progress-reporter): Use it.
  (tramp-process-actions):
  * net/tramp-gvfs.el (tramp-gvfs-handler-askquestion): Preserve
  current message, in order to let progress reporter continue
  afterwards.  (Bug#6257)
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-05-25 03:38:41 +0000
+++ lisp/ChangeLog	2010-05-25 08:45:35 +0000
@@ -1,3 +1,12 @@
+2010-05-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-progress-reporter-update): New defun.
+	(with-progress-reporter): Use it.
+	(tramp-process-actions):
+	* net/tramp-gvfs.el (tramp-gvfs-handler-askquestion): Preserve
+	current message, in order to let progress reporter continue
+	afterwards.  (Bug#6257)
+
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
 	* net/rcirc.el (rcirc-default-user-name, rcirc-default-full-name):

=== modified file 'lisp/net/tramp-gvfs.el'
--- lisp/net/tramp-gvfs.el	2010-05-21 14:16:42 +0000
+++ lisp/net/tramp-gvfs.el	2010-05-25 08:45:35 +0000
@@ -874,10 +874,12 @@
 	    ;; there is only the question whether to accept an unknown
 	    ;; host signature.
 	    (with-temp-buffer
-	      (insert message)
-	      (pop-to-buffer (current-buffer))
-	      (setq choice (if (yes-or-no-p (concat (car choices) " ")) 0 1))
-	      (tramp-message v 6 "%d" choice))
+	      ;; Preserve message for `progress-reporter'.
+	      (with-temp-message ""
+		(insert message)
+		(pop-to-buffer (current-buffer))
+		(setq choice (if (yes-or-no-p (concat (car choices) " ")) 0 1))
+		(tramp-message v 6 "%d" choice)))
 
 	    ;; When the choice is "no", we set an empty
 	    ;; fuse-mountpoint in order to leave the timeout.
@@ -889,8 +891,8 @@
 	     nil ;; no abort of D-Bus.
 	     choice))
 
-	  ;; When QUIT is raised, we shall return this information to D-Bus.
-	  (quit (list nil t 0))))))
+	;; When QUIT is raised, we shall return this information to D-Bus.
+	(quit (list nil t 0))))))
 
 (defun tramp-gvfs-handler-mounted-unmounted (mount-info)
   "Signal handler for the \"org.gtk.vfs.MountTracker.mounted\" and

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-05-21 14:16:42 +0000
+++ lisp/net/tramp.el	2010-05-25 08:45:35 +0000
@@ -2283,6 +2283,12 @@
 (put 'with-connection-property 'edebug-form-spec t)
 (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-connection-property\\>"))
 
+(defun tramp-progress-reporter-update (reporter &optional value)
+  (let* ((parameters (cdr reporter))
+	 (message (aref parameters 3)))
+    (when (string-match message (or (current-message) ""))
+      (funcall 'progress-reporter-update reporter value))))
+
 (defmacro with-progress-reporter (vec level message &rest body)
   "Executes BODY, spinning a progress reporter with MESSAGE."
   `(let (pr tm)
@@ -2294,7 +2300,8 @@
 		(<= ,level (min tramp-verbose 3)))
        (condition-case nil
 	   (setq pr (tramp-compat-funcall 'make-progress-reporter ,message)
-		 tm (if pr (run-at-time 3 0.1 'progress-reporter-update pr)))
+		 tm (when pr
+		      (run-at-time 3 0.1 'tramp-progress-reporter-update pr)))
 	 (error nil)))
      (unwind-protect
 	 ;; Execute the body.
@@ -6734,27 +6741,29 @@
 
 (defun tramp-process-actions (proc vec actions &optional timeout)
   "Perform actions until success or TIMEOUT."
-  ;; Enable auth-source and password-cache.
-  (tramp-set-connection-property vec "first-password-request" t)
-  (let (exit)
-    (while (not exit)
-      (tramp-message proc 3 "Waiting for prompts from remote shell")
-      (setq exit
-	    (catch 'tramp-action
-	      (if timeout
-		  (with-timeout (timeout)
-		    (tramp-process-one-action proc vec actions))
-		(tramp-process-one-action proc vec actions)))))
-    (with-current-buffer (tramp-get-connection-buffer vec)
-      (tramp-message vec 6 "\n%s" (buffer-string)))
-    (unless (eq exit 'ok)
-      (tramp-clear-passwd vec)
-      (tramp-error-with-buffer
-       nil vec 'file-error
-       (cond
-	((eq exit 'permission-denied) "Permission denied")
-	((eq exit 'process-died) "Process died")
-	(t "Login failed"))))))
+  ;; Preserve message for `progress-reporter'.
+  (with-temp-message ""
+    ;; Enable auth-source and password-cache.
+    (tramp-set-connection-property vec "first-password-request" t)
+    (let (exit)
+      (while (not exit)
+	(tramp-message proc 3 "Waiting for prompts from remote shell")
+	(setq exit
+	      (catch 'tramp-action
+		(if timeout
+		    (with-timeout (timeout)
+		      (tramp-process-one-action proc vec actions))
+		  (tramp-process-one-action proc vec actions)))))
+      (with-current-buffer (tramp-get-connection-buffer vec)
+	(tramp-message vec 6 "\n%s" (buffer-string)))
+      (unless (eq exit 'ok)
+	(tramp-clear-passwd vec)
+	(tramp-error-with-buffer
+	 nil vec 'file-error
+	 (cond
+	  ((eq exit 'permission-denied) "Permission denied")
+	  ((eq exit 'process-died) "Process died")
+	  (t "Login failed")))))))
 
 ;; Utility functions.
------------------------------------------------------------
revno: 100434
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Mon 2010-05-24 21:25:15 -0700
message:
  Relocate NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
  
  * src/Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
  Move before TEMACS_LDFLAGS.
  (TEMACS_LDFLAGS): Use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
  (temacs${EXEEXT}): Do not use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-05-25 04:17:52 +0000
+++ src/ChangeLog	2010-05-25 04:25:15 +0000
@@ -1,5 +1,10 @@
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
+	Move before TEMACS_LDFLAGS.
+	(TEMACS_LDFLAGS): Use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+	(temacs${EXEEXT}): Do not use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
+
 	* Makefile.in (NOT_C_CODE): No longer define.
 	(config.h): No longer include.
 

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-05-25 04:17:52 +0000
+++ src/Makefile.in	2010-05-25 04:25:15 +0000
@@ -111,8 +111,14 @@
 ## which are only good with temacs.
 LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
 
+## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.
+@NS_IMPL_GNUSTEP_INC@
+
+## This uses ${CONFIG_SYSTEM_LIBS} from @NS_IMPL_GNUSTEP_INC@.
+NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
+
 ## Flags to pass to ld only for temacs.
-TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
+TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) $(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
 
 ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
@@ -301,13 +307,6 @@
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
-/* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.  */
-@NS_IMPL_GNUSTEP_INC@
-
-/* FIXME move to LD_SWITCH_SYSTEM_TEMACS?
-   This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include.  */
-NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
-
 /* DO NOT use -R.  There is a special hack described in lastfile.c
    which is used instead.  Some initialized data areas are modified
    at initial startup, then labeled as part of the text area when
@@ -644,8 +643,7 @@
 #define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@
 
 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
-	$(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
-	  ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+	$(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \
 	  ${TEMACS_LDFLAGS2} \
 	  -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.