diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/ChangeLog gedit-2.30.1/ChangeLog
--- gedit-2.30.0git20100413/ChangeLog	2010-04-14 16:38:20.000000000 +0200
+++ gedit-2.30.1/ChangeLog	2010-04-18 17:04:36.000000000 +0200
@@ -1,6 +1,206 @@
+commit 5aed3c90ebaf290591b3741de17acb1cdba2fc5d
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:   2010-04-18
+
+    Release 2.30.1
+
+M	NEWS
+M	README
+M	configure.ac
+
+commit 14814e64fb6dd62300a08f23d16d34b189cb7c58
+Author: Ignacio Casal Quinteiro <icq@gnome.org>
+Date:	2010-04-18
+
+    Disable external tools for win32.
+
+    Until we come up with some replacement in win32 let's disable it.
+
+M	plugins/Makefile.am
+
+commit 84fab13fa95837a748d3211dadf0b6c9c569def3
+Author: Ignacio Casal Quinteiro <icq@gnome.org>
+Date:	2010-04-18
+
+    Do not build some tests on win32
+
+M	tests/document-saver.c
+
+commit f39ef7405c89696c7f2419b3bf8e571bc861b60a
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Do not use gtk 2.18 syntax
+
+M	gedit/gedit-file-chooser-dialog.c
+
+commit 01e5c14065c9ea1338086f3c38565139061c9cc7
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Add a 'default' branch to case statement to make gcc happy
+
+M	gedit/gedit-document-input-stream.c
+
+commit 9011f03572e24a3371fbce392128b7c472502908
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Better name for conditional metadata flag and use it in all the files
+
+M	configure.ac
+M	gedit/Makefile.am
+M	gedit/gedit-document.c
+M	gedit/gedit-gio-document-loader.c
+M	gedit/gedit.c
+
+commit f01b005563a2762360c8ff13e59115e5644c6bbd
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Update git.mk from pango
+
+M	git.mk
+
+commit 579279ea3e5ed593643744f76d9d39a9bd77d5f7
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-18
+
+    Disconnect doc loaded/saved signals when spell plugin deactivated
+
+M	plugins/spell/gedit-spell-plugin.c
+
+commit 211d11e6f45a643ae71d9b75b79595b901f2833d
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-18
+
+    Save spell metadata also after saving the document
+
+M	plugins/spell/gedit-spell-plugin.c
+
+commit 773b1498261b4ac8d8505a44f24cfc67910ccae7
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-18
+
+    Don't save metadata for untitled documents with fallback manager
+
+M	gedit/gedit-document.c
+
+commit 940d150d4ce8d9f35ba396c6229ce334cd7298b0
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-18
+
+    Better conditionally compile old metadata manager
+
+M	configure.ac
+M	gedit/Makefile.am
+M	gedit/gedit-document.c
+
+commit 831a021ab00e81559fe2edf0ceb40b12d832dfcb
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Use document_get_location
+
+M	gedit/gedit-commands-file.c
+
+commit cf336fa71642dd6457dc34f44d74e641632f8b47
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Also check if permission changed when checking if a local file was
+    modified.
+
+M	gedit/gedit-document.c
+
+commit e6db7f86504fb887719348f4274162ae4837e672
+Author: Paolo Borelli <pborelli@gnome.org>
+Date:	2010-04-18
+
+    Update old message that still spoke about "CVS"
+
+M	autogen.sh
+
+commit 7eafaef57d79216e19323f930bd91676f4b08d8c
+Author: Ignacio Casal Quinteiro <icq@gnome.org>
+Date:	2010-04-17
+
+    Reset the spell checker language from the metadata when the doc
+    is loaded.
+
+M	plugins/spell/gedit-spell-plugin.c
+
+commit 55e24248c8d365d45b0f8d7fb1b405f0d7cac777
+Author: Ignacio Casal Quinteiro <icq@gnome.org>
+Date:	2010-04-17
+
+    Use get_location instead of get_uri.
+
+M	plugins/snippets/snippets/Document.py
+
+commit 374dc304bbf17b04dd327f79679667318982b108
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-17
+
+    Set correct text column for drop down mime type entry for snippets
+
+M	plugins/snippets/snippets/Manager.py
+
+commit be3fbac0630f3453d20c1365edc563348001c4e7
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-17
+
+    Fix warnings on tag not being a GtkTextTag when removing autospell
+
+    The problem occurred because the tag table is emptied before the
+    destroy function runs. This patch simply adds a weak reference to the
+    tag object to be notified if it's destroyed before the finalize of the
+    spell object runs.
+
+M	plugins/spell/gedit-automatic-spell-checker.c
+
+commit adf773fc4e18c61621cb236ec5677310351654bc
+Author: Jesse van den Kieboom <jessevdk@gnome.org>
+Date:	2010-04-17
+
+    Auto spell check on highlight-updated
+
+    This solves the issue where the plugin is checking the buffer before
+    the syntax analysis has finished. This is only a temporary fix because
+    it means that the spell checker is rechecking multiple times in many
+    cases.
+
+M	plugins/spell/gedit-automatic-spell-checker.c
+
+commit abfd858fc4994900dd2b1bdf2f7dc98822863735
+Author: Changwoo Ryu <cwryu@debian.org>
+Date:	2010-04-16
+
+    Updated Korean manual translation
+
+    Fixes build errors
+
+M	help/ko/ko.po
+
+commit ef33c1031d6db2d1cab4ae3dadbcb837390bdd2a
+Author: Reşat SABIQ <tilde.birlik@gmail.com>
+Date:	2010-04-14
+
+    Minor update for Crimean Tatar/Turkish translation
+
+M	po/crh.po
+
+commit cd072bdb6b55ef5c9b132a8e1a07c83a31b3b9ca
+Author: Runa Bhattacharjee <runab@redhat.com>
+Date:	2010-04-14
+
+    Updated Bengali India Translation
+
+M	po/bn_IN.po
+
 commit 20f00dd6919de84ff2239f1ab9b2ecbd3c2a941a
 Author: Xandru Armesto Fernandez <xandru@softastur.org>
-Date:   2010-04-13
+Date:	2010-04-13
 
     Updated asturian translation
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/config.guess gedit-2.30.1/config.guess
--- gedit-2.30.0git20100413/config.guess	2010-04-14 16:28:59.000000000 +0200
+++ gedit-2.30.1/config.guess	2010-04-18 16:55:46.000000000 +0200
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -333,6 +333,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -807,12 +810,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -854,6 +857,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +893,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -901,39 +929,18 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +949,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +976,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1247,6 +1205,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/config.h.in gedit-2.30.1/config.h.in
--- gedit-2.30.0git20100413/config.h.in	2010-04-14 16:28:59.000000000 +0200
+++ gedit-2.30.1/config.h.in	2010-04-18 16:55:44.000000000 +0200
@@ -3,6 +3,9 @@
 /* Whether to use GeditSpinner instead of GtkSpinner */
 #undef BUILD_SPINNER
 
+/* Define to enable using gvfs metadata */
+#undef ENABLE_GVFS_METADATA
+
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/config.sub gedit-2.30.1/config.sub
--- gedit-2.30.0git20100413/config.sub	2010-04-14 16:28:59.000000000 +0200
+++ gedit-2.30.1/config.sub	2010-04-18 16:55:46.000000000 +0200
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -149,7 +152,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
@@ -284,6 +287,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -291,13 +295,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -340,7 +345,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -368,7 +373,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -377,6 +382,7 @@
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -726,6 +732,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1247,6 +1256,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1268,8 +1280,8 @@
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1290,7 +1302,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/configure gedit-2.30.1/configure
--- gedit-2.30.0git20100413/configure	2010-04-14 16:28:59.000000000 +0200
+++ gedit-2.30.1/configure	2010-04-18 16:55:43.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for gedit 2.30.0.
+# Generated by GNU Autoconf 2.65 for gedit 2.30.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gedit>.
 #
@@ -702,8 +702,8 @@
 # Identity of this package.
 PACKAGE_NAME='gedit'
 PACKAGE_TARNAME='gedit'
-PACKAGE_VERSION='2.30.0'
-PACKAGE_STRING='gedit 2.30.0'
+PACKAGE_VERSION='2.30.1'
+PACKAGE_STRING='gedit 2.30.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gedit'
 PACKAGE_URL='http://projects.gnome.org/gedit/'
 
@@ -811,6 +811,8 @@
 ENABLE_UPDATER_TRUE
 LIBSOUP_LIBS
 LIBSOUP_CFLAGS
+ENABLE_GVFS_METADATA_FALSE
+ENABLE_GVFS_METADATA_TRUE
 MKINSTALLDIRS
 POSUB
 POFILES
@@ -1024,6 +1026,7 @@
 enable_gtk_doc_html
 enable_gtk_doc_pdf
 enable_nls
+enable_gvfs_metadata
 enable_updater
 enable_spell
 with_gconf_source
@@ -1605,7 +1608,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gedit 2.30.0 to adapt to many kinds of systems.
+\`configure' configures gedit 2.30.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1675,7 +1678,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gedit 2.30.0:";;
+     short | recursive ) echo "Configuration of gedit 2.30.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1699,6 +1702,7 @@
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
   --disable-nls           do not use Native Language Support
+  --enable-gvfs-metadata  Enable using gvfs to store metadata
   --disable-updater       Disable check update plugin (default: enabled)
   --disable-spell         Disable spell plugin (default: enabled)
   --disable-schemas-install
@@ -1830,7 +1834,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gedit configure 2.30.0
+gedit configure 2.30.1
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2239,7 +2243,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gedit $as_me 2.30.0, which was
+It was created by gedit $as_me 2.30.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2603,9 +2607,9 @@
 GEDIT_MINOR_VERSION=30
 
 
-$as_echo "#define GEDIT_MICRO_VERSION 0" >>confdefs.h
+$as_echo "#define GEDIT_MICRO_VERSION 1" >>confdefs.h
 
-GEDIT_MICRO_VERSION=0
+GEDIT_MICRO_VERSION=1
 
 
 am__api_version='1.11'
@@ -3069,7 +3073,7 @@
 
 # Define the identity of the package.
  PACKAGE='gedit'
- VERSION='2.30.0'
+ VERSION='2.30.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5533,13 +5537,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5536: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5540: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5539: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5543: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5542: output\"" >&5)
+  (eval echo "\"\$as_me:5546: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6005,11 +6009,11 @@
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -6744,7 +6748,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6747 "configure"' > conftest.$ac_ext
+  echo '#line 6751 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8273,11 +8277,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8276: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8280: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8280: \$? = $ac_status" >&5
+   echo "$as_me:8284: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8442,7 +8446,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8612,11 +8616,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8615: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8619: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8619: \$? = $ac_status" >&5
+   echo "$as_me:8623: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8717,11 +8721,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8720: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8724: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8724: \$? = $ac_status" >&5
+   echo "$as_me:8728: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8772,11 +8776,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8775: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8779: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8779: \$? = $ac_status" >&5
+   echo "$as_me:8783: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8891,9 +8895,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
-    link_all_deplibs=no
-    ;;
   esac
 
   ld_shlibs=yes
@@ -8915,7 +8916,6 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -9007,7 +9007,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -9077,7 +9077,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9252,7 +9252,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9579,7 +9578,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10469,7 +10468,7 @@
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10509,10 +10508,13 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10524,18 +10526,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11156,7 +11146,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11159 "configure"
+#line 11149 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11252,7 +11242,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11255 "configure"
+#line 11245 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12009,11 +11999,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5
 $as_echo_n "checking for IGE_MAC... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$IGE_MAC_CFLAGS"; then
-        pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$IGE_MAC_CFLAGS"; then
+    pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
   ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
   ac_status=$?
@@ -12023,15 +12012,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$IGE_MAC_LIBS"; then
-        pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$IGE_MAC_LIBS"; then
+    pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
   ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
   ac_status=$?
@@ -12041,9 +12028,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -12056,9 +12042,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ige-mac-integration"`
+	        IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
         else
-	        IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ige-mac-integration"`
+	        IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$IGE_MAC_PKG_ERRORS" >&5
@@ -13386,6 +13372,36 @@
 
 
 
+if test "x$os_osx" != "xno" || test "x$os_win32" != "xno"; then
+	gvfs_metadata_default="no"
+else
+	gvfs_metadata_default="yes"
+fi
+
+# Check whether --enable-gvfs-metadata was given.
+if test "${enable_gvfs_metadata+set}" = set; then :
+  enableval=$enable_gvfs_metadata; enable_gvfs_metadata=$enableval
+else
+  enable_gvfs_metadata=$file_metadata_default
+fi
+
+
+ if test "x$enable_gvfs_metadata" != "xno"; then
+  ENABLE_GVFS_METADATA_TRUE=
+  ENABLE_GVFS_METADATA_FALSE='#'
+else
+  ENABLE_GVFS_METADATA_TRUE='#'
+  ENABLE_GVFS_METADATA_FALSE=
+fi
+
+
+if test "x$enable_gvfs_metadata" != "xno"; then
+
+$as_echo "#define ENABLE_GVFS_METADATA 1" >>confdefs.h
+
+fi
+
+
 # Check whether --enable-updater was given.
 if test "${enable_updater+set}" = set; then :
   enableval=$enable_updater; enable_updater=$enableval
@@ -13400,11 +13416,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
 $as_echo_n "checking for LIBSOUP... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBSOUP_CFLAGS"; then
-        pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_CFLAGS"; then
+    pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
 		libsoup-2.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "\
@@ -13417,15 +13432,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBSOUP_LIBS"; then
-        pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_LIBS"; then
+    pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
 		libsoup-2.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "\
@@ -13438,9 +13451,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -13453,11 +13465,11 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
-		libsoup-2.4"`
+	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
+		libsoup-2.4" 2>&1`
         else
-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
-		libsoup-2.4"`
+	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
+		libsoup-2.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBSOUP_PKG_ERRORS" >&5
@@ -13516,11 +13528,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCHANT" >&5
 $as_echo_n "checking for ENCHANT... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$ENCHANT_CFLAGS"; then
-        pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$ENCHANT_CFLAGS"; then
+    pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5
   ac_status=$?
@@ -13530,15 +13541,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$ENCHANT_LIBS"; then
-        pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$ENCHANT_LIBS"; then
+    pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5
   ac_status=$?
@@ -13548,9 +13557,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -13563,9 +13571,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "enchant >= $ENCHANT_REQUIRED"`
+	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant >= $ENCHANT_REQUIRED" 2>&1`
         else
-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "enchant >= $ENCHANT_REQUIRED"`
+	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant >= $ENCHANT_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ENCHANT_PKG_ERRORS" >&5
@@ -13701,11 +13709,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEDIT" >&5
 $as_echo_n "checking for GEDIT... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GEDIT_CFLAGS"; then
-        pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GEDIT_CFLAGS"; then
+    pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 	libxml-2.0 >= 2.5.0
 	glib-2.0 >= 2.22.0
@@ -13739,15 +13746,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GEDIT_LIBS"; then
-        pkg_cv_GEDIT_LIBS="$GEDIT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GEDIT_LIBS"; then
+    pkg_cv_GEDIT_LIBS="$GEDIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 	libxml-2.0 >= 2.5.0
 	glib-2.0 >= 2.22.0
@@ -13781,9 +13786,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -13796,7 +13800,7 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+	        GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
 	libxml-2.0 >= 2.5.0
 	glib-2.0 >= 2.22.0
 	gthread-2.0 >= 2.13.0
@@ -13804,9 +13808,9 @@
 	gtk+-2.0 >= 2.16.0
 	gtksourceview-2.0 >= 2.9.7
 	gconf-2.0 >= 1.1.11
-"`
+" 2>&1`
         else
-	        GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+	        GEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
 	libxml-2.0 >= 2.5.0
 	glib-2.0 >= 2.22.0
 	gthread-2.0 >= 2.13.0
@@ -13814,7 +13818,7 @@
 	gtk+-2.0 >= 2.16.0
 	gtksourceview-2.0 >= 2.9.7
 	gconf-2.0 >= 1.1.11
-"`
+" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEDIT_PKG_ERRORS" >&5
@@ -13866,11 +13870,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
 $as_echo_n "checking for X11... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_CFLAGS"; then
-        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$X11_CFLAGS"; then
+    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 		x11
 	\""; } >&5
@@ -13886,15 +13889,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_LIBS"; then
-        pkg_cv_X11_LIBS="$X11_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$X11_LIBS"; then
+    pkg_cv_X11_LIBS="$X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 		x11
 	\""; } >&5
@@ -13910,9 +13911,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -13925,13 +13925,13 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
 		x11
-	"`
+	" 2>&1`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "
 		x11
-	"`
+	" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
@@ -14024,11 +14024,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5
 $as_echo_n "checking for EGG_SMCLIENT... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$EGG_SMCLIENT_CFLAGS"; then
-        pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$EGG_SMCLIENT_CFLAGS"; then
+    pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 		sm >= 1.0.0
 	\""; } >&5
@@ -14044,15 +14043,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$EGG_SMCLIENT_LIBS"; then
-        pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$EGG_SMCLIENT_LIBS"; then
+    pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 		sm >= 1.0.0
 	\""; } >&5
@@ -14068,9 +14065,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -14083,13 +14079,13 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
 		sm >= 1.0.0
-	"`
+	" 2>&1`
         else
-	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
 		sm >= 1.0.0
-	"`
+	" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
@@ -14507,11 +14503,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
 $as_echo_n "checking for PYGTK... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PYGTK_CFLAGS"; then
-        pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$PYGTK_CFLAGS"; then
+    pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 		pygobject-2.0 >= \$PYGOBJECT_REQUIRED
 		pygtk-2.0 >= \$PYGTK_REQUIRED
@@ -14530,15 +14525,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PYGTK_LIBS"; then
-        pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$PYGTK_LIBS"; then
+    pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
 		pygobject-2.0 >= \$PYGOBJECT_REQUIRED
 		pygtk-2.0 >= \$PYGTK_REQUIRED
@@ -14557,9 +14550,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -14572,15 +14564,15 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+	        PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
 		pygobject-2.0 >= $PYGOBJECT_REQUIRED
 		pygtk-2.0 >= $PYGTK_REQUIRED
-		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED"`
+		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED" 2>&1`
         else
-	        PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+	        PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "
 		pygobject-2.0 >= $PYGOBJECT_REQUIRED
 		pygtk-2.0 >= $PYGTK_REQUIRED
-		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED"`
+		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PYGTK_PKG_ERRORS" >&5
@@ -15186,6 +15178,10 @@
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${ENABLE_GVFS_METADATA_TRUE}" && test -z "${ENABLE_GVFS_METADATA_FALSE}"; then
+  as_fn_error "conditional \"ENABLE_GVFS_METADATA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_UPDATER_TRUE}" && test -z "${ENABLE_UPDATER_FALSE}"; then
   as_fn_error "conditional \"ENABLE_UPDATER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15626,7 +15622,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gedit $as_me 2.30.0, which was
+This file was extended by gedit $as_me 2.30.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15693,7 +15689,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gedit config.status 2.30.0
+gedit config.status 2.30.1
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
@@ -17507,6 +17503,7 @@
 	Compiler:		${CC}
 	Python Plugins Support: $enable_python
 	Spell Plugin enabled:	$enable_enchant
+	Gvfs metadata enabled:	$enable_gvfs_metadata
 "
 
 if expr ${GEDIT_MINOR_VERSION} % 2 > /dev/null; then
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/configure.ac gedit-2.30.1/configure.ac
--- gedit-2.30.0git20100413/configure.ac	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/configure.ac	2010-04-18 16:50:27.000000000 +0200
@@ -4,7 +4,7 @@
 
 m4_define(gedit_major_version,  2)
 m4_define(gedit_minor_version, 30)
-m4_define(gedit_micro_version,  0)
+m4_define(gedit_micro_version,  1)
 m4_define(gedit_version, gedit_major_version.gedit_minor_version.gedit_micro_version)
 
 AC_INIT([gedit],[gedit_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gedit],[gedit],[http://projects.gnome.org/gedit/])
@@ -160,6 +160,27 @@
 AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
 
 dnl ================================================================
+dnl Use gvfs metadata or the old xml file store.
+dnl ================================================================
+
+if test "x$os_osx" != "xno" || test "x$os_win32" != "xno"; then
+	gvfs_metadata_default="no"
+else
+	gvfs_metadata_default="yes"
+fi
+
+AC_ARG_ENABLE([gvfs-metadata],
+	AS_HELP_STRING([--enable-gvfs-metadata], [Enable using gvfs to store metadata]),
+	[enable_gvfs_metadata=$enableval],
+	[enable_gvfs_metadata=$file_metadata_default])
+
+AM_CONDITIONAL(ENABLE_GVFS_METADATA, test "x$enable_gvfs_metadata" != "xno")
+
+if test "x$enable_gvfs_metadata" != "xno"; then
+	AC_DEFINE([ENABLE_GVFS_METADATA], [1], [Define to enable using gvfs metadata])
+fi
+
+dnl ================================================================
 dnl check update plugin
 dnl ================================================================
 
@@ -546,6 +567,7 @@
 	Compiler:		${CC}
 	Python Plugins Support: $enable_python
 	Spell Plugin enabled:	$enable_enchant
+	Gvfs metadata enabled:	$enable_gvfs_metadata
 "
 
 if expr ${GEDIT_MINOR_VERSION} % 2 > /dev/null; then
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/data/gedit.desktop.in gedit-2.30.1/data/gedit.desktop.in
--- gedit-2.30.0git20100413/data/gedit.desktop.in	2010-04-14 16:29:07.000000000 +0200
+++ gedit-2.30.1/data/gedit.desktop.in	2010-04-18 16:56:08.000000000 +0200
@@ -14,5 +14,5 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gedit
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
-X-GNOME-Bugzilla-ExtraInfoScript=/usr/local/libexec/gedit-2/gedit-bugreport.sh
+X-GNOME-Bugzilla-Version=2.30.1
+X-GNOME-Bugzilla-ExtraInfoScript=/home/paolo/gnome/libexec/gedit-2/gedit-bugreport.sh
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/debian/changelog gedit-2.30.1/debian/changelog
--- gedit-2.30.0git20100413/debian/changelog	2010-04-28 16:59:14.000000000 +0200
+++ gedit-2.30.1/debian/changelog	2010-04-28 16:59:15.000000000 +0200
@@ -1,3 +1,15 @@
+gedit (2.30.1-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream release: (LP: #571279)
+    - Properly handle encoding conversion errors when saving
+      (Jesse van den Kieboom)
+    - New logo (Henry Peters)
+    - Misc bugfixes
+  * debian/patches/90_autoconf.patch:
+    - refreshed
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 28 Apr 2010 16:40:45 +0200
+
 gedit (2.30.0git20100413-0ubuntu1) lucid; urgency=low
 
   * Updating to git snaptshot since 2.30.1 will be after lucid
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/gedit.c gedit-2.30.1/gedit/gedit.c
--- gedit-2.30.0git20100413/gedit/gedit.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/gedit.c	2010-04-18 15:11:38.000000000 +0200
@@ -66,7 +66,6 @@
 #include <conio.h>
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
-#include "gedit-metadata-manager.h"
 #define DATADIR SAVE_DATADIR
 #undef SAVE_DATADIR
 #endif
@@ -77,6 +76,10 @@
 #include "osx/gedit-osx.h"
 #endif
 
+#ifndef ENABLE_GVFS_METADATA
+#include "gedit-metadata-manager.h"
+#endif
+
 static guint32 startup_timestamp = 0;
 
 #ifndef G_OS_WIN32
@@ -753,7 +756,7 @@
 	g_object_unref (engine);
 	gedit_prefs_manager_app_shutdown ();
 
-#ifdef G_OS_WIN32
+#ifndef ENABLE_GVFS_METADATA
 	gedit_metadata_manager_shutdown ();
 #endif
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/gedit-commands-file.c gedit-2.30.1/gedit/gedit-commands-file.c
--- gedit-2.30.0git20100413/gedit/gedit-commands-file.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/gedit-commands-file.c	2010-04-18 12:24:11.000000000 +0200
@@ -79,27 +79,22 @@
 
 	while (docs != NULL)
 	{
-		gchar *u;
 		GeditDocument *d;
+		GFile *l;
 
 		d = GEDIT_DOCUMENT (docs->data);
 
-		u = gedit_document_get_uri (d);
-		if (u != NULL)
+		l = gedit_document_get_location (d);
+		if (l != NULL)
 		{
-			GFile *f;
-
-			f = g_file_new_for_uri (u);
-			g_free (u);
-
-			if (g_file_equal (f, file))
+			if (g_file_equal (l, file))
 			{
 				tab = gedit_tab_get_from_document (d);
-				g_object_unref (f);
+				g_object_unref (l);
 				break;
 			}
 
-			g_object_unref (f);
+			g_object_unref (l);
 		}
 
 		docs = g_list_next (docs);
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/gedit-document.c gedit-2.30.1/gedit/gedit-document.c
--- gedit-2.30.0git20100413/gedit/gedit-document.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/gedit-document.c	2010-04-18 15:09:24.000000000 +0200
@@ -52,7 +52,7 @@
 #include "gedit-enum-types.h"
 #include "gedittextregion.h"
 
-#ifdef G_OS_WIN32
+#ifndef ENABLE_GVFS_METADATA
 #include "gedit-metadata-manager.h"
 #else
 #define METADATA_QUERY "metadata::*"
@@ -745,7 +745,7 @@
 		GParamSpec    *pspec,
 		gpointer       useless)
 {
-#ifndef G_OS_WIN32
+#ifdef ENABLE_GVFS_METADATA
 	GFile *location;
 
 	location = gedit_document_get_location (doc);
@@ -1127,18 +1127,20 @@
 }
 
 /* Note: do not emit the notify::read-only signal */
-static void
+static gboolean
 set_readonly (GeditDocument *doc,
 	      gboolean       readonly)
 {
 	gedit_debug (DEBUG_DOCUMENT);
-	
+
 	readonly = (readonly != FALSE);
 
 	if (doc->priv->readonly == readonly) 
-		return;
+		return FALSE;
 
 	doc->priv->readonly = readonly;
+
+	return TRUE;
 }
 
 /**
@@ -1156,9 +1158,10 @@
 
 	g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
 
-	set_readonly (doc, readonly);
-
-	g_object_notify (G_OBJECT (doc), "read-only");
+	if (set_readonly (doc, readonly))
+	{
+		g_object_notify (G_OBJECT (doc), "read-only");
+	}
 }
 
 gboolean
@@ -1174,7 +1177,6 @@
 {
 	GFile *gfile;
 	GFileInfo *info;
-	GTimeVal timeval;
 
 	g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), FALSE);
 
@@ -1185,23 +1187,39 @@
 
 	gfile = g_file_new_for_uri (doc->priv->uri);
 	info = g_file_query_info (gfile,
-				  G_FILE_ATTRIBUTE_TIME_MODIFIED,
+				  G_FILE_ATTRIBUTE_TIME_MODIFIED "," \
+				  G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
 				  G_FILE_QUERY_INFO_NONE,
 				  NULL, NULL);
 	g_object_unref (gfile);
 
-	if (info == NULL ||
-	    !g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED))
+	if (info != NULL)
 	{
-		return FALSE;
-	}
+		/* While at it also check if permissions changed */
+		if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
+		{
+			gboolean read_only;
 
-	g_file_info_get_modification_time (info, &timeval);
-	g_object_unref (info);
+			read_only = !g_file_info_get_attribute_boolean (info,
+									G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
+
+			_gedit_document_set_readonly (doc, read_only);
+		}
+
+		if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED))
+		{
+			GTimeVal timeval;
+
+			g_file_info_get_modification_time (info, &timeval);
+			g_object_unref (info);
 	
-	return (timeval.tv_sec > doc->priv->mtime.tv_sec) ||
-	       (timeval.tv_sec == doc->priv->mtime.tv_sec && 
-	       timeval.tv_usec > doc->priv->mtime.tv_usec);
+			return (timeval.tv_sec > doc->priv->mtime.tv_sec) ||
+			       (timeval.tv_sec == doc->priv->mtime.tv_sec && 
+			       timeval.tv_usec > doc->priv->mtime.tv_usec);
+		}
+	}
+
+	return FALSE;
 }
 
 static void
@@ -2553,7 +2571,7 @@
 						           doc->priv->mount_operation_userdata);
 }
 
-#ifdef G_OS_WIN32
+#ifndef ENABLE_GVFS_METADATA
 gchar *
 gedit_document_get_metadata (GeditDocument *doc,
 			     const gchar   *key)
@@ -2563,8 +2581,10 @@
 	g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), NULL);
 	g_return_val_if_fail (key != NULL, NULL);
 
-	if (doc->priv->uri != NULL)
+	if (!gedit_document_is_untitled (doc))
+	{
 		value = gedit_metadata_manager_get (doc->priv->uri, key);
+	}
 
 	return value;
 }
@@ -2581,6 +2601,12 @@
 	g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
 	g_return_if_fail (first_key != NULL);
 
+	if (gedit_document_is_untitled (doc))
+	{
+		/* Can't set metadata for untitled documents */
+		return;
+	}
+
 	va_start (var_args, first_key);
 
 	for (key = first_key; key; key = va_arg (var_args, const gchar *))
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/gedit-document-input-stream.c gedit-2.30.1/gedit/gedit-document-input-stream.c
--- gedit-2.30.0git20100413/gedit/gedit-document-input-stream.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/gedit-document-input-stream.c	2010-04-18 15:17:00.000000000 +0200
@@ -178,6 +178,11 @@
 		case GEDIT_DOCUMENT_NEWLINE_TYPE_CR_LF:
 			ret = 2;
 			break;
+
+		default:
+			g_warn_if_reached ();
+			ret = 1;
+			break;
 	}
 
 	return ret;
@@ -256,6 +261,11 @@
 		case GEDIT_DOCUMENT_NEWLINE_TYPE_CR_LF:
 			ret = "\r\n";
 			break;
+
+		default:
+			g_warn_if_reached ();
+			ret = "\n";
+			break;
 	}
 
 	return ret;
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/gedit-file-chooser-dialog.c gedit-2.30.1/gedit/gedit-file-chooser-dialog.c
--- gedit-2.30.0git20100413/gedit/gedit-file-chooser-dialog.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/gedit-file-chooser-dialog.c	2010-04-18 15:21:52.000000000 +0200
@@ -107,11 +107,16 @@
 static void
 update_newline_visibility (GeditFileChooserDialog *dialog)
 {
-	gboolean issave = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)) ==
-	                  GTK_FILE_CHOOSER_ACTION_SAVE;
-
-	gtk_widget_set_visible (dialog->priv->newline_label, issave);
-	gtk_widget_set_visible (dialog->priv->newline_combo, issave);
+	if (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)) == GTK_FILE_CHOOSER_ACTION_SAVE)
+	{
+		gtk_widget_show (dialog->priv->newline_label);
+		gtk_widget_show (dialog->priv->newline_combo);
+	}
+	else
+	{
+		gtk_widget_hide (dialog->priv->newline_label);
+		gtk_widget_hide (dialog->priv->newline_combo);
+	}
 }
 
 static void
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/gedit-gio-document-loader.c gedit-2.30.1/gedit/gedit-gio-document-loader.c
--- gedit-2.30.0git20100413/gedit/gedit-gio-document-loader.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/gedit-gio-document-loader.c	2010-04-18 15:13:12.000000000 +0200
@@ -45,6 +45,10 @@
 #include "gedit-debug.h"
 #include "gedit-utils.h"
 
+#ifndef ENABLE_GVFS_METADATA
+#include "gedit-metadata-manager.h"
+#endif
+
 typedef struct
 {
 	GeditGioDocumentLoader *loader;
@@ -189,7 +193,7 @@
 {
 	const GeditEncoding *enc = NULL;
 
-#ifdef G_OS_WIN32
+#ifndef ENABLE_GVFS_METADATA
 	gchar *charset;
 	const gchar *uri;
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/gedit/Makefile.am gedit-2.30.1/gedit/Makefile.am
--- gedit-2.30.0git20100413/gedit/Makefile.am	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/gedit/Makefile.am	2010-04-18 15:05:32.000000000 +0200
@@ -117,7 +117,7 @@
 	gedit-view.h 			\
 	gedit-window.h
 
-if OS_WIN32
+if !ENABLE_GVFS_METADATA
 INST_H_FILES += gedit-metadata-manager.h
 endif
 
@@ -188,7 +188,7 @@
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
 
-if OS_WIN32
+if !ENABLE_GVFS_METADATA
 libgedit_la_SOURCES += gedit-metadata-manager.c 
 endif
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/ltmain.sh gedit-2.30.1/ltmain.sh
--- gedit-2.30.0git20100413/ltmain.sh	2010-04-14 16:28:53.000000000 +0200
+++ gedit-2.30.1/ltmain.sh	2010-04-18 16:55:34.000000000 +0200
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:		(GNU libtool) 2.2.6b
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION=2.2.6b
 TIMESTAMP=""
 package_revision=1.3017
 
@@ -5033,10 +5033,7 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5347,19 +5344,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-		esac
-	      fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -5896,7 +5893,6 @@
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
-	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
@@ -6210,9 +6206,6 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
 	  esac
 	  ;;
 	no)
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/NEWS gedit-2.30.1/NEWS
--- gedit-2.30.0git20100413/NEWS	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/NEWS	2010-04-18 16:55:19.000000000 +0200
@@ -1,4 +1,29 @@
 ============
+gedit 2.30.1
+============
+
+New Features and Fixes
+======================
+- Properly handle encoding conversion errors when saving (Jesse van den Kieboom)
+- New logo (Henry Peters)
+- Misc bugfixes
+
+New and updated translations
+============================
+- ast (Xandru Armesto)
+- bn_IN (Runa Bhattacharjee)
+- crh (Reşat SABIQ)
+- cs (Petr Kovar)
+- hu (Gabor Kelemen)
+- id (Andika Triwidada)
+- ko (Changwoo Ryu)
+- nl (Hannie Dumoleyn)
+- ro (Adi Roiban)
+- ru (Alexander Saprykin)
+- th (Kittiphong Meesawat)
+
+
+============
 gedit 2.30.0
 ============
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/plugins/Makefile.am gedit-2.30.1/plugins/Makefile.am
--- gedit-2.30.0git20100413/plugins/Makefile.am	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/plugins/Makefile.am	2010-04-18 16:48:29.000000000 +0200
@@ -23,7 +23,12 @@
 	time
 
 if ENABLE_PYTHON
-SUBDIRS      += externaltools pythonconsole snippets quickopen
+SUBDIRS      += pythonconsole snippets quickopen
+
+if !OS_WIN32
+SUBDIRS      += externaltools
+endif
+
 endif
 
 if ENABLE_ENCHANT
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/plugins/snippets/snippets/Document.py gedit-2.30.1/plugins/snippets/snippets/Document.py
--- gedit-2.30.0git20100413/plugins/snippets/snippets/Document.py	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/plugins/snippets/snippets/Document.py	2010-04-17 19:21:14.000000000 +0200
@@ -383,42 +383,42 @@
                 return str(start.get_line() + 1)
                 
         def env_get_document_uri(self, buf):
-                uri = buf.get_uri()
+                location = buf.get_location()
                 
-                if uri:
-                        return uri
+                if location:
+                        return location.get_uri()
                 else:
                         return ''
         
         def env_get_document_name(self, buf):
-                uri = buf.get_uri()
+                location = buf.get_location()
                 
-                if uri:
-                        return os.path.basename(uri)
+                if location:
+                        return location.get_basename()
                 else:
                         return ''
 
         def env_get_document_scheme(self, buf):
-                uri = buf.get_uri()
+                location = buf.get_location()
                 
-                if uri:
-                        return gio.File(uri).get_uri_scheme()
+                if location:
+                        return location.get_uri_scheme()
                 else:
                         return ''
 
         def env_get_document_path(self, buf):
-                uri = buf.get_uri()
+                location = buf.get_location()
                 
-                if uri and gedit.utils.uri_has_file_scheme(uri):
-                        return gio.File(uri).get_path()
+                if location:
+                        return location.get_path()
                 else:
                         return ''
 
         def env_get_document_dir(self, buf):
-                uri = buf.get_uri()
-                
-                if uri and gedit.utils.uri_has_file_scheme(uri):
-                        return os.path.dirname(gio.File(uri).get_path())
+                location = buf.get_location()
+
+                if location:
+                        return location.get_parent().get_path() or ''
                 else:
                         return ''
 
@@ -434,9 +434,9 @@
                 toplevel = self.view.get_toplevel()
                 
                 if isinstance(toplevel, gedit.Window):
-                        documents_uri = [doc.get_uri()
+                        documents_uri = [doc.get_location().get_uri()
                                          for doc in toplevel.get_documents()
-                                         if doc.get_uri() is not None]
+                                         if doc.get_location() is not None]
                 else:
                         documents_uri = []
                 
@@ -446,13 +446,13 @@
                 toplevel = self.view.get_toplevel()
                 
                 if isinstance(toplevel, gedit.Window):
-                        documents_uri = [doc.get_uri()
-                                         for doc in toplevel.get_documents()
-                                         if doc.get_uri() is not None]
-
-                        documents_path = [gio.File(uri).get_path()
-                                         for uri in documents_uri
-                                         if gedit.utils.uri_has_file_scheme(uri)]
+                        documents_location = [doc.get_location()
+                                              for doc in toplevel.get_documents()
+                                              if doc.get_location() is not None]
+
+                        documents_path = [location.get_path()
+                                          for location in documents_location
+                                          if gedit.utils.uri_has_file_scheme(location.get_uri())]
                 else:
                         documents_path = []
                 
@@ -814,55 +814,56 @@
                         return self.path_split(head, [tail] + components)
                 else:
                         return components
-        
+
         def relative_path(self, first, second, mime):
                 prot1 = re.match('(^[a-z]+:\/\/|\/)(.*)', first)
                 prot2 = re.match('(^[a-z]+:\/\/|\/)(.*)', second)
-                
+
                 if not prot1 or not prot2:
                         return second
-                
+
                 # Different protocols
                 if prot1.group(1) != prot2.group(1):
                         return second
-                
+
                 # Split on backslash
                 path1 = self.path_split(prot1.group(2))
                 path2 = self.path_split(prot2.group(2))
-                
+
                 # Remove as long as common
                 while path1 and path2 and path1[0] == path2[0]:
                         path1.pop(0)
                         path2.pop(0)
-                
+
                 # If we need to ../ more than 3 times, then just return
                 # the absolute path
                 if len(path1) - 1 > 3:
                         return second
-                
+
                 if mime.startswith('x-directory'):
                         # directory, special case
                         if not path2:
                                 result = './'
                         else:
-                                result = '../' * (len(path1) - 1)       
-                else:   
+                                result = '../' * (len(path1) - 1)
+                else:
                         # Insert ../
                         result = '../' * (len(path1) - 1)
-                
+
                         if not path2:
                                 result = os.path.basename(second)
                 
                 if path2:
                         result += os.path.join(*path2)
-                        
+
                 return result
-        
+
         def apply_uri_snippet(self, snippet, mime, uri):
                 # Remove file scheme
                 gfile = gio.File(uri)
                 pathname = ''
                 dirname = ''
+                ruri = ''
 
                 if gedit.utils.uri_has_file_scheme(uri):
                         pathname = gfile.get_path()
@@ -877,9 +878,13 @@
                 os.environ['GEDIT_DROP_DOCUMENT_PATH'] = pathname
                 os.environ['GEDIT_DROP_DOCUMENT_DIR'] = dirname
                 os.environ['GEDIT_DROP_DOCUMENT_TYPE'] = mime
-                
+
                 buf = self.view.get_buffer()
-                relpath = self.relative_path(buf.get_uri() or "", uri, mime)
+                location = buf.get_location()
+                if location:
+                        ruri = location.get_uri()
+
+                relpath = self.relative_path(ruri, uri, mime)
 
                 os.environ['GEDIT_DROP_DOCUMENT_RELATIVE_PATH'] = relpath
 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/plugins/snippets/snippets/Manager.py gedit-2.30.1/plugins/snippets/snippets/Manager.py
--- gedit-2.30.0git20100413/plugins/snippets/snippets/Manager.py	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/plugins/snippets/snippets/Manager.py	2010-04-17 19:21:14.000000000 +0200
@@ -319,8 +319,11 @@
                         source_view.get_buffer().set_highlight_syntax(True)
                         source_view.get_buffer().set_language(lang)
                         self.snippets_doc = Document(None, source_view)
-                                
-                entry = self['combo_drop_targets'].child
+
+                combo = self['combo_drop_targets']
+                combo.set_text_column(0)
+
+                entry = combo.child
                 entry.connect('focus-out-event', self.on_entry_drop_targets_focus_out)
                 entry.connect('drag-data-received', self.on_entry_drop_targets_drag_data_received)
                 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/plugins/spell/gedit-automatic-spell-checker.c gedit-2.30.1/plugins/spell/gedit-automatic-spell-checker.c
--- gedit-2.30.0git20100413/plugins/spell/gedit-automatic-spell-checker.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/plugins/spell/gedit-automatic-spell-checker.c	2010-04-17 19:21:14.000000000 +0200
@@ -690,6 +690,22 @@
 	tag_table_changed (table, spell);
 }
 
+static void
+highlight_updated (GtkSourceBuffer            *buffer,
+                   GtkTextIter                *start,
+                   GtkTextIter                *end,
+                   GeditAutomaticSpellChecker *spell)
+{
+	check_range (spell, *start, *end, FALSE);
+}
+
+static void
+spell_tag_destroyed (GeditAutomaticSpellChecker *spell,
+                     GObject                    *where_the_object_was)
+{
+	spell->tag_highlight = NULL;
+}
+
 GeditAutomaticSpellChecker *
 gedit_automatic_spell_checker_new (GeditDocument     *doc,
 				   GeditSpellChecker *checker)
@@ -741,6 +757,11 @@
 			  G_CALLBACK (mark_set), 
 			  spell);
 
+	g_signal_connect (doc,
+	                  "highlight-updated",
+	                  G_CALLBACK (highlight_updated),
+	                  spell);
+
 	g_signal_connect (spell->spell_checker,
 			  "add_word_to_session",
 			  G_CALLBACK (add_word_signal_cb),
@@ -764,6 +785,10 @@
 				"underline", PANGO_UNDERLINE_ERROR,
 				NULL);
 
+	g_object_weak_ref (G_OBJECT (spell->tag_highlight),
+	                   (GWeakNotify)spell_tag_destroyed,
+	                   spell);
+
 	tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (doc));
 
 	gtk_text_tag_set_priority (spell->tag_highlight, 
@@ -879,7 +904,7 @@
 
 	table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (spell->doc));
 
-	if (table != NULL)
+	if (table != NULL && spell->tag_highlight != NULL)
 	{
 		gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (spell->doc), 
 					    &start, 
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/plugins/spell/gedit-spell-plugin.c gedit-2.30.1/plugins/spell/gedit-spell-plugin.c
--- gedit-2.30.0git20100413/plugins/spell/gedit-spell-plugin.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/plugins/spell/gedit-spell-plugin.c	2010-04-18 14:42:56.000000000 +0200
@@ -157,6 +157,29 @@
 				     key, NULL);
 }
 
+static void
+set_language_from_metadata (GeditSpellChecker *spell,
+			    GeditDocument     *doc)
+{
+	const GeditSpellCheckerLanguage *lang = NULL;
+	gchar *value = NULL;
+
+	value = gedit_document_get_metadata (doc, GEDIT_METADATA_ATTRIBUTE_SPELL_LANGUAGE);
+
+	if (value != NULL)
+	{
+		lang = gedit_spell_checker_language_from_key (value);
+		g_free (value);
+	}
+
+	if (lang != NULL)
+	{
+		g_signal_handlers_block_by_func (spell, set_spell_language_cb, doc);
+		gedit_spell_checker_set_language (spell, lang);
+		g_signal_handlers_unblock_by_func (spell, set_spell_language_cb, doc);
+	}
+}
+
 static GeditSpellChecker *
 get_spell_checker_from_document (GeditDocument *doc)
 {
@@ -171,23 +194,9 @@
 
 	if (data == NULL)
 	{
-		const GeditSpellCheckerLanguage *lang = NULL;
-		gchar *value = NULL;
-
 		spell = gedit_spell_checker_new ();
 
-		value = gedit_document_get_metadata (doc, GEDIT_METADATA_ATTRIBUTE_SPELL_LANGUAGE);
-
-		if (value != NULL)
-		{
-			lang = gedit_spell_checker_language_from_key (value);
-			g_free (value);
-		}
-
-		if (lang != NULL)
-		{
-			gedit_spell_checker_set_language (spell, lang);
-		}
+		set_language_from_metadata (spell, doc);
 
 		g_object_set_qdata_full (G_OBJECT (doc), 
 					 spell_checker_id, 
@@ -969,14 +978,59 @@
 {
 	if (error == NULL)
 	{
-		WindowData *data = g_object_get_data (G_OBJECT (window),
-						      WINDOW_DATA_KEY);
-	
+		WindowData *data;
+		GeditSpellChecker *spell;
+
+		spell = GEDIT_SPELL_CHECKER (g_object_get_qdata (G_OBJECT (doc),
+								 spell_checker_id));
+		if (spell != NULL)
+		{
+			set_language_from_metadata (spell, doc);
+		}
+
+		data = g_object_get_data (G_OBJECT (window),
+					  WINDOW_DATA_KEY);
+
 		set_auto_spell_from_metadata (window, doc, data->action_group);
 	}
 }
 
 static void
+on_document_saved (GeditDocument *doc,
+		   const GError  *error,
+		   GeditWindow   *window)
+{
+	GeditAutomaticSpellChecker *autospell;
+	GeditSpellChecker *spell;
+	const gchar *key;
+
+	if (error != NULL)
+	{
+		return;
+	}
+
+	/* Make sure to save the metadata here too */
+	autospell = gedit_automatic_spell_checker_get_from_document (doc);
+	spell = GEDIT_SPELL_CHECKER (g_object_get_qdata (G_OBJECT (doc), spell_checker_id));
+
+	if (spell != NULL)
+	{
+		key = gedit_spell_checker_language_to_key (gedit_spell_checker_get_language (spell));
+	}
+	else
+	{
+		key = NULL;
+	}
+
+	gedit_document_set_metadata (doc,
+	                             GEDIT_METADATA_ATTRIBUTE_SPELL_ENABLED,
+	                             autospell != NULL ? "1" : NULL,
+	                             GEDIT_METADATA_ATTRIBUTE_LANGUAGE,
+	                             key,
+	                             NULL);
+}
+
+static void
 tab_added_cb (GeditWindow *window,
 	      GeditTab    *tab,
 	      gpointer     useless)
@@ -990,6 +1044,10 @@
 	g_signal_connect (doc, "loaded",
 			  G_CALLBACK (on_document_loaded),
 			  window);
+
+	g_signal_connect (doc, "saved",
+			  G_CALLBACK (on_document_saved),
+			  window);
 }
 
 static void
@@ -1004,6 +1062,7 @@
 	view = gedit_tab_get_view (tab);
 	
 	g_signal_handlers_disconnect_by_func (doc, on_document_loaded, window);
+	g_signal_handlers_disconnect_by_func (doc, on_document_saved, window);
 }
 
 static void
@@ -1079,8 +1138,18 @@
 	docs = gedit_window_get_documents (window);
 	for (l = docs; l != NULL; l = g_list_next (l))
 	{
-		set_auto_spell_from_metadata (window, GEDIT_DOCUMENT (l->data),
+		GeditDocument *doc = GEDIT_DOCUMENT (l->data);
+
+		set_auto_spell_from_metadata (window, doc,
 					      data->action_group);
+
+		g_signal_handlers_disconnect_by_func (doc,
+		                                      on_document_loaded,
+		                                      window);
+
+		g_signal_handlers_disconnect_by_func (doc,
+		                                      on_document_saved,
+		                                      window);
 	}
 
 	data->tab_added_id =
Les fichiers binaires /tmp/NfisFg1VIM/gedit-2.30.0git20100413/plugins/taglist/HTML.tags.gz et /tmp/cLwZRZPv4S/gedit-2.30.1/plugins/taglist/HTML.tags.gz sont différents.
Les fichiers binaires /tmp/NfisFg1VIM/gedit-2.30.0git20100413/plugins/taglist/Latex.tags.gz et /tmp/cLwZRZPv4S/gedit-2.30.1/plugins/taglist/Latex.tags.gz sont différents.
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/plugins/taglist/taglist.gedit-plugin gedit-2.30.1/plugins/taglist/taglist.gedit-plugin
--- gedit-2.30.0git20100413/plugins/taglist/taglist.gedit-plugin	2010-04-14 16:30:09.000000000 +0200
+++ gedit-2.30.1/plugins/taglist/taglist.gedit-plugin	2010-04-18 14:48:33.000000000 +0200
@@ -88,6 +88,7 @@
 Description[ast]=Proporciona un métodu pa inxertar fácilmente nún documentu les etiquetes/cadenes más usaes ensin tener que tecleales.
 Description[bg]=Предоставя метод за лесно вкарване в документа на често използвани етикети/низове без нужда да се въвеждат отново.
 Description[bn]=নথির মধ্যে নিয়মিতরূপে ব্যবহৃত ট্যাগ/পংক্তি, টাইপ না করে সহজে সন্নিবেশ করার উপায় বিদ্যমান করে।
+Description[bn_IN]=ডকুমেন্টের মধ্যে নিয়মিতরূপে ব্যবহৃত ট্যাগ/পংক্তি, টাইপ না করে সহজে সন্নিবেশ করার উপায় উপলব্ধ করে।
 Description[ca]=Ofereix un mètode senzill per inserir en un document els marcadors/cadenes més utilitzades sense haver de teclejar-les.
 Description[crh]=Sıq qullanılğan nişanlarnıñ/tizgilerniñ tuşlamağa mecbur qalmadan bir vesiqağa qolayca qıstırılması içün bir usul temin eter.
 Description[cs]=Poskytuje možnost snadno do dokumentu vložit často používané značky/řetězce bez nutnosti je psát.
Les fichiers binaires /tmp/NfisFg1VIM/gedit-2.30.0git20100413/plugins/taglist/XSLT.tags.gz et /tmp/cLwZRZPv4S/gedit-2.30.1/plugins/taglist/XSLT.tags.gz sont différents.
Les fichiers binaires /tmp/NfisFg1VIM/gedit-2.30.0git20100413/plugins/taglist/XUL.tags.gz et /tmp/cLwZRZPv4S/gedit-2.30.1/plugins/taglist/XUL.tags.gz sont différents.
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/README gedit-2.30.1/README
--- gedit-2.30.0git20100413/README	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/README	2010-04-18 16:50:07.000000000 +0200
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 2.30.0 of gedit. gedit is a small and lightweight UTF-8 text 
+This is version 2.30.1 of gedit. gedit is a small and lightweight UTF-8 text 
 editor for the GNOME environment.
 
 gedit is part of GNOME and uses the latest GTK+ and GNOME libraries.
@@ -71,8 +71,8 @@
 
 Simple install procedure:
 
-  % gzip -cd gedit-2.30.0.tar.gz | tar xvf - 	# unpack the sources
-  % cd gedit-2.30.0				# change to the toplevel directory
+  % gzip -cd gedit-2.30.1.tar.gz | tar xvf - 	# unpack the sources
+  % cd gedit-2.30.1				# change to the toplevel directory
   % ./configure					# run the `configure' script
   % make					# build gedit
   [ Become root if necessary ]
diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po gedit-2.30.0git20100413/tests/document-saver.c gedit-2.30.1/tests/document-saver.c
--- gedit-2.30.0git20100413/tests/document-saver.c	2010-04-14 15:49:02.000000000 +0200
+++ gedit-2.30.1/tests/document-saver.c	2010-04-18 16:40:05.000000000 +0200
@@ -357,6 +357,7 @@
 	            saver_test_data_new (DEFAULT_REMOTE_URI, "hello world\n\n", NULL));
 }
 
+#ifndef G_OS_WIN32
 static void
 check_permissions (GFile *file,
                    guint  permissions)
@@ -452,6 +453,7 @@
 	test_permissions (DEFAULT_LOCAL_URI, 0666);
 	test_permissions (DEFAULT_LOCAL_URI, 0760);
 }
+#endif
 
 static void
 test_local_unowned_directory ()
@@ -467,15 +469,6 @@
 }
 
 static void
-test_remote_permissions ()
-{
-	test_permissions (DEFAULT_REMOTE_URI, 0600);
-	test_permissions (DEFAULT_REMOTE_URI, 0660);
-	test_permissions (DEFAULT_REMOTE_URI, 0666);
-	test_permissions (DEFAULT_REMOTE_URI, 0760);
-}
-
-static void
 test_remote_unowned_directory ()
 {
 	test_saver (UNOWNED_REMOTE_URI,
@@ -488,6 +481,16 @@
 	                                 NULL));
 }
 
+#ifndef G_OS_WIN32
+static void
+test_remote_permissions ()
+{
+	test_permissions (DEFAULT_REMOTE_URI, 0600);
+	test_permissions (DEFAULT_REMOTE_URI, 0660);
+	test_permissions (DEFAULT_REMOTE_URI, 0666);
+	test_permissions (DEFAULT_REMOTE_URI, 0760);
+}
+
 static void
 test_unowned_group_permissions (GeditDocument *document,
                                 GError        *error,
@@ -543,6 +546,8 @@
 	test_unowned_group (UNOWNED_GROUP_REMOTE_URI);
 }
 
+#endif
+
 static gboolean
 check_unowned_directory ()
 {
@@ -658,6 +663,7 @@
 		return FALSE;
 	}
 
+#ifndef G_OS_WIN32
 	if ((g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE) & ACCESSPERMS) != 0660)
 	{
 		g_object_unref (unowned);
@@ -666,6 +672,7 @@
 		g_object_unref (info);
 		return FALSE;
 	}
+#endif
 
 	g_object_unref (info);
 	g_object_unref (unowned);
@@ -692,21 +699,15 @@
 
 	g_test_add_func ("/document-saver/local", test_local);
 	g_test_add_func ("/document-saver/local-new-line", test_local_newline);
-	g_test_add_func ("/document-saver/local-permissions", test_local_permissions);
 
 	if (have_unowned)
 	{
 		g_test_add_func ("/document-saver/local-unowned-directory", test_local_unowned_directory);
 	}
 
-	if (have_unowned_group)
-	{
-		g_test_add_func ("/document-saver/local-unowned-group", test_local_unowned_group);
-	}
-
 	g_test_add_func ("/document-saver/remote", test_remote);
 	g_test_add_func ("/document-saver/remote-new-line", test_remote_newline);
-	g_test_add_func ("/document-saver/remote-permissions", test_remote_permissions);
+	
 
 	if (have_unowned)
 	{
@@ -719,5 +720,16 @@
 		/* g_test_add_func ("/document-saver/remote-unowned-group", test_remote_unowned_group); */
 	}
 
+#ifndef G_OS_WIN32
+	g_test_add_func ("/document-saver/local-permissions", test_local_permissions);
+
+	if (have_unowned_group)
+	{
+		g_test_add_func ("/document-saver/local-unowned-group", test_local_unowned_group);
+	}
+
+	g_test_add_func ("/document-saver/remote-permissions", test_remote_permissions);
+#endif
+
 	return g_test_run ();
 }