diff options
| -rw-r--r-- | man/ChangeLog | 5 | ||||
| -rw-r--r-- | man/faq.texi | 29 |
2 files changed, 21 insertions, 13 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index f3ff703a0a4..c396e8f1ce4 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2004-08-27 Richard M. Stallman <rms@gnu.org> + + * faq.texi (Difference between Emacs and XEmacs): + Explain not to contrast XEmacs with GNU Emacs. + 2004-08-26 Richard M. Stallman <rms@gnu.org> * faq.texi (Difference between Emacs and XEmacs): Rewrite. diff --git a/man/faq.texi b/man/faq.texi index 2e99ec730e1..fffffcde4c0 100644 --- a/man/faq.texi +++ b/man/faq.texi @@ -3592,19 +3592,22 @@ FAQ, we use the name ``Emacs'' only for the official version. Emacs and XEmacs each come with Lisp packages that are lacking in the other. The two versions have some significant differences at the Lisp -programming level. - -Many XEmacs features have found their way into recent versions of Emacs, -and more features can be expected in the future, but there are still many -differences between the two. - -The FSF has used some of the code in XEmacs, and 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 Emacs, aside from -generic C support packages that are not integrated into the code of -Emacs proper.) +programming level. Many XEmacs features have found their way into +recent versions of Emacs, and more features can be expected in the +future, but there are still many differences between the two. + +We have used some of the code in XEmacs, and 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.) + +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 +origin in the GNU Project. @node Emacs for MS-DOS, Emacs for Windows, Difference between Emacs and XEmacs, Finding Emacs and related packages @section Where can I get Emacs for my PC running MS-DOS? |