[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/1.6.6-466-gcb9002b

[Sven Hoexter]

The following commit has been merged in the master branch:
commit cb9002bc8ba16f0149db54022d97ad3c615782ba
Author: Sven Hoexter <sven at timegate.de>
Date:   Fri May 28 12:55:54 2010 +0200

    Add debian/patches/spellcheckfix which reverts upstream commit r33567 to fix the broken spellchecker in LyX 1.6.6. Upstream bugreport: http://www.lyx.org/trac/ticket/6708

diff --git a/debian/changelog b/debian/changelog
index 0c877ea..bf3352a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-lyx (1.6.6-2) unstable; urgency=low
+lyx (1.6.6-2) UNRELEASED; urgency=low
 
   * Add --with-enchant to the configure flags and add build-depend on
     libenchant-dev.
   * Add librsvg2-bin | inkscape to the Recommends to support SVG image
     handling (new in LyX 1.6.6).
   * Set elyxer to the first position in the list of HTML converters.
+  * Add debian/patches/spellcheckfix which reverts upstream commit
+    r33567 to fix the broken spellchecker in LyX 1.6.6.
+    Upstream bugreport: http://www.lyx.org/trac/ticket/6708
 
- -- Sven Hoexter <hoexter at debian.org>  Thu, 20 May 2010 15:40:47 +0200
+ -- Sven Hoexter <hoexter at debian.org>  Fri, 28 May 2010 14:07:05 +0200
 
 lyx (1.6.6-1) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index b2d0279..0c043c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+spellcheckfix
 prefer-xdg-open
 fix-manpage-errors
diff --git a/debian/patches/spellcheckfix b/debian/patches/spellcheckfix
new file mode 100644
index 0000000..2b7c8a3
--- /dev/null
+++ b/debian/patches/spellcheckfix
@@ -0,0 +1,46 @@
+Fix the spellchecker, which in LyX 1.6.6 only finds every
+second wrong word after you've corrected one.
+
+This patch reverts upstream svn commit r33567.
+http://www.lyx.org/trac/changeset/33567
+http://www.lyx.org/trac/ticket/6708
+--- a/src/frontends/qt4/GuiSpellchecker.cpp
++++ b/src/frontends/qt4/GuiSpellchecker.cpp
+@@ -20,7 +20,6 @@
+ #include "BufferView.h"
+ #include "Cursor.h"
+ #include "CutAndPaste.h"
+-#include "FuncRequest.h"
+ #include "Language.h"
+ #include "LyXRC.h"
+ #include "Paragraph.h"
+@@ -465,21 +464,16 @@ void GuiSpellchecker::replace(docstring
+ {
+ 	LYXERR(Debug::GUI, "GuiSpellchecker::replace("
+ 			   << to_utf8(replacement) << ")");
+-	/*
+-	  Slight hack ahead: we want to use the dispatch machinery
+-	  (see bug #6217), but self-insert honors the ``auto region
+-	  delete'' setting, which is not wanted here. Creating a new
+-	  ad-hoc LFUN seems overkill, but it could be an option (JMarc).
+-	*/
+-	bool const ard = lyxrc.auto_region_delete;
+-	lyxrc.auto_region_delete = true;
+-	dispatch(FuncRequest(LFUN_SELF_INSERT, replacement));
+-	lyxrc.auto_region_delete = ard;
++	BufferView * bv = const_cast<BufferView *>(bufferview());
++	if (!bv->cursor().inTexted())
++	  return;
++	cap::replaceSelectionWithString(bv->cursor(), replacement, true);
++	bv->buffer().markDirty();
++	// If we used an LFUN, we would not need that
++	bv->processUpdateFlags(Update::Force | Update::FitCursor);
+ 	// fix up the count
+ 	--count_;
+-	// Do nothing if the spellchecker has been terminated already
+-	if (speller_)
+-		check();
++	check();
+ }
+ 
+ 

-- 
LyX packaging