From: Amin Bandali Date: Sun, 12 Sep 2021 03:03:57 +0000 (-0400) Subject: Merge from origin/emacs-27 X-Git-Tag: emacs-28.0.90~1055 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4b7fa05001ef48db28a77e1343ffb196de39609;p=emacs.git Merge from origin/emacs-27 d7f4cc0974 ERC: Track: Clarify documentation on tracked buffers and a... fb1f0dfec9 ERC: Track: Fix documentation of structure of 'erc-modifie... 252a769b11 ; * doc/lispref/files.texi (Changing Files): Fix xref to f... edc93a5ce6 ; Fix grammar in efaq.texi on Emacs vs XEmacs. # Conflicts: # doc/misc/efaq.texi --- e4b7fa05001ef48db28a77e1343ffb196de39609 diff --cc doc/misc/efaq.texi index d5d1eb5e65b,9c92b2d93dd..ea43c36dd09 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@@ -1420,21 -1453,36 +1420,29 @@@ several languages in the same document modifying variables without having to use Lisp; and automatic conversion of files from Macintosh, Microsoft, and Unix platforms. - -@node Difference between Emacs and XEmacs -@section What is the difference between Emacs and XEmacs (formerly Lucid Emacs)? +@node What was XEmacs? +@section What was XEmacs? @cindex XEmacs -@cindex Difference Emacs and XEmacs -@cindex Lucid Emacs -@cindex Epoch XEmacs was a branch version of Emacs that is no longer actively - 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. + 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. -Some XEmacs code has been contributed to Emacs, and we would like to -use other parts, but the earlier XEmacs maintainers did not always -keep track of the authors of contributed code, which makes it -impossible for the FSF to get copyright papers signed for that code. -(The FSF requires these papers for all the code included in the Emacs -release, aside from generic C support packages that retain their -separate identity and are not integrated into the code of Emacs -proper.) +In the past, it was not uncommon for Emacs packages to include code +for compatibility with XEmacs. Nowadays, most built-in and third party +packages have either stopped supporting XEmacs or were developed +exclusively for Emacs. +XEmacs was initially derived from a prerelease version of Emacs 19. If you want to talk about these two versions and distinguish them, please call them ``Emacs'' and ``XEmacs.'' To contrast ``XEmacs'' with ``GNU Emacs'' would be misleading, since XEmacs too has its