[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/1.6.7-470-ge290d52

[Sven Hoexter]

The following commit has been merged in the master branch:
commit e290d52478186af8568274ecd49efd93fea517a5
Author: Sven Hoexter <sven at timegate.de>
Date:   Fri Jul 16 19:38:34 2010 +0200

    Remove debian/patches/spellcheckfix - applied upstream.

diff --git a/debian/changelog b/debian/changelog
index fc7cfe7..af51ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 lyx (1.6.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
+   + Remove debian/patches/spellcheckfix - applied upstream.
 
  -- Sven Hoexter <hoexter at debian.org>  Fri, 16 Jul 2010 19:08:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 0c043c1..b2d0279 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-spellcheckfix
 prefer-xdg-open
 fix-manpage-errors
diff --git a/debian/patches/spellcheckfix b/debian/patches/spellcheckfix
deleted file mode 100644
index 2b7c8a3..0000000
--- a/debian/patches/spellcheckfix
+++ /dev/null
@@ -1,46 +0,0 @@
-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