diff -Nru ktexteditor-5.26.0/debian/changelog ktexteditor-5.26.0/debian/changelog --- ktexteditor-5.26.0/debian/changelog 2016-09-22 13:49:36.000000000 +0100 +++ ktexteditor-5.26.0/debian/changelog 2016-10-20 14:32:31.000000000 +0100 @@ -1,3 +1,9 @@ +ktexteditor (5.26.0-0ubuntu2) yakkety; urgency=medium + + * Add upstream_fix_text_search.diff (LP: #1632848) + + -- José Manuel Santamaría Lema Thu, 20 Oct 2016 14:32:31 +0100 + ktexteditor (5.26.0-0ubuntu1) yakkety; urgency=low * New upstream release (5.26.0) diff -Nru ktexteditor-5.26.0/debian/patches/series ktexteditor-5.26.0/debian/patches/series --- ktexteditor-5.26.0/debian/patches/series 2016-09-22 13:49:36.000000000 +0100 +++ ktexteditor-5.26.0/debian/patches/series 2016-10-20 14:32:31.000000000 +0100 @@ -1 +1,2 @@ katesyntaxtest_check_basename +upstream_fix_text_search.diff diff -Nru ktexteditor-5.26.0/debian/patches/upstream_fix_text_search.diff ktexteditor-5.26.0/debian/patches/upstream_fix_text_search.diff --- ktexteditor-5.26.0/debian/patches/upstream_fix_text_search.diff 1970-01-01 01:00:00.000000000 +0100 +++ ktexteditor-5.26.0/debian/patches/upstream_fix_text_search.diff 2016-10-20 14:32:31.000000000 +0100 @@ -0,0 +1,63 @@ +From 2c4feeb0c9107732399f8ae3dacea3124572f345 Mon Sep 17 00:00:00 2001 +From: Roman Gilg +Date: Thu, 8 Sep 2016 12:51:51 +0200 +Subject: [PATCH] KateNormalInputMode needs to rerun SearchBar enter methods + +This is a fix for a regression resulting from commit +9223ac51c9453017c9b11718eed858050697cfbd. + +REVIEW: 128859 +--- + src/inputmode/katenormalinputmode.cpp | 9 +++++---- + src/inputmode/katenormalinputmode.h | 6 +++--- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/inputmode/katenormalinputmode.cpp b/src/inputmode/katenormalinputmode.cpp +index 71f228d..3c2ed75 100644 +--- a/src/inputmode/katenormalinputmode.cpp ++++ b/src/inputmode/katenormalinputmode.cpp +@@ -184,7 +184,7 @@ KateSearchBar *KateNormalInputMode::searchBar(const SearchBarMode mode) + const bool wantPowerMode = (mode == PowerSearchBar); + + /** +- * create search bar as not there? use right mode ++ * create search bar is not there? use right mode + */ + if (!m_searchBar) { + m_searchBar = new KateSearchBar(wantPowerMode, view(), KateViewConfig::global()); +@@ -193,11 +193,12 @@ KateSearchBar *KateNormalInputMode::searchBar(const SearchBarMode mode) + /** + * else: switch mode if needed! + */ +- else if ((mode != IncrementalSearchBarOrKeepMode) && (wantPowerMode != m_searchBar->isPower())) { +- if (wantPowerMode) ++ else if (mode != IncrementalSearchBarOrKeepMode) { ++ if (wantPowerMode) { + m_searchBar->enterPowerMode(); +- else ++ } else { + m_searchBar->enterIncrementalMode(); ++ } + } + + return m_searchBar; +diff --git a/src/inputmode/katenormalinputmode.h b/src/inputmode/katenormalinputmode.h +index 96d3ca7..2dff4df 100644 +--- a/src/inputmode/katenormalinputmode.h ++++ b/src/inputmode/katenormalinputmode.h +@@ -78,9 +78,9 @@ public: + private: + /** + * Search bar mode: +- * - Incremental mode +- * - Power mode, aka find & replace +- * - Incremental mode, but don't change mode if already there ++ * - Setup Incremental mode, among other things: potential new search pattern ++ * - Setup Power mode, aka find & replace: Also potential new search pattern ++ * - Use current mode and current search pattern or if no Search bar exists, launch Incremental mode + */ + enum SearchBarMode { + IncrementalSearchBar, +-- +2.7.4 +