diff --git a/ChangeLog b/ChangeLog
index e6ee06d0c6..c1f5a8f1f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-12  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* src/lyxfunc.C (processKeySym): only handle the
+	lockinginset/inset stuff if we have a buffer and text loaded...
+
+	* lib/Makefile.am (EXTRA_DIST): add encodings and languages
+
 2000-10-12    <larsbj@baywatch.lyx.org>
 
 	* src/support/lyxfunctional.h: add operator= that takes a reference
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 115dc75363..cc909b6927 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,7 +33,8 @@ LYXLIBDIRS = bind clipart doc examples images kbd layouts scripts \
              templates tex ui
 
 EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
-	external_templates $(LYXLIBDIRS) build-listerrors
+	external_templates $(LYXLIBDIRS) build-listerrors \
+	encodings languages
 
 libinstalldirs:
 	for dir in $(LYXLIBDIRS) ; do \
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 2891249d4b..81e322dab8 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -190,23 +190,25 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
 		//return 0;
 		return FL_PREEMPT;
 	}
-	
-	// this function should be used always [asierra060396]
-	UpdatableInset * tli = owner->view()->theLockingInset();
-	if (owner->view()->available() && tli && (keysym == XK_Escape)) {
-		if (tli == tli->GetLockingInset()) {
-			owner->view()->unlockInset(tli);
-			owner->view()->text->CursorRight(owner->view());
-			moveCursorUpdate(false);
-			owner->showState();
-		} else {
-			tli->UnlockInsetInInset(owner->view(),
-						tli->GetLockingInset(),true);
-		}
-		//return 0;
-		return FL_PREEMPT;
-	}
 
+	if (owner->view()->available()) {
+		// this function should be used always [asierra060396]
+		UpdatableInset * tli = owner->view()->theLockingInset();
+		if (tli && (keysym == XK_Escape)) {
+			if (tli == tli->GetLockingInset()) {
+				owner->view()->unlockInset(tli);
+				owner->view()->text->CursorRight(owner->view());
+				moveCursorUpdate(false);
+				owner->showState();
+			} else {
+				tli->UnlockInsetInInset(owner->view(),
+							tli->GetLockingInset(),true);
+			}
+			//return 0;
+			return FL_PREEMPT;
+		}
+	}
+	
 	// Can we be sure that this will work for all X-Windows
 	// implementations? (Lgb)
 	// This code snippet makes lyx ignore some keys. Perhaps