The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit bba0c9aa22396813751e2c75ef8ecf900dc717b8
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed Apr 18 12:34:01 2012 +0200
Correctly ignore the pot file when one uses version-suffix
diff --git a/po/.gitignore b/po/.gitignore
index 281432c..63195a1 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,6 +1,6 @@
POTFILES
POTFILES.in
-lyx.pot
+lyx*.pot
*.gmo
stamp-po
remove-potcdate.sed
commit dbcfbe5b76d4748a1d7013f32e8d2678ad9ae2ef
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed Apr 18 12:44:31 2012 +0200
In replaceSelectionWithString, do not select the new string
This is a patch from Scott Kostyshak. The problem it solves is as follows:
1. enable continuous spell check.
2. type a misspelled word and press space so that it has a wavy red
underline.
3. right-click and choose a suggested replacement word.
4. press the backspace button.
Result: nothing happens. If you press the backspace button again, then it
works as normal.
The selection code was added for the benefit of the spellchecker, but the
code has been rewritten since then.
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 6ded894..45a6f72 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -1078,7 +1078,7 @@ void pasteSelection(Cursor & cur, ErrorList & errorList)
}
-void replaceSelectionWithString(Cursor & cur, docstring const & str, bool
backwards)
+void replaceSelectionWithString(Cursor & cur, docstring const & str)
{
cur.recordUndo();
DocIterator selbeg = cur.selectionBegin();
@@ -1097,13 +1097,6 @@ void replaceSelectionWithString(Cursor & cur, docstring
const & str, bool backwa
// Cut the selection
cutSelection(cur, true, false);
-
- // select the replacement
- if (backwards) {
- selbeg.pos() += str.length();
- cur.setSelection(selbeg, -int(str.length()));
- } else
- cur.setSelection(selbeg, str.length());
}
diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index a4e975b..d81d4a8 100644
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -41,12 +41,9 @@ docstring selection(size_t sel_index);
/**
* Replace using the font of the first selected character and select
- * the new string. When \c backwards == false, set anchor before
- * cursor; otherwise set cursor before anchor.
- * Does handle undo.
+ * the new string. Does handle undo.
*/
-void replaceSelectionWithString(Cursor & cur, docstring const & str,
- bool backwards);
+void replaceSelectionWithString(Cursor & cur, docstring const & str);
/// If a selection exists, delete it without pushing it to the cut buffer.
/// Does handle undo.
void replaceSelection(Cursor & cur);
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index af27be2..7883475 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -271,7 +271,7 @@ pair<bool, int> replaceOne(BufferView * bv, docstring
searchstr,
if (bv->buffer().isReadonly())
return pair<bool, int>(false, 0);
- cap::replaceSelectionWithString(cur, replacestr, forward);
+ cap::replaceSelectionWithString(cur, replacestr);
if (forward) {
cur.pos() += replacestr.length();
LASSERT(cur.pos() <= cur.lastpos(), /* */);
commit b27f3755ae42f107ed7cfd378830ca4cd371f490
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Fri May 11 15:44:48 2012 +0200
Allow autoconf 2.69 and automake 1.12
diff --git a/autogen.sh b/autogen.sh
index 5fc3d1b..8b48960 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,12 +16,12 @@ test "$automake_version" != "" && {
}
case $automake_version in
- *' '1.[8-9]*|*' '1.1[01]*)
+ *' '1.[8-9]*|*' '1.1[012]*)
;;
*)
echo "This automake version is not supported by LyX."
- echo "LyX only supports automake 1.8 to 1.11."
+ echo "LyX only supports automake 1.8 to 1.12."
exit 1
;;
esac
@@ -38,11 +38,11 @@ test "$autoversion" != "" && {
case $autoversion in
- *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-8])
+ *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9])
;;
*)
echo "This autoconf version is not supported by LyX."
- echo "LyX only supports autoconf 2.59c-2.68."
+ echo "LyX only supports autoconf 2.59c-2.69."
exit 1
;;
esac
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 8 ++++----
po/.gitignore | 2 +-
src/CutAndPaste.cpp | 9 +--------
src/CutAndPaste.h | 7 ++-----
src/lyxfind.cpp | 2 +-
5 files changed, 9 insertions(+), 19 deletions(-)
hooks/post-receive
--
The LyX Source Repository
