Merge lp:~noskcaj/ubuntu/vivid/gtksourceview3/3.14.3 into lp:ubuntu/vivid/gtksourceview3

[Jackson Doak]

New upstream bugfix release + upstream typo fix

[Iain Lane (laney)]

I'll take this in via Debian, but thanks!

Unmerged revisions

54. By Jackson Doak on 2015-02-25

Add git_fix_height_parameter.patch. Fix a typo saying width is height.

53. By Jackson Doak on 2015-02-25

New upstream release. LP: #1423016

=== added file '.pc/99_ltmain_as-needed.patch/.timestamp'
=== modified file 'NEWS'
--- NEWS	2014-10-13 20:29:35 +0000
+++ NEWS	2015-02-25 08:09:43 +0000
@@ -1,3 +1,13 @@
+News in 3.14.3
+--------------
+* Bug fixes
+* Translation updates
+
+News in 3.14.2
+--------------
+* Bug fix
+* Translation updates
+
 News in 3.14.1
 --------------
 * Fix UndoManager with a new implementation

=== modified file 'README'
--- README	2014-10-13 20:29:35 +0000
+++ README	2015-02-25 08:09:43 +0000
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 3.14.1 of GtkSourceView.
+This is version 3.14.3 of GtkSourceView.
 
 GtkSourceView is a text widget that extends the standard GTK+ text widget
 GtkTextView.
@@ -33,8 +33,8 @@
 
 Simple install procedure:
 
-  % tar Jxf gtksourceview-3.14.1.tar.xz    # unpack the sources
-  % cd gtksourceview-3.14.1		   # change to the toplevel directory
+  % tar Jxf gtksourceview-3.14.3.tar.xz    # unpack the sources
+  % cd gtksourceview-3.14.3		   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build gtksourceview
   [ Become root if necessary ]

=== modified file 'configure'
--- configure	2014-10-13 20:29:35 +0000
+++ configure	2015-02-25 08:09:43 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtksourceview 3.14.1.
+# Generated by GNU Autoconf 2.69 for gtksourceview 3.14.3.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='gtksourceview'
 PACKAGE_TARNAME='gtksourceview'
-PACKAGE_VERSION='3.14.1'
-PACKAGE_STRING='gtksourceview 3.14.1'
+PACKAGE_VERSION='3.14.3'
+PACKAGE_STRING='gtksourceview 3.14.3'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview'
 PACKAGE_URL='https://wiki.gnome.org/Projects/GtkSourceView'
 
@@ -1446,7 +1446,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 gtksourceview 3.14.1 to adapt to many kinds of systems.
+\`configure' configures gtksourceview 3.14.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1516,7 +1516,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gtksourceview 3.14.1:";;
+     short | recursive ) echo "Configuration of gtksourceview 3.14.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1658,7 +1658,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gtksourceview configure 3.14.1
+gtksourceview configure 3.14.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2027,7 +2027,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gtksourceview $as_me 3.14.1, which was
+It was created by gtksourceview $as_me 3.14.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2919,7 +2919,7 @@
 
 # Define the identity of the package.
  PACKAGE='gtksourceview'
- VERSION='3.14.1'
+ VERSION='3.14.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13569,20 +13569,20 @@
   as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
 fi
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.42.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.42.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   found_introspection=yes
 else
-  as_fn_error $? "You need to have gobject-introspection >= 0.9.0 installed to build gtksourceview" "$LINENO" 5
+  as_fn_error $? "You need to have gobject-introspection >= 1.42.0 installed to build gtksourceview" "$LINENO" 5
 fi
      ;; #(
       auto) :
             if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.42.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.42.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
@@ -14736,7 +14736,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gtksourceview $as_me 3.14.1, which was
+This file was extended by gtksourceview $as_me 3.14.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14803,7 +14803,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gtksourceview config.status 3.14.1
+gtksourceview config.status 3.14.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2014-10-13 20:29:35 +0000
+++ configure.ac	2015-02-25 08:09:43 +0000
@@ -4,7 +4,7 @@
 
 m4_define(gtksourceview_major_version, 3)
 m4_define(gtksourceview_minor_version, 14)
-m4_define(gtksourceview_micro_version, 1)
+m4_define(gtksourceview_micro_version, 3)
 m4_define(gtksourceview_version, gtksourceview_major_version.gtksourceview_minor_version.gtksourceview_micro_version)
 
 AC_INIT([gtksourceview],
@@ -160,7 +160,7 @@
 AC_SUBST(GDK_PIXBUF_PREFIX)
 
 # Introspection
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_CHECK([1.42.0])
 
 # Code coverage
 GNOME_CODE_COVERAGE

=== modified file 'data/language-specs/css.lang'
--- data/language-specs/css.lang	2014-10-13 20:29:35 +0000
+++ data/language-specs/css.lang	2015-02-25 08:09:43 +0000
@@ -303,6 +303,7 @@
       <keyword>block</keyword>
       <keyword>bolder</keyword>
       <keyword>bold</keyword>
+      <keyword>both</keyword>
       <keyword>bottom</keyword>
       <keyword>capitalize</keyword>
       <keyword>center-left</keyword>

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-13 20:29:35 +0000
+++ debian/changelog	2015-02-25 08:09:43 +0000
@@ -1,3 +1,10 @@
+gtksourceview3 (3.14.3-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release. LP: #1423016
+  * Add git_fix_height_parameter.patch. Fix a typo saying width is height.
+
+ -- Jackson Doak <[e-mail]>  Wed, 25 Feb 2015 18:30:03 +1100
+
 gtksourceview3 (3.14.1-1) unstable; urgency=medium
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2014-10-13 20:29:35 +0000
+++ debian/control	2015-02-25 08:09:43 +0000
@@ -5,7 +5,8 @@
 Source: gtksourceview3
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Andreas Henriksson <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.93),

=== modified file 'debian/control.in'
--- debian/control.in	2014-10-13 20:29:35 +0000
+++ debian/control.in	2015-02-25 08:09:43 +0000
@@ -1,7 +1,8 @@
 Source: gtksourceview3
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.93),

=== added file 'debian/patches/git_fix_height_parameter.patch'
--- debian/patches/git_fix_height_parameter.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_fix_height_parameter.patch	2015-02-25 08:09:43 +0000
@@ -0,0 +1,24 @@
+From 5cef37b6bef9af44292b3707d1e2b120fe4b7f4c Mon Sep 17 00:00:00 2001
+From: Maks Naumov <[e-mail]>
+Date: Sat, 10 Jan 2015 04:22:11 -0800
+Subject: Fix height parameter calculation in gutter_renderer_pixbuf_draw()
+
+Signed-off-by: Maks Naumov <[e-mail]>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742705
+
+diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c
+index bb3cce1..531698b 100644
+--- a/gtksourceview/gtksourcegutterrendererpixbuf.c
++++ b/gtksourceview/gtksourcegutterrendererpixbuf.c
+@@ -115,7 +115,7 @@ gutter_renderer_pixbuf_draw (GtkSourceGutterRenderer      *renderer,
+ 	}
+ 
+ 	width = gdk_pixbuf_get_width (pixbuf);
+-	height = gdk_pixbuf_get_width (pixbuf);
++	height = gdk_pixbuf_get_height (pixbuf);
+ 
+ 	gtk_source_gutter_renderer_get_alignment (renderer,
+ 	                                          &xalign,
+-- 
+cgit v0.10.2

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-07 11:31:02 +0000
+++ debian/patches/series	2015-02-25 08:09:43 +0000
@@ -1,1 +1,2 @@
 99_ltmain_as-needed.patch
+git_fix_height_parameter.patch

=== modified file 'docs/reference/Makefile.in'
--- docs/reference/Makefile.in	2014-10-13 20:29:35 +0000
+++ docs/reference/Makefile.in	2015-02-25 08:09:43 +0000
@@ -397,6 +397,7 @@
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -684,7 +685,7 @@
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
 	            destdir=`dirname $(abs_builddir)/$$file`; \
@@ -733,7 +734,7 @@
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
@@ -759,7 +760,7 @@
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
@@ -788,12 +789,15 @@
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:

=== modified file 'docs/reference/html/GtkSourceBuffer.html'
--- docs/reference/html/GtkSourceBuffer.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceBuffer.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceBuffer</title>
+<title>GtkSourceBuffer: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -389,27 +389,27 @@
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceBuffer.html#GtkSourceBuffer-bracket-matched" title="The “bracket-matched” signal">bracket-matched</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceBuffer.html#GtkSourceBuffer-highlight-updated" title="The “highlight-updated” signal">highlight-updated</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceBuffer.html#GtkSourceBuffer-redo" title="The “redo” signal">redo</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceBuffer.html#GtkSourceBuffer-source-mark-updated" title="The “source-mark-updated” signal">source-mark-updated</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceBuffer.html#GtkSourceBuffer-undo" title="The “undo” signal">undo</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -1978,7 +1978,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 <p class="since">Since 2.12</p>
 </div>
 <hr>
@@ -2026,7 +2026,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2057,7 +2057,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2096,7 +2096,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -2128,7 +2128,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 </div>
 <div class="refsect1">

=== modified file 'docs/reference/html/GtkSourceCompletion.html'
--- docs/reference/html/GtkSourceCompletion.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceCompletion.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletion</title>
+<title>GtkSourceCompletion: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -204,32 +204,32 @@
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion-activate-proposal" title="The “activate-proposal” signal">activate-proposal</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion-hide" title="The “hide” signal">hide</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion-move-cursor" title="The “move-cursor” signal">move-cursor</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion-move-page" title="The “move-page” signal">move-page</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion-populate-context" title="The “populate-context” signal">populate-context</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion-show" title="The “show” signal">show</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -905,7 +905,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -937,7 +937,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -955,7 +955,7 @@
 <span class="keycap"><strong>Home</strong></span> and <span class="keycap"><strong>End</strong></span> keys are bound to the
 <p>normal behavior expected by those keys.</p>
 <p>When <em class="parameter"><code>step</code></em>
- is equal to <code class="literal">GTK_SCROLL_PAGES</code>, the page size is defined by
+ is equal to <a href="http://developer.gnome.org/gtk2/gtk3-Standard-Enumerations.html#GTK-SCROLL-PAGES:CAPS"><code class="literal">GTK_SCROLL_PAGES</code></a>, the page size is defined by
 the <a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion--proposal-page-size" title="The “proposal-page-size” property"><span class="type">“proposal-page-size”</span></a> property. It is used for
 the <span class="keycap"><strong>PageDown</strong></span> and <span class="keycap"><strong>PageUp</strong></span> keys.</p>
 <p>Applications should not connect to it, but may emit it with
@@ -993,7 +993,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1011,7 +1011,7 @@
 <span class="keycap"><strong>Control</strong></span>+<span class="keycap"><strong>Home</strong></span><p>is for displaying all the providers.</p>
 <span class="keycap"><strong>Control</strong></span>+<span class="keycap"><strong>End</strong></span><p>is for going to the last provider.</p>
 <p>When <em class="parameter"><code>step</code></em>
- is equal to <span class="type">GTK_SCROLL_PAGES</span>, the page size is defined by
+ is equal to <a href="http://developer.gnome.org/gtk2/gtk3-Standard-Enumerations.html#GTK-SCROLL-PAGES:CAPS"><span class="type">GTK_SCROLL_PAGES</span></a>, the page size is defined by
 the <a class="link" href="GtkSourceCompletion.html#GtkSourceCompletion--provider-page-size" title="The “provider-page-size” property"><span class="type">“provider-page-size”</span></a> property.</p>
 <p>Applications should not connect to it, but may emit it with
 <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#g-signal-emit-by-name"><code class="function">g_signal_emit_by_name()</code></a> if they need to control the page selection
@@ -1048,7 +1048,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1086,7 +1086,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1118,7 +1118,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 </div>
 </div>

=== modified file 'docs/reference/html/GtkSourceCompletionContext.html'
--- docs/reference/html/GtkSourceCompletionContext.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceCompletionContext.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletionContext</title>
+<title>GtkSourceCompletionContext: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -109,7 +109,7 @@
 <tbody><tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletionContext.html#GtkSourceCompletionContext-cancelled" title="The “cancelled” signal">cancelled</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -386,7 +386,7 @@
 </tr></tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 </div>
 </div>

=== modified file 'docs/reference/html/GtkSourceCompletionInfo.html'
--- docs/reference/html/GtkSourceCompletionInfo.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceCompletionInfo.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletionInfo</title>
+<title>GtkSourceCompletionInfo: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -88,7 +88,7 @@
 <tbody><tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletionInfo.html#GtkSourceCompletionInfo-before-show" title="The “before-show” signal">before-show</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -337,7 +337,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 </div>
 </div>

=== modified file 'docs/reference/html/GtkSourceCompletionItem.html'
--- docs/reference/html/GtkSourceCompletionItem.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceCompletionItem.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletionItem</title>
+<title>GtkSourceCompletionItem: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceCompletionProposal.html'
--- docs/reference/html/GtkSourceCompletionProposal.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceCompletionProposal.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletionProposal</title>
+<title>GtkSourceCompletionProposal: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -121,7 +121,7 @@
 <tbody><tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceCompletionProposal.html#GtkSourceCompletionProposal-changed" title="The “changed” signal">changed</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -561,7 +561,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 </div>
 </div>

=== modified file 'docs/reference/html/GtkSourceCompletionProvider.html'
--- docs/reference/html/GtkSourceCompletionProvider.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceCompletionProvider.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletionProvider</title>
+<title>GtkSourceCompletionProvider: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -482,8 +482,8 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>iter</p></td>
-<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkTextIter.html"><span class="type">GtkTextIter</span></a>.</p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_description"><p> a <a href="http://developer.gnome.org/gtk2/GtkTextIter.html"><span class="type">GtkTextIter</span></a>. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>

=== modified file 'docs/reference/html/GtkSourceCompletionWords.html'
--- docs/reference/html/GtkSourceCompletionWords.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceCompletionWords.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceCompletionWords</title>
+<title>GtkSourceCompletionWords: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceEncoding.html'
--- docs/reference/html/GtkSourceEncoding.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceEncoding.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceEncoding</title>
+<title>GtkSourceEncoding: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceFile.html'
--- docs/reference/html/GtkSourceFile.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceFile.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceFile</title>
+<title>GtkSourceFile: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceFileLoader.html'
--- docs/reference/html/GtkSourceFileLoader.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceFileLoader.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceFileLoader</title>
+<title>GtkSourceFileLoader: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceFileSaver.html'
--- docs/reference/html/GtkSourceFileSaver.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceFileSaver.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceFileSaver</title>
+<title>GtkSourceFileSaver: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceGutter.html'
--- docs/reference/html/GtkSourceGutter.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceGutter.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceGutter</title>
+<title>GtkSourceGutter: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceGutterRenderer.html'
--- docs/reference/html/GtkSourceGutterRenderer.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceGutterRenderer.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceGutterRenderer</title>
+<title>GtkSourceGutterRenderer: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -302,27 +302,27 @@
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceGutterRenderer.html#GtkSourceGutterRenderer-activate" title="The “activate” signal">activate</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a></td>
 <td class="signal_name"><a class="link" href="GtkSourceGutterRenderer.html#GtkSourceGutterRenderer-query-activatable" title="The “query-activatable” signal">query-activatable</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceGutterRenderer.html#GtkSourceGutterRenderer-query-data" title="The “query-data” signal">query-data</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a></td>
 <td class="signal_name"><a class="link" href="GtkSourceGutterRenderer.html#GtkSourceGutterRenderer-query-tooltip" title="The “query-tooltip” signal">query-tooltip</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceGutterRenderer.html#GtkSourceGutterRenderer-queue-draw" title="The “queue-draw” signal">queue-draw</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -1487,7 +1487,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1537,7 +1537,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1589,7 +1589,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1651,7 +1651,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1685,7 +1685,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 </div>
 <div class="refsect1">

=== modified file 'docs/reference/html/GtkSourceGutterRendererPixbuf.html'
--- docs/reference/html/GtkSourceGutterRendererPixbuf.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceGutterRendererPixbuf.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceGutterRendererPixbuf</title>
+<title>GtkSourceGutterRendererPixbuf: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceGutterRendererText.html'
--- docs/reference/html/GtkSourceGutterRendererText.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceGutterRendererText.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceGutterRendererText</title>
+<title>GtkSourceGutterRendererText: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceLanguage.html'
--- docs/reference/html/GtkSourceLanguage.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceLanguage.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceLanguage</title>
+<title>GtkSourceLanguage: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceLanguageManager.html'
--- docs/reference/html/GtkSourceLanguageManager.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceLanguageManager.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceLanguageManager</title>
+<title>GtkSourceLanguageManager: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceMark.html'
--- docs/reference/html/GtkSourceMark.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceMark.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceMark</title>
+<title>GtkSourceMark: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceMarkAttributes.html'
--- docs/reference/html/GtkSourceMarkAttributes.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceMarkAttributes.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceMarkAttributes</title>
+<title>GtkSourceMarkAttributes: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -208,13 +208,13 @@
 <td class="signal_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a>*</td>
 <td class="signal_name"><a class="link" href="GtkSourceMarkAttributes.html#GtkSourceMarkAttributes-query-tooltip-markup" title="The “query-tooltip-markup” signal">query-tooltip-markup</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a>*</td>
 <td class="signal_name"><a class="link" href="GtkSourceMarkAttributes.html#GtkSourceMarkAttributes-query-tooltip-text" title="The “query-tooltip-text” signal">query-tooltip-text</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -837,7 +837,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a> when done with it. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -882,7 +882,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a> when done with it. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 </div>
 <div class="refsect1">

=== modified file 'docs/reference/html/GtkSourcePrintCompositor.html'
--- docs/reference/html/GtkSourcePrintCompositor.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourcePrintCompositor.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourcePrintCompositor</title>
+<title>GtkSourcePrintCompositor: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceSearchContext.html'
--- docs/reference/html/GtkSourceSearchContext.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceSearchContext.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceSearchContext</title>
+<title>GtkSourceSearchContext: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceSearchSettings.html'
--- docs/reference/html/GtkSourceSearchSettings.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/GtkSourceSearchSettings.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceSearchSettings</title>
+<title>GtkSourceSearchSettings: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceStyle.html'
--- docs/reference/html/GtkSourceStyle.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceStyle.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceStyle</title>
+<title>GtkSourceStyle: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceStyleScheme.html'
--- docs/reference/html/GtkSourceStyleScheme.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceStyleScheme.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceStyleScheme</title>
+<title>GtkSourceStyleScheme: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceStyleSchemeManager.html'
--- docs/reference/html/GtkSourceStyleSchemeManager.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceStyleSchemeManager.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceStyleSchemeManager</title>
+<title>GtkSourceStyleSchemeManager: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/GtkSourceUndoManager.html'
--- docs/reference/html/GtkSourceUndoManager.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceUndoManager.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceUndoManager</title>
+<title>GtkSourceUndoManager: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -121,12 +121,12 @@
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceUndoManager.html#GtkSourceUndoManager-can-redo-changed" title="The “can-redo-changed” signal">can-redo-changed</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceUndoManager.html#GtkSourceUndoManager-can-undo-changed" title="The “can-undo-changed” signal">can-undo-changed</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -414,7 +414,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 <p class="since">Since 2.10</p>
 </div>
 <hr>
@@ -446,7 +446,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 <p class="since">Since 2.10</p>
 </div>
 </div>

=== modified file 'docs/reference/html/GtkSourceView.html'
--- docs/reference/html/GtkSourceView.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/GtkSourceView.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceView</title>
+<title>GtkSourceView: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">
@@ -384,37 +384,37 @@
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-line-mark-activated" title="The “line-mark-activated” signal">line-mark-activated</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-move-lines" title="The “move-lines” signal">move-lines</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-move-words" title="The “move-words” signal">move-words</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-redo" title="The “redo” signal">redo</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-show-completion" title="The “show-completion” signal">show-completion</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-smart-home-end" title="The “smart-home-end” signal">smart-home-end</a></td>
-<td class="signal_flags">Run Last</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></td>
 </tr>
 <tr>
 <td class="signal_type"><span class="returnvalue">void</span></td>
 <td class="signal_name"><a class="link" href="GtkSourceView.html#GtkSourceView-undo" title="The “undo” signal">undo</a></td>
-<td class="signal_flags">Action</td>
+<td class="signal_flags"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></td>
 </tr>
 </tbody>
 </table></div>
@@ -1781,7 +1781,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1831,7 +1831,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 <p class="since">Since 2.10</p>
 </div>
 <hr>
@@ -1872,7 +1872,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 <p class="since">Since 3.0</p>
 </div>
 <hr>
@@ -1881,7 +1881,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a> *sourceview,
                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)</pre>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1919,7 +1919,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1966,7 +1966,7 @@
 </tbody>
 </table></div>
 </div>
-<p>Flags: Run Last</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS">Run Last</a></p>
 <p class="since">Since 3.0</p>
 </div>
 <hr>
@@ -1975,7 +1975,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>
 user_function (<a class="link" href="GtkSourceView.html" title="GtkSourceView"><span class="type">GtkSourceView</span></a> *sourceview,
                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>       user_data)</pre>
-<p>Flags: Action</p>
+<p>Flags: <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#G-SIGNAL-ACTION:CAPS">Action</a></p>
 </div>
 </div>
 <div class="refsect1">

=== modified file 'docs/reference/html/annotation-glossary.html'
--- docs/reference/html/annotation-glossary.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/annotation-glossary.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Annotation Glossary</title>
+<title>Annotation Glossary: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-3-0.html'
--- docs/reference/html/api-index-3-0.html	2014-09-01 06:36:09 +0000
+++ docs/reference/html/api-index-3-0.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of new symbols in 3.0</title>
+<title>Index of new symbols in 3.0: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-3-10.html'
--- docs/reference/html/api-index-3-10.html	2014-08-28 16:27:35 +0000
+++ docs/reference/html/api-index-3-10.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of new symbols in 3.10</title>
+<title>Index of new symbols in 3.10: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-3-12.html'
--- docs/reference/html/api-index-3-12.html	2014-09-06 11:24:17 +0000
+++ docs/reference/html/api-index-3-12.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of new symbols in 3.12</title>
+<title>Index of new symbols in 3.12: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-3-14.html'
--- docs/reference/html/api-index-3-14.html	2014-09-06 11:24:17 +0000
+++ docs/reference/html/api-index-3-14.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of new symbols in 3.14</title>
+<title>Index of new symbols in 3.14: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-3-4.html'
--- docs/reference/html/api-index-3-4.html	2014-08-28 16:27:35 +0000
+++ docs/reference/html/api-index-3-4.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of new symbols in 3.4</title>
+<title>Index of new symbols in 3.4: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-deprecated.html'
--- docs/reference/html/api-index-deprecated.html	2014-09-01 06:36:09 +0000
+++ docs/reference/html/api-index-deprecated.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of deprecated symbols</title>
+<title>Index of deprecated symbols: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/api-index-full.html'
--- docs/reference/html/api-index-full.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/api-index-full.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Index of all symbols</title>
+<title>Index of all symbols: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/ch01.html'
--- docs/reference/html/ch01.html	2014-09-06 11:24:17 +0000
+++ docs/reference/html/ch01.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: API reference</title>
+<title>API reference: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/ch02.html'
--- docs/reference/html/ch02.html	2014-08-28 16:27:35 +0000
+++ docs/reference/html/ch02.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Syntax highlighting reference</title>
+<title>Syntax highlighting reference: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/gtksourceview-3.0-GtkSourceUtils.html'
--- docs/reference/html/gtksourceview-3.0-GtkSourceUtils.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/gtksourceview-3.0-GtkSourceUtils.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: GtkSourceUtils</title>
+<title>GtkSourceUtils: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch01.html" title="API reference">

=== modified file 'docs/reference/html/gtksourceview-3.0.devhelp2'
--- docs/reference/html/gtksourceview-3.0.devhelp2	2014-10-13 20:29:35 +0000
+++ docs/reference/html/gtksourceview-3.0.devhelp2	2015-02-25 08:09:43 +0000
@@ -597,5 +597,53 @@
     <keyword type="" name="Sub-pattern contexts" link="lang-reference.html#id-1.3.3.13.7"/>
     <keyword type="" name="Reference contexts" link="lang-reference.html#id-1.3.3.13.8"/>
     <keyword type="" name="Keyword contexts" link="lang-reference.html#id-1.3.3.13.9"/>
+    <keyword type="constant" name="GTK_SOURCE_BRACKET_MATCH_NONE" link="GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-NONE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_BRACKET_MATCH_OUT_OF_RANGE" link="GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-OUT-OF-RANGE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_BRACKET_MATCH_NOT_FOUND" link="GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_BRACKET_MATCH_FOUND" link="GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-FOUND:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_CHANGE_CASE_LOWER" link="GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-LOWER:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_CHANGE_CASE_UPPER" link="GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-UPPER:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_CHANGE_CASE_TOGGLE" link="GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-TOGGLE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_CHANGE_CASE_TITLE" link="GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-TITLE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPLETION_ERROR_ALREADY_BOUND" link="GtkSourceCompletion.html#GTK-SOURCE-COMPLETION-ERROR-ALREADY-BOUND:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPLETION_ERROR_NOT_BOUND" link="GtkSourceCompletion.html#GTK-SOURCE-COMPLETION-ERROR-NOT-BOUND:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPLETION_ACTIVATION_NONE" link="GtkSourceCompletionContext.html#GTK-SOURCE-COMPLETION-ACTIVATION-NONE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPLETION_ACTIVATION_INTERACTIVE" link="GtkSourceCompletionContext.html#GTK-SOURCE-COMPLETION-ACTIVATION-INTERACTIVE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPLETION_ACTIVATION_USER_REQUESTED" link="GtkSourceCompletionContext.html#GTK-SOURCE-COMPLETION-ACTIVATION-USER-REQUESTED:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_NEWLINE_TYPE_LF" link="GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-LF:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_NEWLINE_TYPE_CR" link="GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-CR:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_NEWLINE_TYPE_CR_LF" link="GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-CR-LF:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPRESSION_TYPE_NONE" link="GtkSourceFile.html#GTK-SOURCE-COMPRESSION-TYPE-NONE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_COMPRESSION_TYPE_GZIP" link="GtkSourceFile.html#GTK-SOURCE-COMPRESSION-TYPE-GZIP:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_LOADER_ERROR_TOO_BIG" link="GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR-TOO-BIG:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_LOADER_ERROR_ENCODING_AUTO_DETECTION_FAILED" link="GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR-ENCODING-AUTO-DETECTION-FAILED:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_LOADER_ERROR_CONVERSION_FALLBACK" link="GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR-CONVERSION-FALLBACK:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_SAVER_ERROR_INVALID_CHARS" link="GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-ERROR-INVALID-CHARS:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_SAVER_ERROR_EXTERNALLY_MODIFIED" link="GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-ERROR-EXTERNALLY-MODIFIED:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_SAVER_FLAGS_NONE" link="GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-NONE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_INVALID_CHARS" link="GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-IGNORE-INVALID-CHARS:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_MODIFICATION_TIME" link="GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-IGNORE-MODIFICATION-TIME:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP" link="GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-CREATE-BACKUP:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_STATE_NORMAL" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-NORMAL:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-CURSOR:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_STATE_PRELIT" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-PRELIT:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_STATE_SELECTED" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-SELECTED:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_CELL" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-CELL:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_FIRST" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-FIRST:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_LAST" link="GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-LAST:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_SMART_HOME_END_DISABLED" link="GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-DISABLED:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_SMART_HOME_END_BEFORE" link="GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-BEFORE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_SMART_HOME_END_AFTER" link="GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-AFTER:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_SMART_HOME_END_ALWAYS" link="GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-ALWAYS:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_SPACE" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-SPACE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_TAB" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-TAB:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_NEWLINE" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-NEWLINE:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_NBSP" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-NBSP:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_LEADING" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-LEADING:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_TEXT" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-TEXT:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_TRAILING" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-TRAILING:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_DRAW_SPACES_ALL" link="GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-ALL:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_VIEW_GUTTER_POSITION_LINES" link="GtkSourceView.html#GTK-SOURCE-VIEW-GUTTER-POSITION-LINES:CAPS"/>
+    <keyword type="constant" name="GTK_SOURCE_VIEW_GUTTER_POSITION_MARKS" link="GtkSourceView.html#GTK-SOURCE-VIEW-GUTTER-POSITION-MARKS:CAPS"/>
   </functions>
 </book>

=== modified file 'docs/reference/html/index.html'
--- docs/reference/html/index.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/index.html	2015-02-25 08:09:43 +0000
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GtkSourceView 3 Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for GtkSourceView 3.14.1
+<div><p class="releaseinfo">for GtkSourceView 3.14.3
 </p></div>
 </div>
 <hr>

=== modified file 'docs/reference/html/index.sgml'
--- docs/reference/html/index.sgml	2014-10-13 20:29:35 +0000
+++ docs/reference/html/index.sgml	2015-02-25 08:09:43 +0000
@@ -44,7 +44,15 @@
 <ANCHOR id="GtkSourceBuffer.other_details" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceBuffer.other_details">
 <ANCHOR id="GtkSourceBuffer-struct" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceBuffer-struct">
 <ANCHOR id="GtkSourceBracketMatchType" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceBracketMatchType">
+<ANCHOR id="GTK-SOURCE-BRACKET-MATCH-NONE:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-NONE:CAPS">
+<ANCHOR id="GTK-SOURCE-BRACKET-MATCH-OUT-OF-RANGE:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-OUT-OF-RANGE:CAPS">
+<ANCHOR id="GTK-SOURCE-BRACKET-MATCH-NOT-FOUND:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-NOT-FOUND:CAPS">
+<ANCHOR id="GTK-SOURCE-BRACKET-MATCH-FOUND:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-BRACKET-MATCH-FOUND:CAPS">
 <ANCHOR id="GtkSourceChangeCaseType" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceChangeCaseType">
+<ANCHOR id="GTK-SOURCE-CHANGE-CASE-LOWER:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-LOWER:CAPS">
+<ANCHOR id="GTK-SOURCE-CHANGE-CASE-UPPER:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-UPPER:CAPS">
+<ANCHOR id="GTK-SOURCE-CHANGE-CASE-TOGGLE:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-TOGGLE:CAPS">
+<ANCHOR id="GTK-SOURCE-CHANGE-CASE-TITLE:CAPS" href="gtksourceview-3.0/GtkSourceBuffer.html#GTK-SOURCE-CHANGE-CASE-TITLE:CAPS">
 <ANCHOR id="GtkSourceBuffer.property-details" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceBuffer.property-details">
 <ANCHOR id="GtkSourceBuffer--can-redo" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceBuffer--can-redo">
 <ANCHOR id="GtkSourceBuffer--can-undo" href="gtksourceview-3.0/GtkSourceBuffer.html#GtkSourceBuffer--can-undo">
@@ -87,6 +95,8 @@
 <ANCHOR id="GtkSourceCompletion-struct" href="gtksourceview-3.0/GtkSourceCompletion.html#GtkSourceCompletion-struct">
 <ANCHOR id="GTK-SOURCE-COMPLETION-ERROR:CAPS" href="gtksourceview-3.0/GtkSourceCompletion.html#GTK-SOURCE-COMPLETION-ERROR:CAPS">
 <ANCHOR id="GtkSourceCompletionError" href="gtksourceview-3.0/GtkSourceCompletion.html#GtkSourceCompletionError">
+<ANCHOR id="GTK-SOURCE-COMPLETION-ERROR-ALREADY-BOUND:CAPS" href="gtksourceview-3.0/GtkSourceCompletion.html#GTK-SOURCE-COMPLETION-ERROR-ALREADY-BOUND:CAPS">
+<ANCHOR id="GTK-SOURCE-COMPLETION-ERROR-NOT-BOUND:CAPS" href="gtksourceview-3.0/GtkSourceCompletion.html#GTK-SOURCE-COMPLETION-ERROR-NOT-BOUND:CAPS">
 <ANCHOR id="GtkSourceCompletion.property-details" href="gtksourceview-3.0/GtkSourceCompletion.html#GtkSourceCompletion.property-details">
 <ANCHOR id="GtkSourceCompletion--accelerators" href="gtksourceview-3.0/GtkSourceCompletion.html#GtkSourceCompletion--accelerators">
 <ANCHOR id="GtkSourceCompletion--auto-complete-delay" href="gtksourceview-3.0/GtkSourceCompletion.html#GtkSourceCompletion--auto-complete-delay">
@@ -118,6 +128,9 @@
 <ANCHOR id="gtk-source-completion-context-get-activation" href="gtksourceview-3.0/GtkSourceCompletionContext.html#gtk-source-completion-context-get-activation">
 <ANCHOR id="GtkSourceCompletionContext.other_details" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GtkSourceCompletionContext.other_details">
 <ANCHOR id="GtkSourceCompletionActivation" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GtkSourceCompletionActivation">
+<ANCHOR id="GTK-SOURCE-COMPLETION-ACTIVATION-NONE:CAPS" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GTK-SOURCE-COMPLETION-ACTIVATION-NONE:CAPS">
+<ANCHOR id="GTK-SOURCE-COMPLETION-ACTIVATION-INTERACTIVE:CAPS" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GTK-SOURCE-COMPLETION-ACTIVATION-INTERACTIVE:CAPS">
+<ANCHOR id="GTK-SOURCE-COMPLETION-ACTIVATION-USER-REQUESTED:CAPS" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GTK-SOURCE-COMPLETION-ACTIVATION-USER-REQUESTED:CAPS">
 <ANCHOR id="GtkSourceCompletionContext-struct" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GtkSourceCompletionContext-struct">
 <ANCHOR id="GtkSourceCompletionContext.property-details" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GtkSourceCompletionContext.property-details">
 <ANCHOR id="GtkSourceCompletionContext--activation" href="gtksourceview-3.0/GtkSourceCompletionContext.html#GtkSourceCompletionContext--activation">
@@ -269,8 +282,13 @@
 <ANCHOR id="GtkSourceFile.other_details" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceFile.other_details">
 <ANCHOR id="GtkSourceFile-struct" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceFile-struct">
 <ANCHOR id="GtkSourceNewlineType" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceNewlineType">
+<ANCHOR id="GTK-SOURCE-NEWLINE-TYPE-LF:CAPS" href="gtksourceview-3.0/GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-LF:CAPS">
+<ANCHOR id="GTK-SOURCE-NEWLINE-TYPE-CR:CAPS" href="gtksourceview-3.0/GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-CR:CAPS">
+<ANCHOR id="GTK-SOURCE-NEWLINE-TYPE-CR-LF:CAPS" href="gtksourceview-3.0/GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-CR-LF:CAPS">
 <ANCHOR id="GTK-SOURCE-NEWLINE-TYPE-DEFAULT:CAPS" href="gtksourceview-3.0/GtkSourceFile.html#GTK-SOURCE-NEWLINE-TYPE-DEFAULT:CAPS">
 <ANCHOR id="GtkSourceCompressionType" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceCompressionType">
+<ANCHOR id="GTK-SOURCE-COMPRESSION-TYPE-NONE:CAPS" href="gtksourceview-3.0/GtkSourceFile.html#GTK-SOURCE-COMPRESSION-TYPE-NONE:CAPS">
+<ANCHOR id="GTK-SOURCE-COMPRESSION-TYPE-GZIP:CAPS" href="gtksourceview-3.0/GtkSourceFile.html#GTK-SOURCE-COMPRESSION-TYPE-GZIP:CAPS">
 <ANCHOR id="GtkSourceFile.property-details" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceFile.property-details">
 <ANCHOR id="GtkSourceFile--compression-type" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceFile--compression-type">
 <ANCHOR id="GtkSourceFile--encoding" href="gtksourceview-3.0/GtkSourceFile.html#GtkSourceFile--encoding">
@@ -301,6 +319,9 @@
 <ANCHOR id="GtkSourceFileLoader-struct" href="gtksourceview-3.0/GtkSourceFileLoader.html#GtkSourceFileLoader-struct">
 <ANCHOR id="GTK-SOURCE-FILE-LOADER-ERROR:CAPS" href="gtksourceview-3.0/GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR:CAPS">
 <ANCHOR id="GtkSourceFileLoaderError" href="gtksourceview-3.0/GtkSourceFileLoader.html#GtkSourceFileLoaderError">
+<ANCHOR id="GTK-SOURCE-FILE-LOADER-ERROR-TOO-BIG:CAPS" href="gtksourceview-3.0/GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR-TOO-BIG:CAPS">
+<ANCHOR id="GTK-SOURCE-FILE-LOADER-ERROR-ENCODING-AUTO-DETECTION-FAILED:CAPS" href="gtksourceview-3.0/GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR-ENCODING-AUTO-DETECTION-FAILED:CAPS">
+<ANCHOR id="GTK-SOURCE-FILE-LOADER-ERROR-CONVERSION-FALLBACK:CAPS" href="gtksourceview-3.0/GtkSourceFileLoader.html#GTK-SOURCE-FILE-LOADER-ERROR-CONVERSION-FALLBACK:CAPS">
 <ANCHOR id="GtkSourceFileLoader.property-details" href="gtksourceview-3.0/GtkSourceFileLoader.html#GtkSourceFileLoader.property-details">
 <ANCHOR id="GtkSourceFileLoader--buffer" href="gtksourceview-3.0/GtkSourceFileLoader.html#GtkSourceFileLoader--buffer">
 <ANCHOR id="GtkSourceFileLoader--file" href="gtksourceview-3.0/GtkSourceFileLoader.html#GtkSourceFileLoader--file">
@@ -334,7 +355,13 @@
 <ANCHOR id="GtkSourceFileSaver-struct" href="gtksourceview-3.0/GtkSourceFileSaver.html#GtkSourceFileSaver-struct">
 <ANCHOR id="GTK-SOURCE-FILE-SAVER-ERROR:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-ERROR:CAPS">
 <ANCHOR id="GtkSourceFileSaverError" href="gtksourceview-3.0/GtkSourceFileSaver.html#GtkSourceFileSaverError">
+<ANCHOR id="GTK-SOURCE-FILE-SAVER-ERROR-INVALID-CHARS:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-ERROR-INVALID-CHARS:CAPS">
+<ANCHOR id="GTK-SOURCE-FILE-SAVER-ERROR-EXTERNALLY-MODIFIED:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-ERROR-EXTERNALLY-MODIFIED:CAPS">
 <ANCHOR id="GtkSourceFileSaverFlags" href="gtksourceview-3.0/GtkSourceFileSaver.html#GtkSourceFileSaverFlags">
+<ANCHOR id="GTK-SOURCE-FILE-SAVER-FLAGS-NONE:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-NONE:CAPS">
+<ANCHOR id="GTK-SOURCE-FILE-SAVER-FLAGS-IGNORE-INVALID-CHARS:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-IGNORE-INVALID-CHARS:CAPS">
+<ANCHOR id="GTK-SOURCE-FILE-SAVER-FLAGS-IGNORE-MODIFICATION-TIME:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-IGNORE-MODIFICATION-TIME:CAPS">
+<ANCHOR id="GTK-SOURCE-FILE-SAVER-FLAGS-CREATE-BACKUP:CAPS" href="gtksourceview-3.0/GtkSourceFileSaver.html#GTK-SOURCE-FILE-SAVER-FLAGS-CREATE-BACKUP:CAPS">
 <ANCHOR id="GtkSourceFileSaver.property-details" href="gtksourceview-3.0/GtkSourceFileSaver.html#GtkSourceFileSaver.property-details">
 <ANCHOR id="GtkSourceFileSaver--buffer" href="gtksourceview-3.0/GtkSourceFileSaver.html#GtkSourceFileSaver--buffer">
 <ANCHOR id="GtkSourceFileSaver--compression-type" href="gtksourceview-3.0/GtkSourceFileSaver.html#GtkSourceFileSaver--compression-type">
@@ -402,7 +429,14 @@
 <ANCHOR id="GtkSourceGutterRenderer.other_details" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRenderer.other_details">
 <ANCHOR id="GtkSourceGutterRenderer-struct" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRenderer-struct">
 <ANCHOR id="GtkSourceGutterRendererState" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRendererState">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-STATE-NORMAL:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-NORMAL:CAPS">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-STATE-CURSOR:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-CURSOR:CAPS">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-STATE-PRELIT:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-PRELIT:CAPS">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-STATE-SELECTED:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-STATE-SELECTED:CAPS">
 <ANCHOR id="GtkSourceGutterRendererAlignmentMode" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRendererAlignmentMode">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-CELL:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-CELL:CAPS">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-FIRST:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-FIRST:CAPS">
+<ANCHOR id="GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-LAST:CAPS" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GTK-SOURCE-GUTTER-RENDERER-ALIGNMENT-MODE-LAST:CAPS">
 <ANCHOR id="GtkSourceGutterRenderer.property-details" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRenderer.property-details">
 <ANCHOR id="GtkSourceGutterRenderer--alignment-mode" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRenderer--alignment-mode">
 <ANCHOR id="GtkSourceGutterRenderer--background-rgba" href="gtksourceview-3.0/GtkSourceGutterRenderer.html#GtkSourceGutterRenderer--background-rgba">
@@ -836,8 +870,22 @@
 <ANCHOR id="GtkSourceView.other_details" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceView.other_details">
 <ANCHOR id="GtkSourceView-struct" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceView-struct">
 <ANCHOR id="GtkSourceSmartHomeEndType" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceSmartHomeEndType">
+<ANCHOR id="GTK-SOURCE-SMART-HOME-END-DISABLED:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-DISABLED:CAPS">
+<ANCHOR id="GTK-SOURCE-SMART-HOME-END-BEFORE:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-BEFORE:CAPS">
+<ANCHOR id="GTK-SOURCE-SMART-HOME-END-AFTER:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-AFTER:CAPS">
+<ANCHOR id="GTK-SOURCE-SMART-HOME-END-ALWAYS:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-SMART-HOME-END-ALWAYS:CAPS">
 <ANCHOR id="GtkSourceDrawSpacesFlags" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceDrawSpacesFlags">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-SPACE:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-SPACE:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-TAB:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-TAB:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-NEWLINE:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-NEWLINE:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-NBSP:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-NBSP:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-LEADING:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-LEADING:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-TEXT:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-TEXT:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-TRAILING:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-TRAILING:CAPS">
+<ANCHOR id="GTK-SOURCE-DRAW-SPACES-ALL:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-DRAW-SPACES-ALL:CAPS">
 <ANCHOR id="GtkSourceViewGutterPosition" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceViewGutterPosition">
+<ANCHOR id="GTK-SOURCE-VIEW-GUTTER-POSITION-LINES:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-VIEW-GUTTER-POSITION-LINES:CAPS">
+<ANCHOR id="GTK-SOURCE-VIEW-GUTTER-POSITION-MARKS:CAPS" href="gtksourceview-3.0/GtkSourceView.html#GTK-SOURCE-VIEW-GUTTER-POSITION-MARKS:CAPS">
 <ANCHOR id="GtkSourceView.property-details" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceView.property-details">
 <ANCHOR id="GtkSourceView--auto-indent" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceView--auto-indent">
 <ANCHOR id="GtkSourceView--completion" href="gtksourceview-3.0/GtkSourceView.html#GtkSourceView--completion">

=== modified file 'docs/reference/html/lang-reference.html'
--- docs/reference/html/lang-reference.html	2014-10-13 20:29:35 +0000
+++ docs/reference/html/lang-reference.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Language Definition v2.0 Reference</title>
+<title>Language Definition v2.0 Reference: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch02.html" title="Syntax highlighting reference">

=== modified file 'docs/reference/html/lang-tutorial.html'
--- docs/reference/html/lang-tutorial.html	2014-09-01 06:36:09 +0000
+++ docs/reference/html/lang-tutorial.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Language Definition v2.0 Tutorial</title>
+<title>Language Definition v2.0 Tutorial: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch02.html" title="Syntax highlighting reference">

=== modified file 'docs/reference/html/object-tree.html'
--- docs/reference/html/object-tree.html	2014-09-22 20:55:55 +0000
+++ docs/reference/html/object-tree.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Object Hierarchy</title>
+<title>Object Hierarchy: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="index.html" title="GtkSourceView 3 Reference Manual">

=== modified file 'docs/reference/html/style-reference.html'
--- docs/reference/html/style-reference.html	2014-09-01 06:36:09 +0000
+++ docs/reference/html/style-reference.html	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkSourceView 3 Reference Manual: Style Scheme Definition Reference</title>
+<title>Style Scheme Definition Reference: GtkSourceView 3 Reference Manual</title>
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="GtkSourceView 3 Reference Manual">
 <link rel="up" href="ch02.html" title="Syntax highlighting reference">

=== modified file 'docs/reference/version.xml'
--- docs/reference/version.xml	2014-10-13 20:29:35 +0000
+++ docs/reference/version.xml	2015-02-25 08:09:43 +0000
@@ -1,1 +1,1 @@
-3.14.1
+3.14.3

=== modified file 'gtk-doc.make'
--- gtk-doc.make	2014-07-07 11:31:02 +0000
+++ gtk-doc.make	2015-02-25 08:09:43 +0000
@@ -25,6 +25,7 @@
 
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -86,7 +87,7 @@
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
 	            destdir=`dirname $(abs_builddir)/$$file`; \
@@ -162,7 +163,7 @@
 GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
@@ -194,7 +195,7 @@
 GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
@@ -223,12 +224,15 @@
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:

=== modified file 'gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c'
--- gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c	2014-10-13 20:29:35 +0000
+++ gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c	2015-02-25 08:09:43 +0000
@@ -164,8 +164,6 @@
 {
 	GtkTextIter line_end;
 	GtkTextIter text_end;
-	GtkTextIter check_start;
-	GtkTextIter check_end;
 	gchar *text;
 	GSList *words;
 
@@ -187,19 +185,7 @@
 		text_end = line_end;
 	}
 
-	check_start = *start;
-	check_end = text_end;
-	_gtk_source_completion_words_utils_adjust_region (&check_start, &check_end);
-
-	if (!gtk_text_iter_equal (start, &check_start))
-	{
-		g_warning ("words completion scan_line(): 'start' iter not adjusted.");
-	}
-
-	if (!gtk_text_iter_equal (&text_end, &check_end))
-	{
-		g_warning ("words completion scan_line(): 'text_end' iter not adjusted.");
-	}
+	_gtk_source_completion_words_utils_check_scan_region (start, &text_end);
 
 	text = gtk_text_buffer_get_text (buffer->priv->buffer,
 					 start,

=== modified file 'gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c'
--- gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c	2014-10-13 20:29:35 +0000
+++ gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.c	2015-02-25 08:09:43 +0000
@@ -204,3 +204,46 @@
 		gtk_text_iter_forward_char (end);
 	}
 }
+
+/* @iter here is a vertical bar between two characters, not the character
+ * pointed by @iter. So "inside word" means really "inside word", not the
+ * definition used by gtk_text_iter_inside_word().
+ */
+static gboolean
+iter_inside_word (const GtkTextIter *iter)
+{
+	GtkTextIter prev;
+
+	if (gtk_text_iter_is_start (iter) || gtk_text_iter_is_end (iter))
+	{
+		return FALSE;
+	}
+
+	prev = *iter;
+	gtk_text_iter_backward_char (&prev);
+
+	return (valid_word_char (gtk_text_iter_get_char (&prev)) &&
+		valid_word_char (gtk_text_iter_get_char (iter)));
+}
+
+/* Checks if @start and @end are well placed for scanning the region between the
+ * two iters.
+ * If an iter isn't well placed, then the library of words will maybe be
+ * inconsistent with the words present in the text buffer.
+ */
+void
+_gtk_source_completion_words_utils_check_scan_region (const GtkTextIter *start,
+						      const GtkTextIter *end)
+{
+	g_return_if_fail (gtk_text_iter_compare (start, end) <= 0);
+
+	if (iter_inside_word (start))
+	{
+		g_warning ("Words completion: 'start' iter not well placed.");
+	}
+
+	if (iter_inside_word (end))
+	{
+		g_warning ("Words completion: 'end' iter not well placed.");
+	}
+}

=== modified file 'gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h'
--- gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h	2014-10-13 20:29:35 +0000
+++ gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h	2015-02-25 08:09:43 +0000
@@ -38,6 +38,10 @@
 void		 _gtk_source_completion_words_utils_adjust_region	(GtkTextIter *start,
 									 GtkTextIter *end);
 
+G_GNUC_INTERNAL
+void		 _gtk_source_completion_words_utils_check_scan_region	(const GtkTextIter *start,
+									 const GtkTextIter *end);
+
 G_END_DECLS
 
 #endif /* __GTK_SOURCE_COMPLETION_WORDS_UTILS_H__ */

=== modified file 'gtksourceview/gtksourcecompletionprovider.c'
--- gtksourceview/gtksourcecompletionprovider.c	2014-10-13 20:29:35 +0000
+++ gtksourceview/gtksourcecompletionprovider.c	2015-02-25 08:09:43 +0000
@@ -291,7 +291,7 @@
  * @provider: a #GtkSourceCompletionProvider.
  * @proposal: a #GtkSourceCompletionProposal.
  * @context: a #GtkSourceCompletionContext.
- * @iter: a #GtkTextIter.
+ * @iter: (out): a #GtkTextIter.
  *
  * Get the #GtkTextIter at which the completion for @proposal starts. When
  * implemented, this information is used to position the completion window

=== modified file 'gtksourceview/gtksourceencoding.c'
--- gtksourceview/gtksourceencoding.c	2014-09-06 11:24:17 +0000
+++ gtksourceview/gtksourceencoding.c	2015-02-25 08:09:43 +0000
@@ -627,9 +627,11 @@
 _gtk_source_encoding_get_default_candidates (void)
 {
 	const gchar *encodings_str;
+	const gchar *encodings_str_translated;
 	GVariant *encodings_variant;
 	const gchar **encodings_strv;
 	GSList *encodings_list;
+	GError *error = NULL;
 
 	/* Translators: This is the sorted list of encodings used by
 	 * GtkSourceView for automatic detection of the file encoding. You may
@@ -643,10 +645,41 @@
 	 * recognized encodings are used. See
 	 * https://git.gnome.org/browse/gtksourceview/tree/gtksourceview/gtksourceencoding.c#n147
 	 * for a list of supported encodings.
+	 * Keep the same format: square brackets, single quotes, commas.
 	 */
-	encodings_str = _("['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']");
-
-	encodings_variant = g_variant_new_parsed (encodings_str);
+	encodings_str = N_("['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']");
+
+	encodings_str_translated = _(encodings_str);
+
+	encodings_variant = g_variant_parse (G_VARIANT_TYPE_STRING_ARRAY,
+					     encodings_str_translated,
+					     NULL,
+					     NULL,
+					     &error);
+
+	if (error != NULL)
+	{
+		const gchar * const *language_names = g_get_language_names ();
+
+		g_warning ("Error while parsing encodings list for locale %s:\n"
+			   "Translated list: %s\n"
+			   "Error message: %s",
+			   language_names[0],
+			   encodings_str_translated,
+			   error->message);
+
+		g_error_free (error);
+		error = NULL;
+
+		encodings_variant = g_variant_parse (G_VARIANT_TYPE_STRING_ARRAY,
+						     encodings_str,
+						     NULL,
+						     NULL,
+						     &error);
+
+		g_assert_no_error (error);
+	}
+
 	g_variant_ref_sink (encodings_variant);
 
 	encodings_strv = g_variant_get_strv (encodings_variant, NULL);

=== modified file 'gtksourceview/gtksourcesearchcontext.c'
--- gtksourceview/gtksourcesearchcontext.c	2014-09-06 11:24:17 +0000
+++ gtksourceview/gtksourcesearchcontext.c	2015-02-25 08:09:43 +0000
@@ -581,6 +581,7 @@
 	return flags;
 }
 
+/* @start_pos is in bytes. */
 static void
 regex_search_get_real_start (GtkSourceSearchContext *search,
 			     const GtkTextIter      *start,
@@ -588,16 +589,23 @@
 			     gint                   *start_pos)
 {
 	gint max_lookbehind = g_regex_get_max_lookbehind (search->priv->regex);
+	gint i;
+	gchar *text;
 
 	*real_start = *start;
 
-	for (*start_pos = 0; *start_pos < max_lookbehind; (*start_pos)++)
+	for (i = 0; i < max_lookbehind; i++)
 	{
 		if (!gtk_text_iter_backward_char (real_start))
 		{
 			break;
 		}
 	}
+
+	text = gtk_text_iter_get_visible_text (real_start, start);
+	*start_pos = strlen (text);
+
+	g_free (text);
 }
 
 static GRegexMatchFlags
@@ -1847,7 +1855,7 @@
 
 	DEBUG ({
 	       g_print ("\n*** regex search - scan segment ***\n");
-	       g_print ("start position in the subject: %d\n", start_pos);
+	       g_print ("start position in the subject (in bytes): %d\n", start_pos);
 	});
 
 	match_options = regex_search_get_match_options (&real_start, segment_end);
@@ -3439,7 +3447,7 @@
 
 	gtk_text_buffer_begin_user_action (search->priv->buffer);
 	gtk_text_buffer_delete (search->priv->buffer, match_start, match_end);
-	gtk_text_buffer_insert (search->priv->buffer, match_end, subject_replaced, -1);
+	gtk_text_buffer_insert (search->priv->buffer, match_end, subject_replaced + start_pos, -1);
 	gtk_text_buffer_end_user_action (search->priv->buffer);
 
 	g_free (subject_replaced);

=== modified file 'gtksourceview/gtksourceundomanagerdefault.c'
--- gtksourceview/gtksourceundomanagerdefault.c	2014-10-13 20:29:35 +0000
+++ gtksourceview/gtksourceundomanagerdefault.c	2015-02-25 08:09:43 +0000
@@ -6,7 +6,7 @@
  * Copyright (C) 1998, 1999 - Alex Roberts, Evan Lawrence
  * Copyright (C) 2000, 2001 - Chema Celorio, Paolo Maggi
  * Copyright (C) 2002-2005  - Paolo Maggi
- * Copyright (C) 2014 - Sébastien Wilmet <[e-mail]>
+ * Copyright (C) 2014, 2015 - Sébastien Wilmet <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -39,6 +39,19 @@
 	ACTION_TYPE_DELETE
 } ActionType;
 
+/* A more precise deletion type. But currently it's only a guess, we are not
+ * 100% sure of the deletion type. To be sure, we would need to listen to key
+ * events on the GtkSourceView widget, which is more complicated than simply
+ * listening to the insert-text and delete-range GtkTextBuffer signals.
+ */
+typedef enum
+{
+	DELETION_TYPE_SELECTION_DELETED,
+	DELETION_TYPE_BACKSPACE_KEY,
+	DELETION_TYPE_DELETE_KEY,
+	DELETION_TYPE_PROGRAMMATICALLY
+} DeletionType;
+
 struct _Action
 {
 	ActionType type;
@@ -58,11 +71,21 @@
 	 */
 	gchar *text;
 
-	/* Used only for a deletion. If forward is TRUE, the Delete key was
-	 * probably used. If forward is FALSE, the Backspace key was probably
-	 * used.
+	/* Character offsets of the insert and selection bound marks.
+	 * They are both -1 or they both match @start or @end.
+	 * If the text cursor or the selected text is not related to the action,
+	 * the selection is not stored (i.e. -1).
+	 * If not -1, when undoing or redoing an action, the insert and
+	 * selection bound marks are restored to where they were.
+	 * For an insert, @selection_insert and @selection_bound must match
+	 * @start, otherwise the selection or cursor position is unrelated to
+	 * the insertion.
+	 * For a deletion, if @selection_insert and @selection_bound are -1, it
+	 * corresponds to DELETION_TYPE_PROGRAMMATICALLY. For all the other
+	 * deletion types, the selection is stored.
 	 */
-	guint forward : 1;
+	gint selection_insert;
+	gint selection_bound;
 };
 
 struct _ActionGroup
@@ -103,6 +126,16 @@
 	 */
 	GList *location;
 
+	/* A new ActionGroup that is created when some text is inserted or
+	 * deleted in the buffer. As long as a user action is running (when
+	 * 'running_user_action' is TRUE) the new actions are inserted into
+	 * 'new_action_group'. When the user action ends, we try to merge
+	 * 'new_action_group' with the previous ActionGroup in 'action_groups'
+	 * (the node on the left of 'location'). If the merging fails, a new
+	 * node is inserted on the left of 'location'.
+	 */
+	ActionGroup *new_action_group;
+
 	/* The number of nested calls to
 	 * gtk_source_buffer_begin_not_undoable_action().
 	 */
@@ -162,7 +195,14 @@
 static Action *
 action_new (void)
 {
-	return g_slice_new0 (Action);
+	Action *action;
+
+	action = g_slice_new0 (Action);
+
+	action->selection_insert = -1;
+	action->selection_bound = -1;
+
+	return action;
 }
 
 static void
@@ -253,6 +293,9 @@
 	manager->priv->location = NULL;
 	manager->priv->saved_location = NULL;
 
+	action_group_free (manager->priv->new_action_group);
+	manager->priv->new_action_group = NULL;
+
 	update_can_undo_can_redo (manager);
 }
 
@@ -346,40 +389,6 @@
 }
 
 static void
-insert_new_action_group (GtkSourceUndoManagerDefault *manager)
-{
-	ActionGroup *group = action_group_new ();
-
-	if (manager->priv->location != NULL)
-	{
-		g_queue_insert_before (manager->priv->action_groups,
-				       manager->priv->location,
-				       group);
-	}
-	else
-	{
-		g_queue_push_tail (manager->priv->action_groups,
-				   group);
-	}
-
-	if (manager->priv->has_saved_location &&
-	    manager->priv->saved_location == manager->priv->location)
-	{
-		if (manager->priv->saved_location != NULL)
-		{
-			manager->priv->saved_location = manager->priv->saved_location->prev;
-		}
-		else
-		{
-			manager->priv->saved_location = manager->priv->action_groups->tail;
-		}
-
-		g_assert (manager->priv->saved_location != NULL);
-		g_assert (manager->priv->saved_location->data == group);
-	}
-}
-
-static void
 remove_redo_action_groups (GtkSourceUndoManagerDefault *manager)
 {
 	while (manager->priv->location != NULL)
@@ -420,74 +429,69 @@
 	return action_merge (action, new_action);
 }
 
-/* Try to merge the current action group with the previous one. The "current
- * action group" is the node on the left of location.
+/* Try to merge the new action group with the previous one (the one located on
+ * the left of priv->location). If the merge fails, a new node is inserted into
+ * the history.
  */
 static void
-try_merge_current_action_group (GtkSourceUndoManagerDefault *manager)
+insert_new_action_group (GtkSourceUndoManagerDefault *manager)
 {
-	GList *new_node = NULL;
 	GList *prev_node = NULL;
-	ActionGroup *new_group = NULL;
 	ActionGroup *prev_group = NULL;
-
-	if (manager->priv->location != NULL)
-	{
-		new_node = manager->priv->location->prev;
-	}
-	else
-	{
-		new_node = manager->priv->action_groups->tail;
-	}
-
-	g_assert (new_node != NULL);
-	new_group = new_node->data;
-
-	prev_node = new_node->prev;
+	ActionGroup *new_group = manager->priv->new_action_group;
+	gboolean can_merge = TRUE;
+
+	if (new_group == NULL || new_group->actions->length == 0)
+	{
+		return;
+	}
+
+	remove_redo_action_groups (manager);
+	g_assert (manager->priv->location == NULL);
+
+	prev_node = manager->priv->action_groups->tail;
 
 	if (prev_node != NULL)
 	{
 		prev_group = prev_node->data;
 
 		/* If the previous group is empty, it means that it was not correctly
-		 * merged.
+		 * inserted into the history.
 		 */
 		g_assert_cmpuint (prev_group->actions->length, >, 0);
 	}
 
-	/* If the saved_location is between the two nodes, the two nodes cannot
-	 * be merged. Except if the new node is empty.
+	/* If the saved_location is equal to the current location, the two
+	 * ActionGroups cannot be merged, to not lose the saved_location.
 	 */
 	if (manager->priv->has_saved_location &&
-	    manager->priv->saved_location == new_node &&
-	    new_group->actions->length > 0)
+	    manager->priv->saved_location == manager->priv->location)
 	{
-		goto end;
+		g_assert (manager->priv->saved_location == NULL);
+		can_merge = FALSE;
 	}
 
-	if ((prev_group == NULL && new_group->actions->length == 0) ||
-	    (prev_group != NULL && action_group_merge (prev_group, new_group)))
+	if (can_merge &&
+	    prev_group != NULL &&
+	    action_group_merge (prev_group, new_group))
 	{
-		if (manager->priv->has_saved_location &&
-		    manager->priv->saved_location == new_node)
-		{
-			manager->priv->saved_location = new_node->next;
-		}
-
-		/* Of course, no need to update location, since new_node is on
-		 * the left of location.
-		 */
-		g_assert (manager->priv->location != new_node);
-
-		action_group_free (new_group);
-		g_queue_delete_link (manager->priv->action_groups, new_node);
-
-		check_history_size (manager);
+		/* new_group merged into prev_group */
+		action_group_free (manager->priv->new_action_group);
+		manager->priv->new_action_group = NULL;
+
 		update_can_undo_can_redo (manager);
 		return;
 	}
 
-end:
+	g_queue_push_tail (manager->priv->action_groups, new_group);
+	manager->priv->new_action_group = NULL;
+
+	if (manager->priv->has_saved_location &&
+	    manager->priv->saved_location == NULL)
+	{
+		manager->priv->saved_location = manager->priv->action_groups->tail;
+	}
+
 	/* "Archive" prev_group. It will never be mergeable again. If the user
 	 * does some undo's to return to this location, a new action won't be
 	 * merged with an "archived" action group.
@@ -505,20 +509,16 @@
 insert_action (GtkSourceUndoManagerDefault *manager,
 	       Action                      *new_action)
 {
-	ActionGroup *group;
+	ActionGroup *new_group;
 
 	g_assert (new_action != NULL);
 
-	remove_redo_action_groups (manager);
-	g_assert (manager->priv->location == NULL);
-
-	if (!manager->priv->running_user_action)
+	if (manager->priv->new_action_group == NULL)
 	{
-		insert_new_action_group (manager);
+		manager->priv->new_action_group = action_group_new ();
 	}
 
-	group = g_queue_peek_tail (manager->priv->action_groups);
-	g_assert (group != NULL);
+	new_group = manager->priv->new_action_group;
 
 	/* Inside a group, don't try to merge the actions. It is needed to keep
 	 * them separate so when undoing or redoing, the cursor position is set
@@ -528,7 +528,7 @@
 	 * undo, the cursor position should be placed at "a|aba", not "aa|ba"
 	 * (but it's a detail).
 	 */
-	g_queue_push_tail (group->actions, new_action);
+	g_queue_push_tail (new_group->actions, new_action);
 
 	/* An action is mergeable only for an insertion or deletion of a single
 	 * character. If the text contains several characters, the new_action
@@ -537,12 +537,12 @@
 	if (new_action->end - new_action->start > 1 ||
 	    g_str_equal (new_action->text, "\n"))
 	{
-		group->force_not_mergeable = TRUE;
+		new_group->force_not_mergeable = TRUE;
 	}
 
 	if (!manager->priv->running_user_action)
 	{
-		try_merge_current_action_group (manager);
+		insert_new_action_group (manager);
 	}
 }
 
@@ -662,18 +662,35 @@
 
 	action->end = new_action->end;
 
+	/* No need to update the selection, action->start is not modified. */
+	g_assert ((action->selection_insert == -1 &&
+		   action->selection_bound == -1) ||
+		  (action->selection_insert == action->start &&
+		   action->selection_bound == action->start));
+
 	return TRUE;
 }
 
 static void
-action_insert_set_cursor_position (GtkTextBuffer *buffer,
-				   Action        *action,
-				   gboolean       undo)
+action_insert_restore_selection (GtkTextBuffer *buffer,
+				 Action        *action,
+				 gboolean       undo)
 {
 	GtkTextIter iter;
 
 	g_assert_cmpint (action->type, ==, ACTION_TYPE_INSERT);
 
+	/* No need to take into account action->selection_insert and
+	 * action->selection_bound, because:
+	 * - If they are both -1, we still want to place the cursor correctly,
+	 *   as done below, because if the cursor is not moved the user won't
+	 *   see the modification.
+	 * - If they are set, their values are both action->start, so the undo
+	 *   works as expeceted in this case. The redo is also the expected
+	 *   behavior because after inserting a character the cursor is _after_
+	 *   the character, not before.
+	 */
+
 	if (undo)
 	{
 		gtk_text_buffer_get_iter_at_offset (buffer, &iter, action->start);
@@ -706,12 +723,45 @@
 	delete_text (buffer, action->start, action->end);
 }
 
+static DeletionType
+get_deletion_type (Action *action)
+{
+	g_assert_cmpint (action->type, ==, ACTION_TYPE_DELETE);
+
+	if (action->selection_insert == -1)
+	{
+		g_assert_cmpint (action->selection_bound, ==, -1);
+		return DELETION_TYPE_PROGRAMMATICALLY;
+	}
+
+	if (action->selection_insert == action->end &&
+	    action->selection_bound == action->end)
+	{
+		return DELETION_TYPE_BACKSPACE_KEY;
+	}
+
+	if (action->selection_insert == action->start &&
+	    action->selection_bound == action->start)
+	{
+		return DELETION_TYPE_DELETE_KEY;
+	}
+
+	g_assert (action->selection_insert == action->start ||
+		  action->selection_insert == action->end);
+	g_assert (action->selection_bound == action->start ||
+		  action->selection_bound == action->end);
+
+	return DELETION_TYPE_SELECTION_DELETED;
+}
+
 static gboolean
 action_delete_merge (Action *action,
 		     Action *new_action)
 {
 	gint new_text_length;
 	gunichar new_char;
+	DeletionType deletion_type;
+	DeletionType new_deletion_type;
 
 	g_assert_cmpint (action->type, ==, ACTION_TYPE_DELETE);
 	g_assert_cmpint (new_action->type, ==, ACTION_TYPE_DELETE);
@@ -722,21 +772,57 @@
 	new_char = g_utf8_get_char (new_action->text);
 	g_assert (new_char != '\n');
 
-	/* A Backspace can not be merged with a Delete.
-	 * Two Backspaces or two Deletes must follow each other.
-	 * In "abc", if the cursor is at offset 2 and I press the Backspace key,
-	 * then move the cursor after 'c' and press Backspace again, the two
-	 * deletes won't be merged, since there was a cursor movement in
-	 * between.
-	 */
-	if ((action->forward != new_action->forward) ||
-	    (action->forward && action->start != new_action->start) ||
-	    (!action->forward && action->start != new_action->end))
+	deletion_type = get_deletion_type (action);
+	new_deletion_type = get_deletion_type (new_action);
+
+	if (deletion_type != new_deletion_type)
 	{
 		return FALSE;
 	}
 
-	/* forward, Delete key pressed several times */
+	switch (deletion_type)
+	{
+		/* If the user has selected some text and then has deleted it,
+		 * it should be seen as a single action group, not mergeable.  A
+		 * good reason for that is to correctly restore the selection.
+		 */
+		case DELETION_TYPE_SELECTION_DELETED:
+			return FALSE;
+
+		/* For memory use it would be better to take it into account,
+		 * but the code is simpler like that.
+		 */
+		case DELETION_TYPE_PROGRAMMATICALLY:
+			return FALSE;
+
+		/* Two Backspaces or two Deletes must follow each other. In
+		 * "abc", if the cursor is at offset 2 and I press the Backspace
+		 * key, then move the cursor after 'c' and press Backspace
+		 * again, the two deletes won't be merged, since there was a
+		 * cursor movement in between.
+		 */
+
+		case DELETION_TYPE_DELETE_KEY:
+			/* Not consecutive deletes. */
+			if (action->start != new_action->start)
+			{
+				return FALSE;
+			}
+			break;
+
+		case DELETION_TYPE_BACKSPACE_KEY:
+			/* Not consecutive backspaces. */
+			if (action->start != new_action->end)
+			{
+				return FALSE;
+			}
+			break;
+
+		default:
+			g_assert_not_reached ();
+	}
+
+	/* Delete key pressed several times. */
 	if (action->start == new_action->start)
 	{
 		gunichar last_char;
@@ -758,10 +844,16 @@
 
 		action->end += new_text_length;
 
+		/* No need to update the selection, action->start is not
+		 * modified.
+		 */
+		g_assert_cmpint (action->selection_insert, ==, action->start);
+		g_assert_cmpint (action->selection_bound, ==, action->start);
+
 		return TRUE;
 	}
 
-	/* backward, Backspace key pressed several times */
+	/* Backspace key pressed several times. */
 	if (action->start == new_action->end)
 	{
 		gunichar last_char;
@@ -786,6 +878,10 @@
 
 		action->start = new_action->start;
 
+		/* No need to update the selection, action->end is not modified. */
+		g_assert_cmpint (action->selection_insert, ==, action->end);
+		g_assert_cmpint (action->selection_bound, ==, action->end);
+
 		return TRUE;
 	}
 
@@ -794,24 +890,47 @@
 }
 
 static void
-action_delete_set_cursor_position (GtkTextBuffer *buffer,
-				   Action        *action,
-				   gboolean       undo)
+action_delete_restore_selection (GtkTextBuffer *buffer,
+				 Action        *action,
+				 gboolean       undo)
 {
-	GtkTextIter iter;
 
 	g_assert_cmpint (action->type, ==, ACTION_TYPE_DELETE);
 
 	if (undo)
 	{
-		gtk_text_buffer_get_iter_at_offset (buffer, &iter, action->end);
+		if (action->selection_insert == -1)
+		{
+			GtkTextIter iter;
+
+			g_assert_cmpint (action->selection_bound, ==, -1);
+
+			gtk_text_buffer_get_iter_at_offset (buffer, &iter, action->end);
+			gtk_text_buffer_place_cursor (buffer, &iter);
+		}
+		else
+		{
+			GtkTextIter insert_iter;
+			GtkTextIter bound_iter;
+
+			gtk_text_buffer_get_iter_at_offset (buffer,
+							    &insert_iter,
+							    action->selection_insert);
+
+			gtk_text_buffer_get_iter_at_offset (buffer,
+							    &bound_iter,
+							    action->selection_bound);
+
+			gtk_text_buffer_select_range (buffer, &insert_iter, &bound_iter);
+		}
 	}
 	else /* redo */
 	{
+		GtkTextIter iter;
+
 		gtk_text_buffer_get_iter_at_offset (buffer, &iter, action->start);
+		gtk_text_buffer_place_cursor (buffer, &iter);
 	}
-
-	gtk_text_buffer_place_cursor (buffer, &iter);
 }
 
 /* Action interface.
@@ -893,25 +1012,25 @@
 	}
 }
 
-/* Set the cursor position according to @action.
+/* Restore the selection (or cursor position) according to @action.
  * If @undo is TRUE, @action has just been undone. If @undo is FALSE, @action
  * has just been redone.
  */
 static void
-action_set_cursor_position (GtkTextBuffer *buffer,
-			    Action        *action,
-			    gboolean       undo)
+action_restore_selection (GtkTextBuffer *buffer,
+			  Action        *action,
+			  gboolean       undo)
 {
 	g_assert (action != NULL);
 
 	switch (action->type)
 	{
 		case ACTION_TYPE_INSERT:
-			action_insert_set_cursor_position (buffer, action, undo);
+			action_insert_restore_selection (buffer, action, undo);
 			break;
 
 		case ACTION_TYPE_DELETE:
-			action_delete_set_cursor_position (buffer, action, undo);
+			action_delete_restore_selection (buffer, action, undo);
 			break;
 
 		default:
@@ -923,6 +1042,25 @@
 /* Buffer signal handlers */
 
 static void
+set_selection_bounds (GtkTextBuffer *buffer,
+		      Action        *action)
+{
+	GtkTextMark *insert_mark;
+	GtkTextMark *bound_mark;
+	GtkTextIter insert_iter;
+	GtkTextIter bound_iter;
+
+	insert_mark = gtk_text_buffer_get_insert (buffer);
+	bound_mark = gtk_text_buffer_get_selection_bound (buffer);
+
+	gtk_text_buffer_get_iter_at_mark (buffer, &insert_iter, insert_mark);
+	gtk_text_buffer_get_iter_at_mark (buffer, &bound_iter, bound_mark);
+
+	action->selection_insert = gtk_text_iter_get_offset (&insert_iter);
+	action->selection_bound = gtk_text_iter_get_offset (&bound_iter);
+}
+
+static void
 insert_text_cb (GtkTextBuffer               *buffer,
 		GtkTextIter                 *location,
 		const gchar                 *text,
@@ -936,6 +1074,21 @@
 	action->text = g_strndup (text, length);
 	action->end = action->start + g_utf8_strlen (action->text, -1);
 
+	set_selection_bounds (buffer, action);
+
+	if (action->selection_insert != action->selection_bound ||
+	    action->selection_insert != action->start)
+	{
+		action->selection_insert = -1;
+		action->selection_bound = -1;
+	}
+	else
+	{
+		/* The insertion occurred at the cursor. */
+		g_assert_cmpint (action->selection_insert, ==, action->start);
+		g_assert_cmpint (action->selection_bound, ==, action->start);
+	}
+
 	insert_action (manager, action);
 }
 
@@ -946,7 +1099,6 @@
 		 GtkSourceUndoManagerDefault *manager)
 {
 	Action *action = action_new ();
-	GtkTextIter cursor_pos;
 
 	action->type = ACTION_TYPE_DELETE;
 	action->start = gtk_text_iter_get_offset (start);
@@ -955,10 +1107,16 @@
 
 	g_assert_cmpint (action->start, <, action->end);
 
-	gtk_text_buffer_get_iter_at_mark (buffer, &cursor_pos,
-					  gtk_text_buffer_get_insert (buffer));
+	set_selection_bounds (buffer, action);
 
-	action->forward = gtk_text_iter_equal (&cursor_pos, start);
+	if ((action->selection_insert != action->start &&
+	     action->selection_insert != action->end) ||
+	    (action->selection_bound != action->start &&
+	     action->selection_bound != action->end))
+	{
+		action->selection_insert = -1;
+		action->selection_bound = -1;
+	}
 
 	insert_action (manager, action);
 }
@@ -967,8 +1125,6 @@
 begin_user_action_cb (GtkTextBuffer               *buffer,
 		      GtkSourceUndoManagerDefault *manager)
 {
-	insert_new_action_group (manager);
-
 	manager->priv->running_user_action = TRUE;
 	update_can_undo_can_redo (manager);
 }
@@ -977,7 +1133,7 @@
 end_user_action_cb (GtkTextBuffer               *buffer,
 		    GtkSourceUndoManagerDefault *manager)
 {
-	try_merge_current_action_group (manager);
+	insert_new_action_group (manager);
 
 	manager->priv->running_user_action = FALSE;
 	update_can_undo_can_redo (manager);
@@ -993,7 +1149,9 @@
 		 * deleted.
 		 */
 		if (manager->priv->has_saved_location &&
-		    manager->priv->saved_location == manager->priv->location)
+		    manager->priv->saved_location == manager->priv->location &&
+		    (manager->priv->new_action_group == NULL ||
+		     manager->priv->new_action_group->actions->length == 0))
 		{
 			manager->priv->has_saved_location = FALSE;
 		}
@@ -1002,18 +1160,17 @@
 	/* saved */
 	else
 	{
-		manager->priv->saved_location = manager->priv->location;
-		manager->priv->has_saved_location = TRUE;
-
 		/* Saving a buffer during a user action is allowed, the user
 		 * action is split.
 		 * FIXME and/or a warning should be printed?
 		 */
 		if (manager->priv->running_user_action)
 		{
-			try_merge_current_action_group (manager);
 			insert_new_action_group (manager);
 		}
+
+		manager->priv->saved_location = manager->priv->location;
+		manager->priv->has_saved_location = TRUE;
 	}
 }
 
@@ -1034,14 +1191,6 @@
 					 manager);
 
 	g_signal_handlers_block_by_func (manager->priv->buffer,
-					 begin_user_action_cb,
-					 manager);
-
-	g_signal_handlers_block_by_func (manager->priv->buffer,
-					 end_user_action_cb,
-					 manager);
-
-	g_signal_handlers_block_by_func (manager->priv->buffer,
 					 modified_changed_cb,
 					 manager);
 }
@@ -1063,14 +1212,6 @@
 					   manager);
 
 	g_signal_handlers_unblock_by_func (manager->priv->buffer,
-					   begin_user_action_cb,
-					   manager);
-
-	g_signal_handlers_unblock_by_func (manager->priv->buffer,
-					   end_user_action_cb,
-					   manager);
-
-	g_signal_handlers_unblock_by_func (manager->priv->buffer,
 					   modified_changed_cb,
 					   manager);
 }
@@ -1198,6 +1339,8 @@
 	g_queue_free_full (manager->priv->action_groups,
 			   (GDestroyNotify) action_group_free);
 
+	action_group_free (manager->priv->new_action_group);
+
 	G_OBJECT_CLASS (gtk_source_undo_manager_default_parent_class)->finalize (object);
 }
 
@@ -1297,11 +1440,8 @@
 	}
 
 	g_assert (new_location != NULL);
+
 	group = new_location->data;
-
-	/* Empty groups are inserted at the beginning of a user action, but
-	 * during a user action can_undo is FALSE.
-	 */
 	g_assert_cmpuint (group->actions->length, >, 0);
 
 	block_signal_handlers (manager);
@@ -1318,7 +1458,7 @@
 	 * a search and replace, it will be the first occurrence in the buffer.
 	 */
 	action = g_queue_peek_head (group->actions);
-	action_set_cursor_position (manager->priv->buffer, action, TRUE);
+	action_restore_selection (manager->priv->buffer, action, TRUE);
 
 	unblock_signal_handlers (manager);
 
@@ -1363,7 +1503,7 @@
 		 */
 		if (l == group->actions->head)
 		{
-			action_set_cursor_position (manager->priv->buffer, action, FALSE);
+			action_restore_selection (manager->priv->buffer, action, FALSE);
 		}
 	}
 
@@ -1400,6 +1540,7 @@
 	{
 		unblock_signal_handlers (manager);
 		clear_all (manager);
+		modified_changed_cb (manager->priv->buffer, manager);
 	}
 }
 
@@ -1433,6 +1574,7 @@
 		else if (manager->priv->max_undo_levels == 0)
 		{
 			unblock_signal_handlers (manager);
+			modified_changed_cb (manager->priv->buffer, manager);
 		}
 
 		manager->priv->max_undo_levels = max_undo_levels;

=== modified file 'po/fi.po'
--- po/fi.po	2014-10-13 20:29:35 +0000
+++ po/fi.po	2015-02-25 08:09:43 +0000
@@ -13,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtksourceview\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gtksourceview&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-09 09:11+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gtksourceview&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-11-07 10:10+0000\n"
 "PO-Revision-Date: 2014-08-09 13:08+0300\n"
 "Last-Translator: Lasse Liehu <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
@@ -71,7 +71,7 @@
 
 #: ../data/glade/gtksourceview.xml.in.h:12
 #: ../gtksourceview/gtksourcecompletionitem.c:262
-#: ../gtksourceview/gtksourcegutterrenderertext.c:409
+#: ../gtksourceview/gtksourcegutterrenderertext.c:421
 msgid "Text"
 msgstr "Teksti"
 
@@ -82,7 +82,7 @@
 #. Translators: "All" is used as a label in the status bar of the
 #. popup, telling that all completion pages are shown.
 #: ../data/glade/gtksourceview.xml.in.h:14
-#: ../gtksourceview/gtksourcecompletion.c:788
+#: ../gtksourceview/gtksourcecompletion.c:811
 msgid "All"
 msgstr "Kaikki"
 
@@ -120,7 +120,8 @@
 #: ../data/language-specs/sparql.lang.h:1 ../data/language-specs/sql.lang.h:1
 #: ../data/language-specs/systemverilog.lang.h:1
 #: ../data/language-specs/vala.lang.h:1 ../data/language-specs/vbnet.lang.h:1
-#: ../data/language-specs/verilog.lang.h:1 ../data/language-specs/vhdl.lang.h:1
+#: ../data/language-specs/verilog.lang.h:1
+#: ../data/language-specs/vhdl.lang.h:1
 #, fuzzy
 #| msgid "Sources"
 msgid "Source"
@@ -188,7 +189,8 @@
 #: ../data/language-specs/opal.lang.h:6 ../data/language-specs/perl.lang.h:17
 #: ../data/language-specs/php.lang.h:5 ../data/language-specs/prolog.lang.h:9
 #: ../data/language-specs/scala.lang.h:3 ../data/language-specs/vala.lang.h:4
-#: ../data/language-specs/verilog.lang.h:7 ../data/language-specs/xml.lang.h:13
+#: ../data/language-specs/verilog.lang.h:7
+#: ../data/language-specs/xml.lang.h:13
 msgid "Error"
 msgstr "Virhe"
 
@@ -364,7 +366,8 @@
 #: ../data/language-specs/llvm.lang.h:12
 #: ../data/language-specs/netrexx.lang.h:16
 #: ../data/language-specs/prolog.lang.h:7
-#: ../data/language-specs/scala.lang.h:12 ../data/language-specs/vhdl.lang.h:11
+#: ../data/language-specs/scala.lang.h:12
+#: ../data/language-specs/vhdl.lang.h:11
 msgid "Number"
 msgstr "Numero"
 
@@ -724,7 +727,7 @@
 #: ../data/language-specs/texinfo.lang.h:1 ../data/language-specs/xml.lang.h:1
 #: ../data/language-specs/xslt.lang.h:1
 #: ../gtksourceview/gtksourcecompletionitem.c:249
-#: ../gtksourceview/gtksourcegutterrenderertext.c:401
+#: ../gtksourceview/gtksourcegutterrenderertext.c:413
 msgid "Markup"
 msgstr "Merkintä"
 
@@ -819,7 +822,8 @@
 #: ../data/language-specs/python.lang.h:11
 #: ../data/language-specs/scheme.lang.h:4
 #: ../data/language-specs/scilab.lang.h:8
-#: ../data/language-specs/sparql.lang.h:9 ../data/language-specs/yaml.lang.h:12
+#: ../data/language-specs/sparql.lang.h:9
+#: ../data/language-specs/yaml.lang.h:12
 msgid "Boolean"
 msgstr "Totuusarvo"
 
@@ -1169,7 +1173,8 @@
 
 #. Translators: "Key" here means key value, that is the left hand
 #. side in a myoption=something line in a .desktop file
-#: ../data/language-specs/desktop.lang.h:6 ../data/language-specs/json.lang.h:2
+#: ../data/language-specs/desktop.lang.h:6
+#: ../data/language-specs/json.lang.h:2
 msgid "Key"
 msgstr "Avain"
 
@@ -1182,8 +1187,8 @@
 msgstr "Suoritusparametri"
 
 #: ../data/language-specs/desktop.lang.h:11
-#: ../gtksourceview/gtksourcefile.c:186
-#: ../gtksourceview/gtksourcefilesaver.c:390
+#: ../gtksourceview/gtksourcefile.c:184
+#: ../gtksourceview/gtksourcefilesaver.c:393
 msgid "Encoding"
 msgstr "Merkistö"
 
@@ -1224,9 +1229,9 @@
 
 #. String
 #: ../data/language-specs/diff.lang.h:11 ../data/language-specs/po.lang.h:4
-#: ../gtksourceview/gtksourcefile.c:170
-#: ../gtksourceview/gtksourcefileloader.c:389
-#: ../gtksourceview/gtksourcefilesaver.c:373
+#: ../gtksourceview/gtksourcefile.c:167
+#: ../gtksourceview/gtksourcefileloader.c:397
+#: ../gtksourceview/gtksourcefilesaver.c:376
 msgid "Location"
 msgstr "Sijainti"
 
@@ -1273,7 +1278,8 @@
 msgstr "DOS-batch"
 
 #: ../data/language-specs/dosbatch.lang.h:6
-#: ../data/language-specs/latex.lang.h:8 ../data/language-specs/sweave.lang.h:4
+#: ../data/language-specs/latex.lang.h:8
+#: ../data/language-specs/sweave.lang.h:4
 msgid "Command"
 msgstr "Komento"
 
@@ -3041,12 +3047,10 @@
 msgstr "Korostetaanko parin muodostavat sulkeet"
 
 #: ../gtksourceview/gtksourcebuffer.c:305
-#: ../gtksourceview/gtksourceundomanagerdefault.c:411
 msgid "Maximum Undo Levels"
 msgstr "Kumoamiskertojen suurin määrä"
 
 #: ../gtksourceview/gtksourcebuffer.c:306
-#: ../gtksourceview/gtksourceundomanagerdefault.c:412
 msgid "Number of undo levels for the buffer"
 msgstr "Kumoamiskertojen määrä puskurissa"
 
@@ -3089,7 +3093,7 @@
 msgid "The buffer undo manager"
 msgstr "Puskurin kumoamisen hallinta"
 
-#: ../gtksourceview/gtksourcebuffer.c:373
+#: ../gtksourceview/gtksourcebuffer.c:374
 msgid "Implicit trailing newline"
 msgstr ""
 
@@ -3122,84 +3126,84 @@
 msgid "Incomplete UTF-8 sequence in input"
 msgstr ""
 
-#: ../gtksourceview/gtksourcecompletion.c:2162
-#: ../gtksourceview/gtksourcegutter.c:549
+#: ../gtksourceview/gtksourcecompletion.c:2187
+#: ../gtksourceview/gtksourcegutter.c:514
 msgid "View"
 msgstr "Näkymä"
 
-#: ../gtksourceview/gtksourcecompletion.c:2163
+#: ../gtksourceview/gtksourcecompletion.c:2188
 msgid "The GtkSourceView bound to the completion"
 msgstr "GtkSourceView, joka on sidottu täydennykseen"
 
-#: ../gtksourceview/gtksourcecompletion.c:2177
+#: ../gtksourceview/gtksourcecompletion.c:2202
 msgid "Remember Info Visibility"
 msgstr "Muista tietojen näkyvyys"
 
-#: ../gtksourceview/gtksourcecompletion.c:2178
+#: ../gtksourceview/gtksourcecompletion.c:2203
 msgid "Remember the last info window visibility state"
 msgstr "Muista edellinen tietoikkunan näkyvyyden tila"
 
-#: ../gtksourceview/gtksourcecompletion.c:2190
+#: ../gtksourceview/gtksourcecompletion.c:2215
 msgid "Select on Show"
 msgstr "Valitse näytettäessä"
 
-#: ../gtksourceview/gtksourcecompletion.c:2191
+#: ../gtksourceview/gtksourcecompletion.c:2216
 msgid "Select first proposal when completion is shown"
 msgstr "Valitse ensimmäinen ehdotus kun täydennys näytetään"
 
-#: ../gtksourceview/gtksourcecompletion.c:2204
+#: ../gtksourceview/gtksourcecompletion.c:2229
 msgid "Show Headers"
 msgstr "Näytä otsakkeet"
 
-#: ../gtksourceview/gtksourcecompletion.c:2205
+#: ../gtksourceview/gtksourcecompletion.c:2230
 msgid ""
 "Show provider headers when proposals from multiple providers are available"
 msgstr ""
 "Näytä tarjoajien otsakkeen kun ehdotuksia useilta tarjoajilta on "
 "käytettävissä"
 
-#: ../gtksourceview/gtksourcecompletion.c:2218
+#: ../gtksourceview/gtksourcecompletion.c:2243
 msgid "Show Icons"
 msgstr "Näytä kuvakkeet"
 
-#: ../gtksourceview/gtksourcecompletion.c:2219
+#: ../gtksourceview/gtksourcecompletion.c:2244
 msgid "Show provider and proposal icons in the completion popup"
 msgstr "Näytä tarjoaja- ja ehdotuskuvakkeet täydennysikkunassa"
 
-#: ../gtksourceview/gtksourcecompletion.c:2233
+#: ../gtksourceview/gtksourcecompletion.c:2258
 msgid "Accelerators"
 msgstr "Pikanäppäimet"
 
-#: ../gtksourceview/gtksourcecompletion.c:2234
+#: ../gtksourceview/gtksourcecompletion.c:2259
 msgid "Number of proposal accelerators to show"
 msgstr "Näytettävien ehdotuspikanäppäinten lukumäärä"
 
-#: ../gtksourceview/gtksourcecompletion.c:2249
+#: ../gtksourceview/gtksourcecompletion.c:2274
 msgid "Auto Complete Delay"
 msgstr "Autotäydennysviive"
 
-#: ../gtksourceview/gtksourcecompletion.c:2250
+#: ../gtksourceview/gtksourcecompletion.c:2275
 msgid "Completion popup delay for interactive completion"
 msgstr "Täydennysikkunan viive interaktiivisessa täydennyksessä"
 
-#: ../gtksourceview/gtksourcecompletion.c:2266
+#: ../gtksourceview/gtksourcecompletion.c:2291
 msgid "Provider Page Size"
 msgstr "Tarjoajan sivukoko"
 
-#: ../gtksourceview/gtksourcecompletion.c:2267
+#: ../gtksourceview/gtksourcecompletion.c:2292
 msgid "Provider scrolling page size"
 msgstr "Tarjoajan vierityssivun koko"
 
-#: ../gtksourceview/gtksourcecompletion.c:2287
+#: ../gtksourceview/gtksourcecompletion.c:2312
 msgid "Proposal Page Size"
 msgstr "Ehdotusten sivukoko"
 
-#: ../gtksourceview/gtksourcecompletion.c:2288
+#: ../gtksourceview/gtksourcecompletion.c:2313
 msgid "Proposal scrolling page size"
 msgstr "Tarjoajan vierityssivun koko"
 
 #: ../gtksourceview/gtksourcecompletioncontext.c:271
-#: ../gtksourceview/gtksourceview.c:313
+#: ../gtksourceview/gtksourceview.c:334
 msgid "Completion"
 msgstr "Täydennys"
 
@@ -3217,7 +3221,7 @@
 msgstr "GtkTextIter, jonka täydennystä käytettiin"
 
 #. Tooltip style
-#: ../gtksourceview/gtksourcecompletioninfo.c:253
+#: ../gtksourceview/gtksourcecompletioninfo.c:264
 msgid "Completion Info"
 msgstr "Täydennystieto"
 
@@ -3297,11 +3301,11 @@
 #: ../gtksourceview/gtksourcecontextengine.c:6130
 #, c-format
 msgid ""
-"style override used with wildcard context reference in language '%s' in ref '"
-"%s'"
+"style override used with wildcard context reference in language '%s' in ref "
+"'%s'"
 msgstr ""
-"tyylin ohitusta käytettiin jokerimerkillisessä kontekstiviitteessä kielellä ”"
-"%s” viitteessä ”%s”"
+"tyylin ohitusta käytettiin jokerimerkillisessä kontekstiviitteessä kielellä "
+"”%s” viitteessä ”%s”"
 
 #: ../gtksourceview/gtksourcecontextengine.c:6144
 #, c-format
@@ -3319,143 +3323,143 @@
 msgid "Missing main language definition (id = \"%s\".)"
 msgstr "Kielen päämäärittly puuttuu (tunniste = ”%s”.)"
 
-#: ../gtksourceview/gtksourceencoding.c:136
-#: ../gtksourceview/gtksourceencoding.c:179
-#: ../gtksourceview/gtksourceencoding.c:181
-#: ../gtksourceview/gtksourceencoding.c:183
-#: ../gtksourceview/gtksourceencoding.c:185
-#: ../gtksourceview/gtksourceencoding.c:187
-#: ../gtksourceview/gtksourceencoding.c:189
-#: ../gtksourceview/gtksourceencoding.c:191
+#: ../gtksourceview/gtksourceencoding.c:137
+#: ../gtksourceview/gtksourceencoding.c:180
+#: ../gtksourceview/gtksourceencoding.c:182
+#: ../gtksourceview/gtksourceencoding.c:184
+#: ../gtksourceview/gtksourceencoding.c:186
+#: ../gtksourceview/gtksourceencoding.c:188
+#: ../gtksourceview/gtksourceencoding.c:190
+#: ../gtksourceview/gtksourceencoding.c:192
 msgid "Unicode"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:150
-#: ../gtksourceview/gtksourceencoding.c:174
-#: ../gtksourceview/gtksourceencoding.c:224
-#: ../gtksourceview/gtksourceencoding.c:267
+#: ../gtksourceview/gtksourceencoding.c:151
+#: ../gtksourceview/gtksourceencoding.c:175
+#: ../gtksourceview/gtksourceencoding.c:225
+#: ../gtksourceview/gtksourceencoding.c:268
 msgid "Western"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:152
-#: ../gtksourceview/gtksourceencoding.c:226
-#: ../gtksourceview/gtksourceencoding.c:263
+#: ../gtksourceview/gtksourceencoding.c:153
+#: ../gtksourceview/gtksourceencoding.c:227
+#: ../gtksourceview/gtksourceencoding.c:264
 msgid "Central European"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:154
+#: ../gtksourceview/gtksourceencoding.c:155
 msgid "South European"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:156
-#: ../gtksourceview/gtksourceencoding.c:170
-#: ../gtksourceview/gtksourceencoding.c:277
+#: ../gtksourceview/gtksourceencoding.c:157
+#: ../gtksourceview/gtksourceencoding.c:171
+#: ../gtksourceview/gtksourceencoding.c:278
 msgid "Baltic"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:158
-#: ../gtksourceview/gtksourceencoding.c:228
-#: ../gtksourceview/gtksourceencoding.c:241
-#: ../gtksourceview/gtksourceencoding.c:245
-#: ../gtksourceview/gtksourceencoding.c:247
-#: ../gtksourceview/gtksourceencoding.c:265
+#: ../gtksourceview/gtksourceencoding.c:159
+#: ../gtksourceview/gtksourceencoding.c:229
+#: ../gtksourceview/gtksourceencoding.c:242
+#: ../gtksourceview/gtksourceencoding.c:246
+#: ../gtksourceview/gtksourceencoding.c:248
+#: ../gtksourceview/gtksourceencoding.c:266
 msgid "Cyrillic"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:160
-#: ../gtksourceview/gtksourceencoding.c:234
-#: ../gtksourceview/gtksourceencoding.c:275
+#: ../gtksourceview/gtksourceencoding.c:161
+#: ../gtksourceview/gtksourceencoding.c:235
+#: ../gtksourceview/gtksourceencoding.c:276
 msgid "Arabic"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:162
-#: ../gtksourceview/gtksourceencoding.c:269
+#: ../gtksourceview/gtksourceencoding.c:163
+#: ../gtksourceview/gtksourceencoding.c:270
 msgid "Greek"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:164
+#: ../gtksourceview/gtksourceencoding.c:165
 msgid "Hebrew Visual"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:166
-#: ../gtksourceview/gtksourceencoding.c:230
-#: ../gtksourceview/gtksourceencoding.c:271
+#: ../gtksourceview/gtksourceencoding.c:167
+#: ../gtksourceview/gtksourceencoding.c:231
+#: ../gtksourceview/gtksourceencoding.c:272
 msgid "Turkish"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:168
+#: ../gtksourceview/gtksourceencoding.c:169
 msgid "Nordic"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:172
+#: ../gtksourceview/gtksourceencoding.c:173
 msgid "Celtic"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:176
+#: ../gtksourceview/gtksourceencoding.c:177
 msgid "Romanian"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:194
+#: ../gtksourceview/gtksourceencoding.c:195
 msgid "Armenian"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:196
-#: ../gtksourceview/gtksourceencoding.c:198
-#: ../gtksourceview/gtksourceencoding.c:212
+#: ../gtksourceview/gtksourceencoding.c:197
+#: ../gtksourceview/gtksourceencoding.c:199
+#: ../gtksourceview/gtksourceencoding.c:213
 msgid "Chinese Traditional"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:200
+#: ../gtksourceview/gtksourceencoding.c:201
 msgid "Cyrillic/Russian"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:203
-#: ../gtksourceview/gtksourceencoding.c:205
-#: ../gtksourceview/gtksourceencoding.c:207
-#: ../gtksourceview/gtksourceencoding.c:237
-#: ../gtksourceview/gtksourceencoding.c:252
+#: ../gtksourceview/gtksourceencoding.c:204
+#: ../gtksourceview/gtksourceencoding.c:206
+#: ../gtksourceview/gtksourceencoding.c:208
+#: ../gtksourceview/gtksourceencoding.c:238
+#: ../gtksourceview/gtksourceencoding.c:253
 msgid "Japanese"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:210
-#: ../gtksourceview/gtksourceencoding.c:239
-#: ../gtksourceview/gtksourceencoding.c:243
-#: ../gtksourceview/gtksourceencoding.c:258
+#: ../gtksourceview/gtksourceencoding.c:211
+#: ../gtksourceview/gtksourceencoding.c:240
+#: ../gtksourceview/gtksourceencoding.c:244
+#: ../gtksourceview/gtksourceencoding.c:259
 msgid "Korean"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:215
-#: ../gtksourceview/gtksourceencoding.c:217
-#: ../gtksourceview/gtksourceencoding.c:219
+#: ../gtksourceview/gtksourceencoding.c:216
+#: ../gtksourceview/gtksourceencoding.c:218
+#: ../gtksourceview/gtksourceencoding.c:220
 msgid "Chinese Simplified"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:221
+#: ../gtksourceview/gtksourceencoding.c:222
 msgid "Georgian"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:232
-#: ../gtksourceview/gtksourceencoding.c:273
+#: ../gtksourceview/gtksourceencoding.c:233
+#: ../gtksourceview/gtksourceencoding.c:274
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:249
+#: ../gtksourceview/gtksourceencoding.c:250
 msgid "Cyrillic/Ukrainian"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:254
-#: ../gtksourceview/gtksourceencoding.c:260
-#: ../gtksourceview/gtksourceencoding.c:279
+#: ../gtksourceview/gtksourceencoding.c:255
+#: ../gtksourceview/gtksourceencoding.c:261
+#: ../gtksourceview/gtksourceencoding.c:280
 #, fuzzy
 #| msgid "Filename"
 msgid "Vietnamese"
 msgstr "Tiedostonimi"
 
-#: ../gtksourceview/gtksourceencoding.c:256
+#: ../gtksourceview/gtksourceencoding.c:257
 msgid "Thai"
 msgstr ""
 
-#: ../gtksourceview/gtksourceencoding.c:487
+#: ../gtksourceview/gtksourceencoding.c:491
 msgid "Unknown"
 msgstr ""
 
@@ -3471,69 +3475,70 @@
 #. * recognized encodings are used. See
 #. * https://git.gnome.org/browse/gtksourceview/tree/gtksourceview/gtksourceencoding.c#n147
 #. * for a list of supported encodings.
+#. * Keep the same format: square brackets, single quotes, commas.
 #.
-#: ../gtksourceview/gtksourceencoding.c:517
+#: ../gtksourceview/gtksourceencoding.c:650
 msgid "['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']"
 msgstr "['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']"
 
-#: ../gtksourceview/gtksourcefile.c:202
-#: ../gtksourceview/gtksourcefilesaver.c:407
+#: ../gtksourceview/gtksourcefile.c:200
+#: ../gtksourceview/gtksourcefilesaver.c:410
 #, fuzzy
 #| msgid "Newline"
 msgid "Newline type"
 msgstr "Rivinvaihto"
 
-#: ../gtksourceview/gtksourcefile.c:219
-#: ../gtksourceview/gtksourcefilesaver.c:425
+#: ../gtksourceview/gtksourcefile.c:217
+#: ../gtksourceview/gtksourcefilesaver.c:428
 #, fuzzy
 #| msgid "Class"
 msgid "Compression type"
 msgstr "Luokka"
 
-#: ../gtksourceview/gtksourcefileloader.c:406
+#: ../gtksourceview/gtksourcefileloader.c:414
 msgid "Input stream"
 msgstr ""
 
-#: ../gtksourceview/gtksourcefilesaver.c:443
+#: ../gtksourceview/gtksourcefilesaver.c:446
 msgid "Flags"
 msgstr ""
 
 #. Translators: gutters can be used to display information
 #. * on the left or on the right of the text view. To draw the
 #. * line numbers for example.
-#: ../gtksourceview/gtksourcegutter.c:553
+#: ../gtksourceview/gtksourcegutter.c:518
 msgid "The gutters' GtkSourceView"
 msgstr "Kourun GtkSourceView"
 
-#: ../gtksourceview/gtksourcegutter.c:565
+#: ../gtksourceview/gtksourcegutter.c:530
 #: ../gtksourceview/gtksourcegutterrenderer.c:741
 msgid "Window Type"
 msgstr "Ikkunatyyppi"
 
-#: ../gtksourceview/gtksourcegutter.c:566
+#: ../gtksourceview/gtksourcegutter.c:531
 #, fuzzy
 #| msgid "The gutters text window type"
 msgid "The gutters' text window type"
 msgstr "Kourun teksti-ikkunatyyppi"
 
-#: ../gtksourceview/gtksourcegutter.c:582
+#: ../gtksourceview/gtksourcegutter.c:547
 #: ../gtksourceview/gtksourcegutterrenderer.c:524
 #, fuzzy
 msgid "X Padding"
 msgstr "POD-otsake"
 
-#: ../gtksourceview/gtksourcegutter.c:583
+#: ../gtksourceview/gtksourcegutter.c:548
 #: ../gtksourceview/gtksourcegutterrenderer.c:525
 msgid "The x-padding"
 msgstr ""
 
-#: ../gtksourceview/gtksourcegutter.c:600
+#: ../gtksourceview/gtksourcegutter.c:565
 #: ../gtksourceview/gtksourcegutterrenderer.c:539
 #, fuzzy
 msgid "Y Padding"
 msgstr "POD-otsake"
 
-#: ../gtksourceview/gtksourcegutter.c:601
+#: ../gtksourceview/gtksourcegutter.c:566
 #: ../gtksourceview/gtksourcegutterrenderer.c:540
 msgid "The y-padding"
 msgstr ""
@@ -3589,53 +3594,53 @@
 msgid "The size"
 msgstr ""
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:298
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:299
 #: ../gtksourceview/gtksourcemarkattributes.c:315
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:299
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:300
 #: ../gtksourceview/gtksourcemarkattributes.c:316
 msgid "The pixbuf"
 msgstr ""
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:313
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:314
 #: ../gtksourceview/gtksourcemarkattributes.c:302
 msgid "Stock Id"
 msgstr ""
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:314
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:315
 #: ../gtksourceview/gtksourcemarkattributes.c:303
 msgid "The stock id"
 msgstr ""
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:321
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:322
 #: ../gtksourceview/gtksourcemarkattributes.c:328
 msgid "Icon Name"
 msgstr "Kuvakkeen nimi"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:322
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:323
 #: ../gtksourceview/gtksourcemarkattributes.c:329
 msgid "The icon name"
 msgstr "Kuvakkeen nimi"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:329
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:330
 #: ../gtksourceview/gtksourcemarkattributes.c:341
 #, fuzzy
 msgid "GIcon"
 msgstr "Kuvake"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:330
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:331
 #, fuzzy
 msgid "The gicon"
 msgstr "Tarjoajan kuvake"
 
-#: ../gtksourceview/gtksourcegutterrenderertext.c:402
+#: ../gtksourceview/gtksourcegutterrenderertext.c:414
 #, fuzzy
 msgid "The markup"
 msgstr "Merkintä"
 
-#: ../gtksourceview/gtksourcegutterrenderertext.c:410
+#: ../gtksourceview/gtksourcegutterrenderertext.c:422
 #, fuzzy
 msgid "The text"
 msgstr "Kohteen teksti"
@@ -3722,12 +3727,12 @@
 msgstr "Tulostettava GtkSourceBuffer-olio"
 
 #: ../gtksourceview/gtksourceprintcompositor.c:463
-#: ../gtksourceview/gtksourceview.c:351
+#: ../gtksourceview/gtksourceview.c:372
 msgid "Tab Width"
 msgstr "Sarkaimen leveys"
 
 #: ../gtksourceview/gtksourceprintcompositor.c:464
-#: ../gtksourceview/gtksourceview.c:352
+#: ../gtksourceview/gtksourceview.c:373
 msgid "Width of a tab character expressed in spaces"
 msgstr "Sarkaimen leveys välilyönteinä esitettynä"
 
@@ -3817,7 +3822,6 @@
 msgstr "Käytetään arvoa \\C tukemattomissa kielimäärittelyissä"
 
 #: ../gtksourceview/gtksourcesearchcontext.c:2742
-#: ../gtksourceview/gtksourceundomanagerdefault.c:403
 msgid "Buffer"
 msgstr "Puskuri"
 
@@ -4039,75 +4043,71 @@
 msgid "List of the ids of the available style schemes"
 msgstr "Luettelo saatavilla olevista tyylimallien tunnisteista"
 
-#: ../gtksourceview/gtksourceundomanagerdefault.c:404
-msgid "The text buffer to add undo support on"
-msgstr "Tekstipuskuri, jolle lisätään kumoamistuki"
-
-#: ../gtksourceview/gtksourceview.c:314
+#: ../gtksourceview/gtksourceview.c:335
 msgid "The completion object associated with the view"
 msgstr "Täydennysolio, joka on liitetty näkymään"
 
-#: ../gtksourceview/gtksourceview.c:326
+#: ../gtksourceview/gtksourceview.c:347
 msgid "Show Line Numbers"
 msgstr "Näytä rivinumerot"
 
-#: ../gtksourceview/gtksourceview.c:327
+#: ../gtksourceview/gtksourceview.c:348
 msgid "Whether to display line numbers"
 msgstr "Näkyvätkö rivinumerot"
 
-#: ../gtksourceview/gtksourceview.c:338
+#: ../gtksourceview/gtksourceview.c:359
 msgid "Show Line Marks"
 msgstr "Näytä rivimerkit"
 
-#: ../gtksourceview/gtksourceview.c:339
+#: ../gtksourceview/gtksourceview.c:360
 msgid "Whether to display line mark pixbufs"
 msgstr "Näytetäänkö rivimerkkien kuvapuskurit"
 
-#: ../gtksourceview/gtksourceview.c:366
+#: ../gtksourceview/gtksourceview.c:387
 msgid "Indent Width"
 msgstr "Sisennyksen leveys"
 
-#: ../gtksourceview/gtksourceview.c:367
+#: ../gtksourceview/gtksourceview.c:388
 msgid "Number of spaces to use for each step of indent"
 msgstr "Kullakin sisennystasolla käytetty leveys välilyönteinä"
 
-#: ../gtksourceview/gtksourceview.c:376
+#: ../gtksourceview/gtksourceview.c:397
 msgid "Auto Indentation"
 msgstr "Automaattinen sisennys"
 
-#: ../gtksourceview/gtksourceview.c:377
+#: ../gtksourceview/gtksourceview.c:398
 msgid "Whether to enable auto indentation"
 msgstr "Onko automaattinen sisennys käytössä"
 
-#: ../gtksourceview/gtksourceview.c:384
+#: ../gtksourceview/gtksourceview.c:405
 msgid "Insert Spaces Instead of Tabs"
 msgstr "Lisää välilyöntejä sarkainten sijaan"
 
-#: ../gtksourceview/gtksourceview.c:385
+#: ../gtksourceview/gtksourceview.c:406
 msgid "Whether to insert spaces instead of tabs"
 msgstr "Lisätäänkö välilyöntejä sarkainten sijaan"
 
-#: ../gtksourceview/gtksourceview.c:397
+#: ../gtksourceview/gtksourceview.c:418
 msgid "Show Right Margin"
 msgstr "Näytä oikea reunus"
 
-#: ../gtksourceview/gtksourceview.c:398
+#: ../gtksourceview/gtksourceview.c:419
 msgid "Whether to display the right margin"
 msgstr "Näkyykö oikea reunus"
 
-#: ../gtksourceview/gtksourceview.c:410
+#: ../gtksourceview/gtksourceview.c:431
 msgid "Right Margin Position"
 msgstr "Oikean reunuksen sijainti"
 
-#: ../gtksourceview/gtksourceview.c:411
+#: ../gtksourceview/gtksourceview.c:432
 msgid "Position of the right margin"
 msgstr "Oikean reunuksen sijainti"
 
-#: ../gtksourceview/gtksourceview.c:427
+#: ../gtksourceview/gtksourceview.c:448
 msgid "Smart Home/End"
 msgstr "Älykkäät home- ja end-näppäimet"
 
-#: ../gtksourceview/gtksourceview.c:428
+#: ../gtksourceview/gtksourceview.c:449
 msgid ""
 "HOME and END keys move to first/last non whitespace characters on line "
 "before going to the start/end of the line"
@@ -4115,66 +4115,69 @@
 "Home- ja End-näppäimet siirtävät kohdistimen rivin ensimmäisen tai viimeisen "
 "merkin kohdalle ennen koko rivin alkuun tai loppuun siirtämistä."
 
-#: ../gtksourceview/gtksourceview.c:438
+#: ../gtksourceview/gtksourceview.c:459
 msgid "Highlight current line"
 msgstr "Korosta nykyinen rivi"
 
-#: ../gtksourceview/gtksourceview.c:439
+#: ../gtksourceview/gtksourceview.c:460
 msgid "Whether to highlight the current line"
 msgstr "Korostetaanko nykyinen rivi"
 
-#: ../gtksourceview/gtksourceview.c:446
+#: ../gtksourceview/gtksourceview.c:467
 msgid "Indent on tab"
 msgstr "Sisennä sarkaimella"
 
-#: ../gtksourceview/gtksourceview.c:447
+#: ../gtksourceview/gtksourceview.c:468
 msgid "Whether to indent the selected text when the tab key is pressed"
 msgstr "Sisennetäänkö valittu teksti painettaessa sarkainnäppäintä"
 
-#: ../gtksourceview/gtksourceview.c:461
+#: ../gtksourceview/gtksourceview.c:482
 msgid "Draw Spaces"
 msgstr "Piirrä tyhjeet"
 
-#: ../gtksourceview/gtksourceview.c:462
+#: ../gtksourceview/gtksourceview.c:483
 msgid "Set if and how the spaces should be visualized"
 msgstr "Aseta kuinka tyhjeet esitetään"
 
 #. create redo menu_item.
-#: ../gtksourceview/gtksourceview.c:1237
+#: ../gtksourceview/gtksourceview.c:1279
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
 #. create undo menu_item.
-#: ../gtksourceview/gtksourceview.c:1248
+#: ../gtksourceview/gtksourceview.c:1290
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: ../gtksourceview/gtksourceview.c:1266
+#: ../gtksourceview/gtksourceview.c:1308
 msgid "All _Upper Case"
 msgstr ""
 
-#: ../gtksourceview/gtksourceview.c:1276
+#: ../gtksourceview/gtksourceview.c:1318
 msgid "All _Lower Case"
 msgstr ""
 
-#: ../gtksourceview/gtksourceview.c:1286
+#: ../gtksourceview/gtksourceview.c:1328
 msgid "_Invert Case"
 msgstr ""
 
-#: ../gtksourceview/gtksourceview.c:1296
+#: ../gtksourceview/gtksourceview.c:1338
 msgid "_Title Case"
 msgstr ""
 
-#: ../gtksourceview/gtksourceview.c:1306
+#: ../gtksourceview/gtksourceview.c:1348
 #, fuzzy
 #| msgid "Changed line"
 msgid "C_hange Case"
 msgstr "Muutettu rivi"
 
-#: ../gtksourceview/gtksourceview-i18n.c:72
+#: ../gtksourceview/gtksourceview-i18n.c:116
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2006-2009\n"
 "Pauli Virtanen, 2003-2005\n"
 "\n"
-"http://gnome.fi/"
+"https://l10n.gnome.org/teams/fi/"
+
+#~ msgid "The text buffer to add undo support on"
+#~ msgstr "Tekstipuskuri, jolle lisätään kumoamistuki"

=== modified file 'po/nb.po'
--- po/nb.po	2014-10-13 20:29:35 +0000
+++ po/nb.po	2015-02-25 08:09:43 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gtksourceview 3.13.x\n"
+"Project-Id-Version: gtksourceview 3.14.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-06 14:06+0200\n"
-"PO-Revision-Date: 2014-09-06 14:09+0200\n"
+"POT-Creation-Date: 2014-10-20 19:10+0200\n"
+"PO-Revision-Date: 2014-10-20 19:13+0200\n"
 "Last-Translator: Kjartan Maraas <[e-mail]>\n"
 "Language-Team: Norwegian bokmål <[e-mail]>\n"
 "Language: \n"
@@ -58,7 +58,7 @@
 
 #: ../data/glade/gtksourceview.xml.in.h:12
 #: ../gtksourceview/gtksourcecompletionitem.c:262
-#: ../gtksourceview/gtksourcegutterrenderertext.c:409
+#: ../gtksourceview/gtksourcegutterrenderertext.c:421
 msgid "Text"
 msgstr "Tekst"
 
@@ -69,7 +69,7 @@
 #. Translators: "All" is used as a label in the status bar of the
 #. popup, telling that all completion pages are shown.
 #: ../data/glade/gtksourceview.xml.in.h:14
-#: ../gtksourceview/gtksourcecompletion.c:788
+#: ../gtksourceview/gtksourcecompletion.c:811
 msgid "All"
 msgstr "Alle"
 
@@ -699,7 +699,7 @@
 #: ../data/language-specs/texinfo.lang.h:1 ../data/language-specs/xml.lang.h:1
 #: ../data/language-specs/xslt.lang.h:1
 #: ../gtksourceview/gtksourcecompletionitem.c:249
-#: ../gtksourceview/gtksourcegutterrenderertext.c:401
+#: ../gtksourceview/gtksourcegutterrenderertext.c:413
 msgid "Markup"
 msgstr "Merking"
 
@@ -1146,7 +1146,7 @@
 
 #: ../data/language-specs/desktop.lang.h:11
 #: ../gtksourceview/gtksourcefile.c:184
-#: ../gtksourceview/gtksourcefilesaver.c:390
+#: ../gtksourceview/gtksourcefilesaver.c:393
 msgid "Encoding"
 msgstr "Koding"
 
@@ -1188,8 +1188,8 @@
 #. String
 #: ../data/language-specs/diff.lang.h:11 ../data/language-specs/po.lang.h:4
 #: ../gtksourceview/gtksourcefile.c:167
-#: ../gtksourceview/gtksourcefileloader.c:394
-#: ../gtksourceview/gtksourcefilesaver.c:373
+#: ../gtksourceview/gtksourcefileloader.c:397
+#: ../gtksourceview/gtksourcefilesaver.c:376
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -1596,11 +1596,11 @@
 
 #: ../data/language-specs/haddock.lang.h:12
 msgid "Itemized list"
-msgstr ""
+msgstr "Spesifisert liste"
 
 #: ../data/language-specs/haddock.lang.h:13
 msgid "Enumerated list"
-msgstr ""
+msgstr "Nummerert liste"
 
 #: ../data/language-specs/haddock.lang.h:14
 msgid "Definition list"
@@ -2978,82 +2978,82 @@
 msgid "Incomplete UTF-8 sequence in input"
 msgstr "Ufullstendig UTF-8 sekvens i inndata"
 
-#: ../gtksourceview/gtksourcecompletion.c:2162
-#: ../gtksourceview/gtksourcegutter.c:549
+#: ../gtksourceview/gtksourcecompletion.c:2187
+#: ../gtksourceview/gtksourcegutter.c:514
 msgid "View"
 msgstr "Vis"
 
-#: ../gtksourceview/gtksourcecompletion.c:2163
+#: ../gtksourceview/gtksourcecompletion.c:2188
 msgid "The GtkSourceView bound to the completion"
 msgstr "GtkSourceView-objekt som er bundet til fullføring"
 
-#: ../gtksourceview/gtksourcecompletion.c:2177
+#: ../gtksourceview/gtksourcecompletion.c:2202
 msgid "Remember Info Visibility"
 msgstr "Husk synlighet for informasjon"
 
-#: ../gtksourceview/gtksourcecompletion.c:2178
+#: ../gtksourceview/gtksourcecompletion.c:2203
 msgid "Remember the last info window visibility state"
 msgstr "Husk synlighetstilstand for siste informasjonsvindu"
 
-#: ../gtksourceview/gtksourcecompletion.c:2190
+#: ../gtksourceview/gtksourcecompletion.c:2215
 msgid "Select on Show"
 msgstr "Velg ved visning"
 
-#: ../gtksourceview/gtksourcecompletion.c:2191
+#: ../gtksourceview/gtksourcecompletion.c:2216
 msgid "Select first proposal when completion is shown"
 msgstr "Velg første forslag når fullføring vises"
 
-#: ../gtksourceview/gtksourcecompletion.c:2204
+#: ../gtksourceview/gtksourcecompletion.c:2229
 msgid "Show Headers"
 msgstr "Vis hoder"
 
-#: ../gtksourceview/gtksourcecompletion.c:2205
+#: ../gtksourceview/gtksourcecompletion.c:2230
 msgid ""
 "Show provider headers when proposals from multiple providers are available"
 msgstr ""
 
-#: ../gtksourceview/gtksourcecompletion.c:2218
+#: ../gtksourceview/gtksourcecompletion.c:2243
 msgid "Show Icons"
 msgstr "Vis ikoner"
 
-#: ../gtksourceview/gtksourcecompletion.c:2219
+#: ../gtksourceview/gtksourcecompletion.c:2244
 msgid "Show provider and proposal icons in the completion popup"
 msgstr "Vis tilbyder og foreslåtte ikoner i fullføringsdialogen"
 
-#: ../gtksourceview/gtksourcecompletion.c:2233
+#: ../gtksourceview/gtksourcecompletion.c:2258
 msgid "Accelerators"
 msgstr "Akselleratorer"
 
-#: ../gtksourceview/gtksourcecompletion.c:2234
+#: ../gtksourceview/gtksourcecompletion.c:2259
 msgid "Number of proposal accelerators to show"
 msgstr "Antall foreslåtte hurtigtaster som skal vises"
 
-#: ../gtksourceview/gtksourcecompletion.c:2249
+#: ../gtksourceview/gtksourcecompletion.c:2274
 msgid "Auto Complete Delay"
 msgstr "Pause før automatisk fullføring"
 
-#: ../gtksourceview/gtksourcecompletion.c:2250
+#: ../gtksourceview/gtksourcecompletion.c:2275
 msgid "Completion popup delay for interactive completion"
 msgstr ""
 
-#: ../gtksourceview/gtksourcecompletion.c:2266
+#: ../gtksourceview/gtksourcecompletion.c:2291
 msgid "Provider Page Size"
 msgstr "Sidestørrelse for tilbyder"
 
-#: ../gtksourceview/gtksourcecompletion.c:2267
+#: ../gtksourceview/gtksourcecompletion.c:2292
 msgid "Provider scrolling page size"
 msgstr ""
 
-#: ../gtksourceview/gtksourcecompletion.c:2287
+#: ../gtksourceview/gtksourcecompletion.c:2312
 msgid "Proposal Page Size"
 msgstr "Sidestørrelse for forslag"
 
-#: ../gtksourceview/gtksourcecompletion.c:2288
+#: ../gtksourceview/gtksourcecompletion.c:2313
 msgid "Proposal scrolling page size"
 msgstr ""
 
 #: ../gtksourceview/gtksourcecompletioncontext.c:271
-#: ../gtksourceview/gtksourceview.c:313
+#: ../gtksourceview/gtksourceview.c:334
 msgid "Completion"
 msgstr "Fullføring"
 
@@ -3327,57 +3327,56 @@
 msgstr "['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']"
 
 #: ../gtksourceview/gtksourcefile.c:200
-#: ../gtksourceview/gtksourcefilesaver.c:407
-#, fuzzy
+#: ../gtksourceview/gtksourcefilesaver.c:410
 msgid "Newline type"
-msgstr "Linjeskift"
+msgstr "Type linjeskift"
 
 #: ../gtksourceview/gtksourcefile.c:217
-#: ../gtksourceview/gtksourcefilesaver.c:425
+#: ../gtksourceview/gtksourcefilesaver.c:428
 msgid "Compression type"
 msgstr "Type komprimering"
 
-#: ../gtksourceview/gtksourcefileloader.c:411
+#: ../gtksourceview/gtksourcefileloader.c:414
 msgid "Input stream"
-msgstr ""
+msgstr "Inndatastrøm"
 
-#: ../gtksourceview/gtksourcefilesaver.c:443
+#: ../gtksourceview/gtksourcefilesaver.c:446
 msgid "Flags"
 msgstr "Flagg"
 
 #. Translators: gutters can be used to display information
 #. * on the left or on the right of the text view. To draw the
 #. * line numbers for example.
-#: ../gtksourceview/gtksourcegutter.c:553
+#: ../gtksourceview/gtksourcegutter.c:518
 msgid "The gutters' GtkSourceView"
 msgstr "GtkSourceView for «gutter»"
 
-#: ../gtksourceview/gtksourcegutter.c:565
+#: ../gtksourceview/gtksourcegutter.c:530
 #: ../gtksourceview/gtksourcegutterrenderer.c:741
 msgid "Window Type"
 msgstr "Vindustype"
 
-#: ../gtksourceview/gtksourcegutter.c:566
+#: ../gtksourceview/gtksourcegutter.c:531
 #, fuzzy
 msgid "The gutters' text window type"
 msgstr "Tekstvindutype for «gutter»"
 
-#: ../gtksourceview/gtksourcegutter.c:582
+#: ../gtksourceview/gtksourcegutter.c:547
 #: ../gtksourceview/gtksourcegutterrenderer.c:524
 msgid "X Padding"
 msgstr "X-fyll"
 
-#: ../gtksourceview/gtksourcegutter.c:583
+#: ../gtksourceview/gtksourcegutter.c:548
 #: ../gtksourceview/gtksourcegutterrenderer.c:525
 msgid "The x-padding"
 msgstr "X-fyll"
 
-#: ../gtksourceview/gtksourcegutter.c:600
+#: ../gtksourceview/gtksourcegutter.c:565
 #: ../gtksourceview/gtksourcegutterrenderer.c:539
 msgid "Y Padding"
 msgstr "Y-fyll"
 
-#: ../gtksourceview/gtksourcegutter.c:601
+#: ../gtksourceview/gtksourcegutter.c:566
 #: ../gtksourceview/gtksourcegutterrenderer.c:540
 msgid "The y-padding"
 msgstr "Y-fyll"
@@ -3431,50 +3430,50 @@
 msgid "The size"
 msgstr "Størrelsen"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:298
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:299
 #: ../gtksourceview/gtksourcemarkattributes.c:315
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:299
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:300
 #: ../gtksourceview/gtksourcemarkattributes.c:316
 msgid "The pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:313
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:314
 #: ../gtksourceview/gtksourcemarkattributes.c:302
 msgid "Stock Id"
 msgstr "Standard-ID"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:314
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:315
 #: ../gtksourceview/gtksourcemarkattributes.c:303
 msgid "The stock id"
 msgstr "Standard-ID"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:321
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:322
 #: ../gtksourceview/gtksourcemarkattributes.c:328
 msgid "Icon Name"
 msgstr "Navn på ikon"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:322
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:323
 #: ../gtksourceview/gtksourcemarkattributes.c:329
 msgid "The icon name"
 msgstr "Navn på ikonet"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:329
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:330
 #: ../gtksourceview/gtksourcemarkattributes.c:341
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:330
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:331
 msgid "The gicon"
 msgstr "GIcon"
 
-#: ../gtksourceview/gtksourcegutterrenderertext.c:402
+#: ../gtksourceview/gtksourcegutterrenderertext.c:414
 msgid "The markup"
 msgstr "Merking"
 
-#: ../gtksourceview/gtksourcegutterrenderertext.c:410
+#: ../gtksourceview/gtksourcegutterrenderertext.c:422
 msgid "The text"
 msgstr "Teksten"
 
@@ -3559,12 +3558,12 @@
 msgstr "GtkSourceBuffer-objekt som skal skrives ut"
 
 #: ../gtksourceview/gtksourceprintcompositor.c:463
-#: ../gtksourceview/gtksourceview.c:351
+#: ../gtksourceview/gtksourceview.c:372
 msgid "Tab Width"
 msgstr "Tabulatorbredde"
 
 #: ../gtksourceview/gtksourceprintcompositor.c:464
-#: ../gtksourceview/gtksourceview.c:352
+#: ../gtksourceview/gtksourceview.c:373
 msgid "Width of a tab character expressed in spaces"
 msgstr "Bredde på et tabulatortegn uttrykt i mellomrom"
 
@@ -3819,14 +3818,12 @@
 msgstr "Om attributten gjennomstreket er satt"
 
 #: ../gtksourceview/gtksourcestyle.c:209
-#, fuzzy
 msgid "Scale set"
-msgstr "Kursiv satt"
+msgstr "Skalering satt"
 
 #: ../gtksourceview/gtksourcestyle.c:210
-#, fuzzy
 msgid "Whether scale attribute is set"
-msgstr "Om attributten kursiv er satt"
+msgstr "Om attributten skalering er satt"
 
 #: ../gtksourceview/gtksourcestylescheme.c:211
 #: ../gtksourceview/gtksourcestylescheme.c:212
@@ -3864,71 +3861,71 @@
 msgid "List of the ids of the available style schemes"
 msgstr "Liste med IDer for tilgjengelige stil-schema"
 
-#: ../gtksourceview/gtksourceview.c:314
+#: ../gtksourceview/gtksourceview.c:335
 msgid "The completion object associated with the view"
 msgstr "Fullføringsobjekt assosiert med visningen"
 
-#: ../gtksourceview/gtksourceview.c:326
+#: ../gtksourceview/gtksourceview.c:347
 msgid "Show Line Numbers"
 msgstr "Vis linjenummer"
 
-#: ../gtksourceview/gtksourceview.c:327
+#: ../gtksourceview/gtksourceview.c:348
 msgid "Whether to display line numbers"
 msgstr "Om linjenummer skal vises"
 
-#: ../gtksourceview/gtksourceview.c:338
+#: ../gtksourceview/gtksourceview.c:359
 msgid "Show Line Marks"
 msgstr "Vis linjemarkører"
 
-#: ../gtksourceview/gtksourceview.c:339
+#: ../gtksourceview/gtksourceview.c:360
 msgid "Whether to display line mark pixbufs"
 msgstr "Om bilder skal vises for linjemarkører"
 
-#: ../gtksourceview/gtksourceview.c:366
+#: ../gtksourceview/gtksourceview.c:387
 msgid "Indent Width"
 msgstr "Bredde for innrykk"
 
-#: ../gtksourceview/gtksourceview.c:367
+#: ../gtksourceview/gtksourceview.c:388
 msgid "Number of spaces to use for each step of indent"
 msgstr "Antall mellomrom som skal brukes for hvert steg med innrykk"
 
-#: ../gtksourceview/gtksourceview.c:376
+#: ../gtksourceview/gtksourceview.c:397
 msgid "Auto Indentation"
 msgstr "Automatisk innrykk"
 
-#: ../gtksourceview/gtksourceview.c:377
+#: ../gtksourceview/gtksourceview.c:398
 msgid "Whether to enable auto indentation"
 msgstr "Om automatisk innrykk skal aktiveres"
 
-#: ../gtksourceview/gtksourceview.c:384
+#: ../gtksourceview/gtksourceview.c:405
 msgid "Insert Spaces Instead of Tabs"
 msgstr "Sett inn mellomrom i stedet for tabulator"
 
-#: ../gtksourceview/gtksourceview.c:385
+#: ../gtksourceview/gtksourceview.c:406
 msgid "Whether to insert spaces instead of tabs"
 msgstr "Om mellomrom skal settes inn i stedet for tabulator"
 
-#: ../gtksourceview/gtksourceview.c:397
+#: ../gtksourceview/gtksourceview.c:418
 msgid "Show Right Margin"
 msgstr "Vis høyre marg"
 
-#: ../gtksourceview/gtksourceview.c:398
+#: ../gtksourceview/gtksourceview.c:419
 msgid "Whether to display the right margin"
 msgstr "Om høyre marg skal vises"
 
-#: ../gtksourceview/gtksourceview.c:410
+#: ../gtksourceview/gtksourceview.c:431
 msgid "Right Margin Position"
 msgstr "Posisjon for høyre marg"
 
-#: ../gtksourceview/gtksourceview.c:411
+#: ../gtksourceview/gtksourceview.c:432
 msgid "Position of the right margin"
 msgstr "Posisjon for høyre marg"
 
-#: ../gtksourceview/gtksourceview.c:427
+#: ../gtksourceview/gtksourceview.c:448
 msgid "Smart Home/End"
 msgstr "Smart home/end"
 
-#: ../gtksourceview/gtksourceview.c:428
+#: ../gtksourceview/gtksourceview.c:449
 msgid ""
 "HOME and END keys move to first/last non whitespace characters on line "
 "before going to the start/end of the line"
@@ -3936,58 +3933,58 @@
 "HOME- og END-tastene flytter til første/siste tegn som ikke er mellomrom på "
 "linjen før de går til begynnelsen/slutten på linjen"
 
-#: ../gtksourceview/gtksourceview.c:438
+#: ../gtksourceview/gtksourceview.c:459
 msgid "Highlight current line"
 msgstr "Uthev aktiv linje"
 
-#: ../gtksourceview/gtksourceview.c:439
+#: ../gtksourceview/gtksourceview.c:460
 msgid "Whether to highlight the current line"
 msgstr "Om aktiv linje skal utheves"
 
-#: ../gtksourceview/gtksourceview.c:446
+#: ../gtksourceview/gtksourceview.c:467
 msgid "Indent on tab"
 msgstr "Rykk inn ved tabulator"
 
-#: ../gtksourceview/gtksourceview.c:447
+#: ../gtksourceview/gtksourceview.c:468
 msgid "Whether to indent the selected text when the tab key is pressed"
 msgstr "Om valgt tekst skal rykkes inn når tabulatortasten trykkes ned"
 
-#: ../gtksourceview/gtksourceview.c:461
+#: ../gtksourceview/gtksourceview.c:482
 msgid "Draw Spaces"
 msgstr "Tegn mellomrom"
 
-#: ../gtksourceview/gtksourceview.c:462
+#: ../gtksourceview/gtksourceview.c:483
 msgid "Set if and how the spaces should be visualized"
 msgstr "Sett hvis og hvordan mellomrom skal visualiseres"
 
 #. create redo menu_item.
-#: ../gtksourceview/gtksourceview.c:1237
+#: ../gtksourceview/gtksourceview.c:1279
 msgid "_Redo"
 msgstr "Gjenopp_rett"
 
 #. create undo menu_item.
-#: ../gtksourceview/gtksourceview.c:1248
+#: ../gtksourceview/gtksourceview.c:1290
 msgid "_Undo"
 msgstr "A_ngre"
 
-#: ../gtksourceview/gtksourceview.c:1266
+#: ../gtksourceview/gtksourceview.c:1308
 msgid "All _Upper Case"
 msgstr "K_un store bokstaver"
 
-#: ../gtksourceview/gtksourceview.c:1276
+#: ../gtksourceview/gtksourceview.c:1318
 msgid "All _Lower Case"
 msgstr "Kun små _bokstaver"
 
-#: ../gtksourceview/gtksourceview.c:1286
+#: ../gtksourceview/gtksourceview.c:1328
 msgid "_Invert Case"
 msgstr ""
 
-#: ../gtksourceview/gtksourceview.c:1296
+#: ../gtksourceview/gtksourceview.c:1338
 #, fuzzy
 msgid "_Title Case"
 msgstr "Tittel"
 
-#: ../gtksourceview/gtksourceview.c:1306
+#: ../gtksourceview/gtksourceview.c:1348
 #, fuzzy
 msgid "C_hange Case"
 msgstr "Endret linje"

=== modified file 'po/sr.po'
--- po/sr.po	2014-10-13 20:29:35 +0000
+++ po/sr.po	2015-02-25 08:09:43 +0000
@@ -3343,8 +3343,8 @@
 #: ../gtksourceview/gtksourceencoding.c:647
 msgid "['UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16']"
 msgstr ""
-"[„UTF-8“, „CURRENT“, „ISO-8859-2“, „ISO-8859-5“, „WINDOWS-1250“, "
-"„WINDOWS-1251“, „ISO-8859-15“]"
+"['UTF-8', 'CURRENT', 'ISO-8859-2', 'ISO-8859-5', 'WINDOWS-1250', "
+"'WINDOWS-1251', 'ISO-8859-15']"
 
 #: ../gtksourceview/gtksourcefile.c:200
 #: ../gtksourceview/gtksourcefilesaver.c:410

=== modified file 'tests/test-search-context.c'
--- tests/test-search-context.c	2014-08-28 16:27:35 +0000
+++ tests/test-search-context.c	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
  * test-search-context.c
  * This file is part of GtkSourceView
  *
- * Copyright (C) 2013 - Sébastien Wilmet <[e-mail]>
+ * Copyright (C) 2013, 2015 - Sébastien Wilmet <[e-mail]>
  *
  * GtkSourceView is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -994,7 +994,10 @@
 	GtkTextIter iter;
 	GtkTextIter match_start;
 	GtkTextIter match_end;
+	GtkTextIter start;
+	GtkTextIter end;
 	gint offset;
+	gchar *content;
 
 	gtk_text_buffer_set_text (text_buffer, "1234\n12345\n1234", -1);
 
@@ -1019,6 +1022,38 @@
 	offset = gtk_text_iter_get_offset (&match_end);
 	g_assert_cmpint (offset, ==, 15);
 
+	/* Test replace, see https://bugzilla.gnome.org/show_bug.cgi?id=740810 */
+
+	gtk_text_buffer_set_text (text_buffer, "&aa", -1);
+	gtk_source_search_settings_set_search_text (settings, "aa");
+	flush_queue ();
+
+	gtk_text_buffer_get_iter_at_offset (text_buffer, &match_start, 1);
+	gtk_text_buffer_get_end_iter (text_buffer, &match_end);
+	gtk_source_search_context_replace (context, &match_start, &match_end, "bb", -1, NULL);
+
+	gtk_text_buffer_get_start_iter (text_buffer, &start);
+	gtk_text_buffer_get_end_iter (text_buffer, &end);
+	content = gtk_text_iter_get_visible_text (&start, &end);
+	g_assert_cmpstr (content, ==, "&bb");
+	g_free (content);
+
+	/* Test replace multi-byte character */
+
+	gtk_text_buffer_set_text (text_buffer, "–aa", -1);
+	gtk_source_search_settings_set_search_text (settings, "aa");
+	flush_queue ();
+
+	gtk_text_buffer_get_iter_at_offset (text_buffer, &match_start, 1);
+	gtk_text_buffer_get_end_iter (text_buffer, &match_end);
+	gtk_source_search_context_replace (context, &match_start, &match_end, "bb", -1, NULL);
+
+	gtk_text_buffer_get_start_iter (text_buffer, &start);
+	gtk_text_buffer_get_end_iter (text_buffer, &end);
+	content = gtk_text_iter_get_visible_text (&start, &end);
+	g_assert_cmpstr (content, ==, "–bb");
+	g_free (content);
+
 	g_object_unref (source_buffer);
 	g_object_unref (settings);
 	g_object_unref (context);

=== modified file 'tests/test-undo-manager.c'
--- tests/test-undo-manager.c	2014-10-13 20:29:35 +0000
+++ tests/test-undo-manager.c	2015-02-25 08:09:43 +0000
@@ -2,7 +2,7 @@
 /* test-undo-manager.c
  * This file is part of GtkSourceView
  *
- * Copyright (C) 2013, 2014 - Sébastien Wilmet <[e-mail]>
+ * Copyright (C) 2013, 2014, 2015 - Sébastien Wilmet <[e-mail]>
  *
  * GtkSourceView is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -614,6 +614,26 @@
 	g_assert (gtk_text_buffer_get_modified (text_buffer));
 
 	g_object_unref (source_buffer);
+
+	/* Inside not undoable action. */
+	source_buffer = gtk_source_buffer_new (NULL);
+	text_buffer = GTK_TEXT_BUFFER (source_buffer);
+	gtk_source_buffer_set_max_undo_levels (source_buffer, -1);
+
+	gtk_text_buffer_set_modified (text_buffer, TRUE);
+
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	insert_text (source_buffer, "a\n");
+	gtk_text_buffer_set_modified (text_buffer, FALSE);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+
+	insert_text (source_buffer, "b\n");
+	g_assert (gtk_text_buffer_get_modified (text_buffer));
+
+	gtk_source_buffer_undo (source_buffer);
+	g_assert (!gtk_text_buffer_get_modified (text_buffer));
+
+	g_object_unref (source_buffer);
 }
 
 static void
@@ -664,6 +684,196 @@
 	g_list_free_full (contents_history, g_free);
 }
 
+/* Test for https://bugzilla.gnome.org/show_bug.cgi?id=672893
+ * TODO More complete unit tests for selection restoring would be better.
+ */
+static void
+test_bug_672893_selection_restoring (void)
+{
+	GtkSourceBuffer *source_buffer;
+	GtkTextBuffer *text_buffer;
+	GtkTextIter start;
+	GtkTextIter end;
+	GtkTextIter iter;
+
+	source_buffer = gtk_source_buffer_new (NULL);
+	text_buffer = GTK_TEXT_BUFFER (source_buffer);
+	gtk_source_buffer_set_max_undo_levels (source_buffer, -1);
+
+	gtk_text_buffer_set_text (text_buffer, "What if it's just all green cheese.", -1);
+
+	/* Delete selection */
+	gtk_text_buffer_get_iter_at_offset (text_buffer, &start, 0);
+	gtk_text_buffer_get_iter_at_offset (text_buffer, &end, 8);
+	gtk_text_buffer_select_range (text_buffer, &start, &end);
+	gtk_text_buffer_delete_selection (text_buffer, TRUE, TRUE);
+
+	gtk_text_buffer_get_selection_bounds (text_buffer, &start, &end);
+	g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&start));
+	g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&end));
+
+	/* Undo -> selection restored */
+	gtk_source_buffer_undo (source_buffer);
+	gtk_text_buffer_get_selection_bounds (text_buffer, &start, &end);
+	g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&start));
+	g_assert_cmpint (8, ==, gtk_text_iter_get_offset (&end));
+
+	/* Click somewhere else */
+	gtk_text_buffer_get_end_iter (text_buffer, &iter);
+	gtk_text_buffer_place_cursor (text_buffer, &iter);
+
+	/* Redo the deletion -> no selection */
+	gtk_source_buffer_redo (source_buffer);
+	gtk_text_buffer_get_selection_bounds (text_buffer, &start, &end);
+	g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&start));
+	g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&end));
+
+	/* Undo -> selection still restored correctly, even if we clicked
+	 * somewhere else.
+	 */
+	gtk_source_buffer_undo (source_buffer);
+	gtk_text_buffer_get_selection_bounds (text_buffer, &start, &end);
+	g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&start));
+	g_assert_cmpint (8, ==, gtk_text_iter_get_offset (&end));
+
+	g_object_unref (source_buffer);
+}
+
+static void
+test_mix_user_action_and_not_undoable_action (void)
+{
+	GtkSourceBuffer *source_buffer;
+	GtkTextBuffer *text_buffer;
+	GList *contents_history = NULL;
+
+	source_buffer = gtk_source_buffer_new (NULL);
+	text_buffer = GTK_TEXT_BUFFER (source_buffer);
+
+	gtk_source_buffer_set_max_undo_levels (source_buffer, -1);
+
+	/* Case 1 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	gtk_text_buffer_end_user_action (text_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	/* Case 2 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_text_buffer_end_user_action (text_buffer);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	/* Case 3 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	gtk_text_buffer_end_user_action (text_buffer);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	/* Case 4 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+	gtk_text_buffer_end_user_action (text_buffer);
+
+	gtk_text_buffer_insert_at_cursor (text_buffer, "b\n", -1);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	/* Case 5 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	gtk_text_buffer_end_user_action (text_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	/* Case 6 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_text_buffer_end_user_action (text_buffer);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	gtk_text_buffer_insert_at_cursor (text_buffer, "b\n", -1);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	/* Case 7 */
+	gtk_text_buffer_set_text (text_buffer, "", -1);
+
+	gtk_text_buffer_begin_user_action (text_buffer);
+	gtk_text_buffer_insert_at_cursor (text_buffer, "a\n", -1);
+	gtk_source_buffer_begin_not_undoable_action (source_buffer);
+	gtk_source_buffer_end_not_undoable_action (source_buffer);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+	gtk_text_buffer_end_user_action (text_buffer);
+
+	gtk_text_buffer_insert_at_cursor (text_buffer, "b\n", -1);
+	contents_history = g_list_append (contents_history, get_contents (source_buffer));
+
+	check_contents_history (source_buffer, contents_history);
+
+	g_list_free_full (contents_history, g_free);
+	contents_history = NULL;
+
+	g_object_unref (source_buffer);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -699,5 +909,11 @@
 	g_test_add_func ("/UndoManager/test-empty-user-actions",
 			 test_empty_user_actions);
 
+	g_test_add_func ("/UndoManager/test-bug-672893-selection-restoring",
+			 test_bug_672893_selection_restoring);
+
+	g_test_add_func ("/UndoManager/mix-user-action-and-not-undoable-action",
+			 test_mix_user_action_and_not_undoable_action);
+
 	return g_test_run ();
 }