; * doc/misc/efaq.texi (What was XEmacs?): Restore pre-merge text.

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index ea43c36dd09fa5a643a087a85ca842e9620001d2..d5d1eb5e65b7fab2562efa3745cca692e6cb4437 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1425,17 +1425,9 @@ of files from Macintosh, Microsoft, and Unix platforms.
 @cindex XEmacs
 
 XEmacs was a branch version of Emacs that is no longer actively
-developed.  XEmacs was first called Lucid Emacs, and was initially
-derived from a prerelease version of Emacs 19.  In this FAQ, we use
-the name ``Emacs'' only for the official version.
-
-XEmacs last released a new version on January 30, 2009, and it lacks
-many important features that exist in Emacs.  In the past, it was not
-uncommon for Emacs packages to include code for compatibility with
-XEmacs.  Nowadays, although some packages still maintain such
-compatibility code, several of the more popular built-in and third
-party packages have either stopped supporting XEmacs or were developed
-exclusively for Emacs.
+developed.  XEmacs last released a new version on January 30, 2009,
+and it lacks many important features that exist in Emacs.  Since its
+development has stopped, we do not expect to see any new releases.
 
 In the past, it was not uncommon for Emacs packages to include code
 for compatibility with XEmacs.  Nowadays, most built-in and third party