[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdebase/kate/app
From:       Anders Lund <anders () alweb ! dk>
Date:       2004-11-25 11:16:35
Message-ID: 20041125111635.149B71CF94 () office ! kde ! org
[Download RAW message or body]

CVS commit by alund: 

Backport for Cullmann
CCBUG: 85215


  M +1 -1      katedocmanager.cpp   1.64.2.1
  M +1 -1      kwritemain.cpp   1.103.2.1


--- kdebase/kate/app/katedocmanager.cpp  #1.64:1.64.2.1
@@ -227,5 +227,5 @@ Kate::Document *KateDocManager::openURL 
     Kate::Document* doc = documentList().getFirst();
 
-    doc->setEncoding(encoding.isNull() ? Kate::Document::defaultEncoding() : \
encoding); +    doc->setEncoding(encoding);
 
     if (!loadMetaInfos(doc, url))

--- kdebase/kate/app/kwritemain.cpp  #1.103:1.103.2.1
@@ -261,5 +261,5 @@ void KWrite::slotOpen( const KURL& url )
   {
     KWrite *t = new KWrite();
-    if (KTextEditor::encodingInterface(m_view->document())) \
KTextEditor::encodingInterface(m_view->document())->setEncoding(encoding); +    if \
(KTextEditor::encodingInterface(t->m_view->document())) \
KTextEditor::encodingInterface(t->m_view->document())->setEncoding(encoding);  \
t->loadURL(url);  }


[prev in list] [next in list] [prev in thread] [next in thread]