[LyX/master] Use the application id of lyx to address the running LyX instance

2020-02-14 Thread Stephan Witt 
commit ab877352e74455278da372d97672a7705ca2fd29
Author: Stephan Witt 
Date:   Fri Feb 14 12:06:08 2020 +0100

Use the application id of lyx to address the running LyX instance
---
 development/MacOSX/lyxeditor |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/development/MacOSX/lyxeditor b/development/MacOSX/lyxeditor
index 670dea2..d24373c 100755
--- a/development/MacOSX/lyxeditor
+++ b/development/MacOSX/lyxeditor
@@ -90,7 +90,7 @@ if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then
while read line ; do
echo LyX said: $line
done < "${LYXPIPE}".out || { echo "Cannot read from lyxpipe." ; exit 2 
; }
-   test -x /usr/bin/osascript && /usr/bin/osascript -e 'tell application 
"LyX" to activate'
+   test -x /usr/bin/osascript && /usr/bin/osascript -e 'tell application 
id "org.lyx.lyx" to activate'
 else
echo "Our best guess sets lyxpipe as ${LYXPIPE}"
echo "But the lyxpipe could not be found."
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Avoid uninitialized position variables in case of current inset not doing the assignment

2020-02-14 Thread Stephan Witt 
commit 6dab8739eba3075965c416064c1f43ced10ee3e5
Author: Stephan Witt 
Date:   Fri Feb 14 12:11:10 2020 +0100

Avoid uninitialized position variables in case of current inset not doing 
the assignment
---
 src/frontends/qt/GuiCompleter.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt/GuiCompleter.cpp 
b/src/frontends/qt/GuiCompleter.cpp
index 1c91fb7..6ab81ce 100644
--- a/src/frontends/qt/GuiCompleter.cpp
+++ b/src/frontends/qt/GuiCompleter.cpp
@@ -438,8 +438,8 @@ void GuiCompleter::asyncUpdatePopup()
 
// get dimensions of completion prefix
Dimension dim;
-   int x;
-   int y;
+   int x = 0;
+   int y = 0;
cur.inset().completionPosAndDim(cur, x, y, dim);
 
// and calculate the rect of the popup
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs