>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
Angus> Jean-Marc Lasgouttes wrote: In LyXAction.C we have both of
Angus> these. Only one can be correct... { LFUN_KMAP_TOGGLE,
Angus> "keymap-toggle", ReadOnly }, and { LFUN_KEYMAP_TOGGLE,
Angus> "keymap-toggle", Noop },
>> You are the one who knows why LFUN_KEYMAP_TOGGLE has been added...
>> I do not see its usefulness.
Angus> ...and I no longer know what it does...
Let's get rid of it, then.
committing now.
JMarc
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2311
diff -u -p -r1.2311 ChangeLog
--- src/ChangeLog 25 Oct 2005 13:43:50 -0000 1.2311
+++ src/ChangeLog 25 Oct 2005 13:51:00 -0000
@@ -1,5 +1,11 @@
2005-10-25 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+ * text3.C (dispatch, getStatus):
+ * LyXAction.C (init):
+ * lfuns.h: get rid of LFUN_KEYMAP_TOGGLE
+
+2005-10-25 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
* toc.C (getTocList): skip paragraphs which toclevel is NOT_IN_TOC.
2005-10-25 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
Index: src/LyXAction.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LyXAction.C,v
retrieving revision 1.209
diff -u -p -r1.209 LyXAction.C
--- src/LyXAction.C 7 Oct 2005 14:51:38 -0000 1.209
+++ src/LyXAction.C 25 Oct 2005 13:51:00 -0000
@@ -333,7 +333,6 @@ void LyXAction::init()
{ LFUN_REPEAT, "repeat", NoBuffer },
{ LFUN_WORD_FIND, "word-find", ReadOnly },
{ LFUN_WORD_REPLACE, "word-replace", Noop },
- { LFUN_KEYMAP_TOGGLE, "keymap-toggle", Noop },
{ LFUN_LANGUAGE_BUFFER, "buffer-language", Noop },
{ LFUN_TEXTCLASS_APPLY, "textclass-apply", Noop },
{ LFUN_TEXTCLASS_LOAD, "textclass-load", Noop },
Index: src/lfuns.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lfuns.h,v
retrieving revision 1.43
diff -u -p -r1.43 lfuns.h
--- src/lfuns.h 7 Oct 2005 14:51:38 -0000 1.43
+++ src/lfuns.h 25 Oct 2005 13:51:00 -0000
@@ -337,23 +337,22 @@ enum kb_action {
// 255
LFUN_EXPORT_CUSTOM,
LFUN_PRINT,
- LFUN_KEYMAP_TOGGLE,
LFUN_NEXT_INSET_TOGGLE,
LFUN_ALL_INSETS_TOGGLE,
- // 260
LFUN_LANGUAGE_BUFFER,
+ // 260
LFUN_TEXTCLASS_APPLY,
LFUN_TEXTCLASS_LOAD,
LFUN_SAVE_AS_DEFAULT,
LFUN_BUFFERPARAMS_APPLY,
- // 265
LFUN_LYXRC_APPLY,
+ // 265
LFUN_GRAPHICS_EDIT,
LFUN_INSET_REFRESH,
LFUN_NEXTBUFFER,
LFUN_PREVIOUSBUFFER,
- // 270
LFUN_WORDS_COUNT,
+ // 270
LFUN_OUTPUT_CHANGES, // jspitzm 20050121
LFUN_BIBDB_ADD,
LFUN_BIBDB_DEL,
Index: src/text3.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.314
diff -u -p -r1.314 text3.C
--- src/text3.C 24 Oct 2005 09:42:19 -0000 1.314
+++ src/text3.C 25 Oct 2005 13:51:00 -0000
@@ -775,11 +775,6 @@ void LyXText::dispatch(LCursor & cur, Fu
break;
}
- case LFUN_KEYMAP_TOGGLE:
- cur.clearSelection();
- bv->switchKeyMap();
- break;
-
case LFUN_SPACE_INSERT:
if (cur.paragraph().layout()->free_spacing)
insertChar(cur, ' ');
@@ -1904,7 +1899,6 @@ bool LyXText::getStatus(LCursor & cur, F
case LFUN_THESAURUS_ENTRY:
case LFUN_PARAGRAPH_APPLY:
case LFUN_ESCAPE:
- case LFUN_KEYMAP_TOGGLE:
case LFUN_ENDBUF:
case LFUN_BEGINNINGBUF:
case LFUN_BEGINNINGBUFSEL:
