anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug when reading bind files

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7438 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-07-29 09:43:15 +00:00
parent 23a3298aa5
commit 3261bad69e
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@ -179,7 +179,6 @@ src/mathed/ref_inset.C
src/paragraph.C
src/paragraph_funcs.C
src/rowpainter.C
src/support/path_defines.C
src/text.C
src/text2.C
src/text3.C

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-07-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* kbmap.C (read): fix error message when reading bind files
2003-07-29 Angus Leeming <leeming@lyx.org>
* BufferView.[Ch] (ChangeCitationsIfUnique): This function most

27
src/kbmap.C
View File

@ -93,15 +93,20 @@ bool kb_keymap::read(string const & bind_file)
string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
lexrc.setFile(tmp);
if (!lexrc.isOK()) return false;
if (!lexrc.isOK()) {
lyxerr << "kb_keymap::read: cannot open bind file:"
<< tmp << endl;
return false;
}
lyxerr[Debug::KBMAP] << "Reading bindfile:" << tmp << endl;
lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
bool error = false;
while (lexrc.isOK()) {
while (!error && lexrc.isOK()) {
switch (lexrc.lex()) {
case LyXLex::LEX_UNDEF:
lexrc.printError("Unknown tag `$$Token'");
error = true;
continue;
case LyXLex::LEX_FEOF:
continue;
@ -113,6 +118,7 @@ bool kb_keymap::read(string const & bind_file)
seq = lexrc.getString();
} else {
lexrc.printError("BN_BIND: Missing key sequence");
error = true;
break;
}
@ -120,6 +126,7 @@ bool kb_keymap::read(string const & bind_file)
cmd = lexrc.getString();
} else {
lexrc.printError("BN_BIND: missing command");
error = true;
break;
}
@ -127,16 +134,17 @@ bool kb_keymap::read(string const & bind_file)
if (!action == LFUN_UNKNOWN_ACTION) {
lexrc.printError("BN_BIND: Unknown LyX"
" function `$$Token'");
error = true;
break;
}
error = (bind(seq, kb_action(action)) != string::npos);
bind(seq, kb_action(action));
break;
}
case BN_BINDFILE:
if (lexrc.next()) {
string const tmp(lexrc.getString());
error = read(tmp);
error = !read(tmp);
} else {
lexrc.printError("BN_BINDFILE: Missing file name");
error = true;
@ -147,11 +155,10 @@ bool kb_keymap::read(string const & bind_file)
}
}
if (error) {
lyxerr << "Error reading bind file: " << tmp << endl;
}
return error;
if (error)
lyxerr << "kb_keymap::read: error while reading bind file:"
<< tmp << endl;
return !error;
}