Commit a13b5ea1 authored by Robert Knight's avatar Robert Knight
Browse files

Fix when copying lines from screen in sessions with fewer than one display's...

Fix when copying lines from screen in sessions with fewer than one display's worth of output.  Fixes problem where history search would act as if the last non-empty line of text was duplicated in all subsequent lines.  Remove 'for KDE' mention in program description - Konsole can be used in other DEs

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=673765
parent c4de70b6
......@@ -1478,6 +1478,9 @@ void Screen::copyLineToStream(int line ,
{
characterBuffer[i-start] = data[i];
}
// count cannot be any greater than length
count = qMin(length,count);
}
//do not decode trailing whitespace characters
......
......@@ -1176,13 +1176,13 @@ void SearchHistoryTask::execute()
}
}
qDebug() << "Searching lines " << qMin(endLine,line) << " to " << qMax(endLine,line);
//qDebug() << "Searching lines " << qMin(endLine,line) << " to " << qMax(endLine,line);
decoder.begin(&searchStream);
emulation->writeToStream(&decoder, qMin(endLine,line) , qMax(endLine,line) );
decoder.end();
qDebug() << "Stream contents: " << string;
//qDebug() << "Stream contents: " << string;
pos = -1;
if (forwards)
pos = string.indexOf(_regExp);
......
......@@ -70,7 +70,7 @@ extern "C" int KDE_EXPORT kdemain(int argc,char** argv)
KAboutData about( "konsole",
I18N_NOOP("Konsole"),
KONSOLE_VERSION,
I18N_NOOP("Terminal emulator for KDE"),
I18N_NOOP("Terminal emulator"),
KAboutData::License_GPL_V2
);
fillAboutData(about);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment