[LyX/2.3.1-staging] Simplify code a bit.

[Richard Heck]

commit 490506c45f200093229e7d7289aa1b3195783cf1
Author: Richard Heck 
Date:   Fri Mar 2 23:12:11 2018 -0500

Simplify code a bit.
---
 lib/configure.py |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index b3d1f69..6f8efcd 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1766,14 +1766,14 @@ def checkTeXAllowSpaces():
 def rescanTeXFiles():
 ''' Run kpsewhich to update information about TeX files '''
 logger.info("+Indexing TeX files... ")
-if not os.path.isfile( os.path.join(srcdir, 'scripts', 'TeXFiles.py') ):
+tfscript = os.path.join(srcdir, 'scripts', 'TeXFiles.py')
+if not os.path.isfile(tfscript):
 logger.error("configure: error: cannot find TeXFiles.py script")
 sys.exit(1)
 interpreter = sys.executable
 if interpreter == '':
 interpreter = "python"
-tfp = cmdOutput('"%s" -tt "%s"' % (interpreter,\
-  os.path.join(srcdir, 'scripts', 'TeXFiles.py')))
+tfp = cmdOutput('"%s" -tt "%s"' % (interpreter, tfscript))
 logger.info(tfp)
 logger.info("\tdone")
 

[LyX/master] Simplify code a bit.

[Richard Heck]

commit 5531b40c9be1f0c8dd4c13ad30925ffe31a3dacf
Author: Richard Heck 
Date:   Fri Mar 2 23:12:11 2018 -0500

Simplify code a bit.

(cherry picked from commit 490506c45f200093229e7d7289aa1b3195783cf1)
---
 lib/configure.py |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 49abf77..df07e46 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1771,14 +1771,14 @@ def checkTeXAllowSpaces():
 def rescanTeXFiles():
 ''' Run kpsewhich to update information about TeX files '''
 logger.info("+Indexing TeX files... ")
-if not os.path.isfile( os.path.join(srcdir, 'scripts', 'TeXFiles.py') ):
+tfscript = os.path.join(srcdir, 'scripts', 'TeXFiles.py')
+if not os.path.isfile(tfscript):
 logger.error("configure: error: cannot find TeXFiles.py script")
 sys.exit(1)
 interpreter = sys.executable
 if interpreter == '':
 interpreter = "python"
-tfp = cmdOutput('"%s" -tt "%s"' % (interpreter,\
-  os.path.join(srcdir, 'scripts', 'TeXFiles.py')))
+tfp = cmdOutput('"%s" -tt "%s"' % (interpreter, tfscript))
 logger.info(tfp)
 logger.info("\tdone")
 

[LyX/2.3.1-staging] Use pythonic syntax, as suggested by José.

[Richard Heck]

commit 175ba1696614bbb8394b7ab184ca2c253d6ec00f
Author: Richard Heck 
Date:   Fri Mar 2 23:02:26 2018 -0500

Use pythonic syntax, as suggested by José.

(cherry picked from commit cec9edd34b9a43beadefd55d1755209e1acff191)
---
 lib/configure.py |4 ++--
 status.23x   |2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 23ec3c8..b3d1f69 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1772,8 +1772,8 @@ def rescanTeXFiles():
 interpreter = sys.executable
 if interpreter == '':
 interpreter = "python"
-tfp = cmdOutput(interpreter + " -tt " + '"'
-+ os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
+tfp = cmdOutput('"%s" -tt "%s"' % (interpreter,\
+  os.path.join(srcdir, 'scripts', 'TeXFiles.py')))
 logger.info(tfp)
 logger.info("\tdone")
 
diff --git a/status.23x b/status.23x
index e1cfddb..18ed4fa 100644
--- a/status.23x
+++ b/status.23x
@@ -65,6 +65,8 @@ What's new
 
 * INTERNALS
 
+- Properly quote python interpreter when scanning TeX files.
+
 
 * DOCUMENTATION AND LOCALIZATION
 

[LyX/master] Use pythonic syntax, as suggested by José.

[Richard Heck]

commit cec9edd34b9a43beadefd55d1755209e1acff191
Author: Richard Heck 
Date:   Fri Mar 2 23:02:26 2018 -0500

Use pythonic syntax, as suggested by José.
---
 lib/configure.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 888cf99..49abf77 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1777,8 +1777,8 @@ def rescanTeXFiles():
 interpreter = sys.executable
 if interpreter == '':
 interpreter = "python"
-tfp = cmdOutput('"' + interpreter + '"' + " -tt " + '"' 
-+ os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
+tfp = cmdOutput('"%s" -tt "%s"' % (interpreter,\
+  os.path.join(srcdir, 'scripts', 'TeXFiles.py')))
 logger.info(tfp)
 logger.info("\tdone")
 

[LyX/2.3.2-staging] Allow reload if buffer is externally modified.

[Pavel Sanda]

commit 3d6b8c0abbfc61d803f82251c53d1ea81d033214
Author: Pavel Sanda 
Date:   Fri Mar 2 20:48:08 2018 +0100

Allow reload if buffer is externally modified.

Follow-up of 2df82c4a44b7.
---
 src/frontends/qt4/GuiView.cpp |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 361439b..56a2e73 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1879,7 +1879,8 @@ bool GuiView::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
 
case LFUN_BUFFER_RELOAD:
enable = doc_buffer && !doc_buffer->isUnnamed()
-   && doc_buffer->fileName().exists() && 
!doc_buffer->isClean();
+   && doc_buffer->fileName().exists()
+   && (!doc_buffer->isClean() || 
doc_buffer->notifiesExternalModification());
break;
 
case LFUN_BUFFER_CHILD_OPEN:

[LyX/master] Allow reload if buffer is externally modified.

[Pavel Sanda]

commit 9cdae51688d2abac5d4eb0e69a71b47814d43d3d
Author: Pavel Sanda 
Date:   Fri Mar 2 20:48:08 2018 +0100

Allow reload if buffer is externally modified.

Follow-up of 2df82c4a44b7.
---
 src/frontends/qt4/GuiView.cpp |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index bec9a99..efdd23e 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1879,7 +1879,8 @@ bool GuiView::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
 
case LFUN_BUFFER_RELOAD:
enable = doc_buffer && !doc_buffer->isUnnamed()
-   && doc_buffer->fileName().exists() && 
!doc_buffer->isClean();
+   && doc_buffer->fileName().exists()
+   && (!doc_buffer->isClean() || 
doc_buffer->notifiesExternalModification());
break;
 
case LFUN_BUFFER_CHILD_OPEN:

[LyX/master] configure.py: fix bug #11053

[Uwe Stöhr]

commit 64d1751f2f25668e1b7ed3e6607e22c8e6533ff7
Author: Uwe Stöhr 
Date:   Fri Mar 2 20:14:58 2018 +0100

configure.py: fix bug #11053

- add quotes around the path to the python executable
---
 lib/configure.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 2e81d22..888cf99 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1777,7 +1777,7 @@ def rescanTeXFiles():
 interpreter = sys.executable
 if interpreter == '':
 interpreter = "python"
-tfp = cmdOutput(interpreter + " -tt " + '"'
+tfp = cmdOutput('"' + interpreter + '"' + " -tt " + '"' 
 + os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
 logger.info(tfp)
 logger.info("\tdone")

[LyX/2.3.x] configure.py: fix bug #11053

[Uwe Stöhr]

commit 151ee98e3b886bc95fc072c7401270658f0bff6e
Author: Uwe Stöhr 
Date:   Fri Mar 2 20:12:41 2018 +0100

configure.py: fix bug #11053

- add quotes around the path to the python executable
---
 lib/configure.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 23ec3c8..54c7503 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1772,7 +1772,7 @@ def rescanTeXFiles():
 interpreter = sys.executable
 if interpreter == '':
 interpreter = "python"
-tfp = cmdOutput(interpreter + " -tt " + '"'
+tfp = cmdOutput('"' + interpreter + '"' + " -tt " + '"' 
 + os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
 logger.info(tfp)
 logger.info("\tdone")