summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-13 03:28:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-13 03:28:36 +0000
commit46ea832417485d0afb677cc33d8fc88efe5fce5f (patch)
tree7bf1f099f4eec725b20693da487dc49756754f09
parent50f9b9d83baa938fdcded3beb89ab37415ece404 (diff)
downloadtdelibs-46ea832417485d0afb677cc33d8fc88efe5fce5f.tar.gz
tdelibs-46ea832417485d0afb677cc33d8fc88efe5fce5f.zip
Added patch discussed at http://reviewboard.kde.org/r/1915/
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1102632 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kate/part/katedocument.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 68374ebe1..c7b5a08b6 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -2409,6 +2409,10 @@ bool KateDocument::openFile(KIO::Job * job)
if ( fileTypeFound > -1 )
updateFileType( fileTypeFound );
+ // read dir config (if possible and wanted)
+ if (!m_reloading)
+ readDirConfig ();
+
// do we have success ?
bool success = m_buffer->openFile (m_file);
//
@@ -2435,9 +2439,6 @@ bool KateDocument::openFile(KIO::Job * job)
if ( fileTypeFound < 0 )
updateFileType (KateFactory::self()->fileTypeManager()->fileType (this));
- // read dir config (if possible and wanted)
- readDirConfig ();
-
// read vars
readVariables();