commit 3a949b32f08ce4884906a9c5d47c4d7031c794b2
Merge: b3b22b0 4a54269
Author: Juergen Spitzmueller <[email protected]>
Date: Sat Oct 29 11:42:14 2022 +0200
Merge branch 'master' into features/indexmacros
lib/configure.py | 2 +-
lib/scripts/prefs2prefs_prefs.py | 15 ++++-
src/Buffer.cpp | 2 +-
src/Buffer.h | 2 +-
src/BufferView.cpp | 11 ++-
src/Cursor.cpp | 2 +-
src/Cursor.h | 5 +-
src/FuncCode.h | 2 -
src/Layout.h | 5 --
src/LyXAction.cpp | 16 -----
src/LyXRC.cpp | 34 +++++-----
src/LyXRC.h | 10 ++--
src/Text3.cpp | 42 +++---------
src/frontends/qt/GuiPrefs.cpp | 23 ++++---
src/frontends/qt/GuiPrefs.h | 2 +-
src/frontends/qt/ui/PrefEditUi.ui | 126 +++++++++++++++++-------------------
16 files changed, 134 insertions(+), 165 deletions(-)
diff --cc src/FuncCode.h
index 6d7ed85,8a0fe35..f050f8e
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@@ -500,11 -500,7 +500,9 @@@ enum FuncCod
LFUN_SPELLING_ADD_LOCAL, // jspitzm 20210306
// 390
LFUN_SPELLING_REMOVE_LOCAL, // jspitzm 20210307
- LFUN_FINISHED_DOWN, // lasgouttes 20210629
- LFUN_FINISHED_UP, // lasgouttes 20210629
LFUN_BRANCH_SYNC_ALL, // sanda 20220415
+ LFUN_INDEXMACRO_INSERT, // spitz 20220220
+ // 395
LFUN_LASTACTION // end of the table
};
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
