From 4fc7b7950d935a312eab4b4de889fdf779092a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Tue, 12 Apr 2011 14:24:59 +0000
Subject: [PATCH] Backport r38350:

Author: sanda
Date: Tue Apr 12 15:35:41 2011
New Revision: 38350
URL: http://www.lyx.org/trac/changeset/38350

Log:
Sensible editor launches terminal editors, closing #7448.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@38351 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/configure.py | 4 ++--
 status.16x       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 17a0f21599..ddcd8bbe03 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -294,7 +294,7 @@ def checkFormatEntries(dtl_tools):
 \Format xpm        xpm     XPM                    "" "%s"	"%s"	""''' % \
         (iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) )
     #
-    checkViewer('a text editor', ['sensible-editor', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
+    checkViewer('a text editor', ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
         'nedit', 'gedit', 'notepad'],
         rc_entry = [r'''\Format asciichess asc    "Plain text (chess output)"  "" ""	"%%"	""
 \Format asciiimage asc    "Plain text (image)"         "" ""	"%%"	""
@@ -314,7 +314,7 @@ def checkFormatEntries(dtl_tools):
 \Format text4      txt    "Plain text (catdvi)"   "" ""	"%%"	"document"
 \Format textparagraph txt "Plain Text, Join Lines" "" ""	"%%"	"document"''' ])
  #
-    checkViewer('a BibTeX editor', ['sensible-editor', 'jabref', 'JabRef', \
+    checkViewer('a BibTeX editor', ['jabref', 'JabRef', \
         'pybliographic', 'bibdesk', 'gbib', 'kbib', \
         'kbibtex', 'sixpack', 'bibedit', 'tkbibtex' \
         'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
diff --git a/status.16x b/status.16x
index fe0ef5dd57..6721069901 100644
--- a/status.16x
+++ b/status.16x
@@ -84,6 +84,7 @@ What's new
 
 - Fix freezing of LyX at samba shares (bug 5891).
 
+
 * DOCUMENTATION AND LOCALIZATION
 
 
@@ -95,3 +96,6 @@ What's new
 
 - Fix reconfigure script: allow LaTeX-less install of LyX under Windows.
 
+- Do not configure LyX to use "sensible-editor" as a text editor/viewer,
+  since this is not necessarily a GUI editor (bug 7448).
+