X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=24a0a3406fdc1c701fa79d26ae19b236a6fa1249;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=29f96d8487371e74053442065f6968f67ef4b46b;hpb=b8426b61f9258f13d8302fc1bc34eda6f997cb47;p=lyx.git

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 29f96d8487..24a0a3406f 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -285,7 +285,6 @@ int LyXFunc::processKeyEvent(XEvent *ev)
 		if (!(keyevent->state&ControlMask) &&
 		    !(keyevent->state&Mod1Mask) &&
 		    (isochar && keysym_return < 0xF000)) {
-			argument = s_r[0]; // shall this be here
 			argument += isochar;
 		}
 		if (argument.empty()) {
@@ -304,12 +303,6 @@ int LyXFunc::processKeyEvent(XEvent *ev)
 	Dispatch(action, argument.c_str());
 	show_sc = tmp_sc;
 	
-	// Need this for deadkeys (alkis)
-	//keyseq.length=0;
-	// ...but that breaks the minibuffer's display of "M-"...
-#ifdef WITH_WARNINGS
-#warning How does the deadkeys react to this?
-#endif
 	return 0;
 } 
 
@@ -727,14 +720,14 @@ string LyXFunc::Dispatch(int ac,
 			int res = one.startscript(Systemcalls::System, tmp);
 			if (res == 0) {
 				setMessage(string(
-				  N_("Document exported as HTML to file: ")) + result);
+				  _("Document exported as HTML to file: ")) + result);
 			} else {
 				setErrorMessage(string(
-				  N_("An unexpected error occured while converting document to HTML in file:")) + result);
+				  _("An unexpected error occured while converting document to HTML in file:")) + result);
 			}
 		}
 		else {
-			setErrorMessage(string(N_("Unknown export type: "))
+			setErrorMessage(string(_("Unknown export type: "))
 					+ extyp);
 		}
 	}
@@ -773,10 +766,16 @@ string LyXFunc::Dispatch(int ac,
 		if (fd_form_toc->form_toc->visible) {
 			fl_raise_form(fd_form_toc->form_toc);
 		} else {
+			static int ow = -1, oh;
 			fl_show_form(fd_form_toc->form_toc,
 				     FL_PLACE_MOUSE |
 				     FL_FREE_SIZE, FL_FULLBORDER,
 				     _("Table of Contents"));
+			if (ow < 0) {
+				ow = fd_form_toc->form_toc->w;
+				oh = fd_form_toc->form_toc->h;
+			}
+			fl_set_form_minsize(fd_form_toc->form_toc, ow, oh);
 		}
 		break;