add encodings and languages to dist handle the locking inset in processkeysym only...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1104 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index e6ee06d0c6416dc1476e5fc4efdf1eb3ef529660..c1f5a8f1f7291335e60cd2e5022ddaaec37e67b8 100644 (file)
--- 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 115dc75363ad239f6802a9bc5cefadcdb7cfb02f..cc909b69272fd3895f85607850fb754a81027372 100644 (file)
--- 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 2891249d4b94b80ad51f0eab852dc61a159a709a..81e322dab8089bbff9f99a8f384565d3594f3891 100644 (file)
--- 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);
+
+       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;
                }
-               //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