>>>>> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:
Jean-Marc> The following patch fixes bug 1781, which is 1.3.x-only
Jean-Marc> (since server-get-tip has been removed in HEAD).
Jean-Marc> Committing now.
And the patch is...
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.1021.2.66
diff -u -p -r1.1021.2.66 ChangeLog
--- src/ChangeLog 1 Feb 2005 22:41:25 -0000 1.1021.2.66
+++ src/ChangeLog 11 Feb 2005 13:18:29 -0000
@@ -1,6 +1,13 @@
-2005-01-31 Michael Schmitt <[EMAIL PROTECTED]>
+2005-02-08 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
- * lyxrc.C: text message fixed
+ * lyxfunc.C (dispatch): remove a bogus cast (bug 1781)
+
+ * LyXAction.C (helpText): do not translate error message (bug 1781).
+ (init): LFUN_GETTIP does not require a buffer (bug 1781).
+
+2005-01-31 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * lyxrc.C: text message fixed.
2005-01-20 Angus Leeming <[EMAIL PROTECTED]>
Index: src/LyXAction.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LyXAction.C,v
retrieving revision 1.144.2.2
diff -u -p -r1.144.2.2 LyXAction.C
--- src/LyXAction.C 7 Dec 2004 10:48:11 -0000 1.144.2.2
+++ src/LyXAction.C 11 Feb 2005 13:18:29 -0000
@@ -346,7 +346,7 @@ void LyXAction::init()
{ LFUN_GETFONT, "server-get-font", "", ReadOnly },
{ LFUN_GETLAYOUT, "server-get-layout", "", ReadOnly },
{ LFUN_GETNAME, "server-get-name", "", ReadOnly },
- { LFUN_GETTIP, "server-get-tip", "", ReadOnly },
+ { LFUN_GETTIP, "server-get-tip", "", NoBuffer },
{ LFUN_GETXY, "server-get-xy", "", ReadOnly },
{ LFUN_GOTOFILEROW, "server-goto-file-row", "", Noop },
{ LFUN_NOTIFY, "server-notify", "", ReadOnly },
@@ -564,7 +564,7 @@ string const LyXAction::helpText(int pse
}
if (help.empty()) {
- help = _("No description available!");
+ help = N_("No description available!");
} else if (!ev.argument.empty()) {
help += ' ';
help += ev.argument;
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.394.2.7
diff -u -p -r1.394.2.7 lyxfunc.C
--- src/lyxfunc.C 10 Jan 2005 19:17:25 -0000 1.394.2.7
+++ src/lyxfunc.C 11 Feb 2005 13:18:29 -0000
@@ -1349,7 +1349,7 @@ void LyXFunc::dispatch(FuncRequest const
case LFUN_GETTIP:
{
int const qa = lyxaction.LookupFunc(argument);
- setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
+ setMessage(lyxaction.helpText(qa));
}
break;
