diff --git a/ChangeLog b/ChangeLog
index 6813099b0f..9c662e8a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/version.h (LYX_RELEASE): version 1.1.5fix2 released.
+
+	* src/minibuffer.C (peek_event): return 1 if there has been a
+	mouse click in the minibuffer.
+
+2000-10-17  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* src/lyxfunc.C (Dispatch): Call to showState() after insertion of 
+	a char only if real_current_font was changed.
+
 2000-10-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* src/lyx_gui.C (init): increase max number of menus to 128.
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index cdcfe69ba9..47be641f76 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -2565,6 +2565,7 @@ string LyXFunc::Dispatch(int ac,
 
 	case LFUN_SELFINSERT:
 	{
+		LyXFont old_font(owner->view()->text->real_current_font);
 		for (string::size_type i = 0; i < argument.length(); ++i) {
 			owner->view()->text->InsertChar(argument[i]);
 			// This needs to be in the loop, or else we
@@ -2576,9 +2577,10 @@ string LyXFunc::Dispatch(int ac,
 			owner->view()->text->cursor;
 		moveCursorUpdate(false);
 
-		// current_font.number can change so we need to update
-		// the minibuffer 
-		owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+		// real_current_font.number can change so we need to update
+		// the minibuffer
+		if (old_font != owner->view()->text->real_current_font)
+			owner->getMiniBuffer()->Set(CurrentState(owner->view()));
 	}
 	break;
 
@@ -2680,7 +2682,7 @@ string LyXFunc::Dispatch(int ac,
 			}
 			
 			owner->view()->beforeChange();
-			
+			LyXFont old_font(owner->view()->text->real_current_font);
 			for (string::size_type i = 0;
 			     i < argument.length(); ++i) {
 				if (greek_kb_flag) {
@@ -2696,9 +2698,10 @@ string LyXFunc::Dispatch(int ac,
 			owner->view()->text->sel_cursor = 
 				owner->view()->text->cursor;
 			moveCursorUpdate(false);
-			// current_font.number can change so we need to update
-			// the minibuffer 
-			owner->getMiniBuffer()->Set(CurrentState(owner->view()));
+			// real_current_font.number can change so we
+			// need to update the minibuffer
+			if (old_font != owner->view()->text->real_current_font)
+				owner->getMiniBuffer()->Set(CurrentState(owner->view()));
 			return string();
 		} else {
 			// why is an "Unknown action" with empty
diff --git a/src/minibuffer.C b/src/minibuffer.C
index 44cb5fbd03..f4b97c4d29 100644
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -129,6 +129,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, FL_Coord, FL_Coord,
 	} else if (event == FL_PUSH) {
 		// This actually clears the buffer.
 		mini->PrepareForCommand();
+		return 1;
  	}
 
 	return 0;
diff --git a/src/version.h b/src/version.h
index 4e1922efc1..7aade2bcef 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 /* Version and release date definition */
-#define LYX_VERSION "1.1.5fixcvs"
-#define LYX_RELEASE "Tue Jul 18, 2000"
+#define LYX_VERSION "1.1.5fix2"
+#define LYX_RELEASE "Tue Oct 18, 2000"
 /* This version string is intended to be used in files created by LyX */
 #define LYX_DOCVERSION "LyX 1.1"