Merge patch 1.4.2
This commit is contained in:
@@ -1807,7 +1807,7 @@ class GuiDocEditor(QTextEdit):
|
||||
nDelete = 0
|
||||
tInsert = theOne
|
||||
|
||||
if self.mainConf.doReplaceDQuote and theTwo == ' "':
|
||||
if self.mainConf.doReplaceDQuote and theTwo[:1].isspace() and theTwo.endswith('"'):
|
||||
nDelete = 1
|
||||
tInsert = self._typDQOpen
|
||||
|
||||
@@ -1815,10 +1815,14 @@ class GuiDocEditor(QTextEdit):
|
||||
nDelete = 1
|
||||
if thePos == 1:
|
||||
tInsert = self._typDQOpen
|
||||
elif thePos == 2 and theTwo == '>"':
|
||||
tInsert = self._typDQOpen
|
||||
elif thePos == 3 and theThree == '>>"':
|
||||
tInsert = self._typDQOpen
|
||||
else:
|
||||
tInsert = self._typDQClose
|
||||
|
||||
elif self.mainConf.doReplaceSQuote and theTwo == " '":
|
||||
elif self.mainConf.doReplaceSQuote and theTwo[:1].isspace() and theTwo.endswith("'"):
|
||||
nDelete = 1
|
||||
tInsert = self._typSQOpen
|
||||
|
||||
@@ -1826,6 +1830,10 @@ class GuiDocEditor(QTextEdit):
|
||||
nDelete = 1
|
||||
if thePos == 1:
|
||||
tInsert = self._typSQOpen
|
||||
elif thePos == 2 and theTwo == ">'":
|
||||
tInsert = self._typSQOpen
|
||||
elif thePos == 3 and theThree == ">>'":
|
||||
tInsert = self._typSQOpen
|
||||
else:
|
||||
tInsert = self._typSQClose
|
||||
|
||||
|
||||
Reference in New Issue
Block a user