# HG changeset patch # User ben # Date 992169759 0 # Node ID 023b83f4e54b83148e646aba363953e21700b487 # Parent ff0d9e7facba5670f8d31824ebc7a1b7ea37fd37 [xemacs-hg @ 2001-06-10 10:42:16 by ben] ------ signal-code changes ------ data.c, device-tty.c, emacs.c, floatfns.c, linuxplay.c, nas.c, process-unix.c, signal.c, sunplay.c, sysdep.c, syssignal.h: use EMACS_SIGNAL everywhere instead of playing preprocessing games with signal(). s\windowsnt.h, s\mingw32.h, syssignal.h: Remove mswindows signal code from s+m headers and move to syssignal.h as one of the five ways of signal handling, instead of playing preprocessing games. fileio.c, sysdep.c: Rename sys_do_signal to qxe_reliable_signal. signal.c, process-unix.c, profile.c: Create set_timeout_signal(); use instead of just EMACS_SIGNAL to establish a signal handler on a timeout signal; this does special things under Cygwin. nt.c: Eliminate term_ntproc(), which is blank; used as a SIGABRT handler, which was wrong anyway. nt.c, win32.c: Move signal code from nt.c to win32.c, since Cygwin needs it too when dealing with timeout signals. s\cygwin32.h: Define CYGWIN_BROKEN_SIGNALS. ------ other changes ------ s\mingw32.h: Fix problems with NOT_C_CODE being in the wrong place and excluding defines needed when building Makefile.in.in. filelock.c, mule-canna.c, mule-ccl.c, mule-ccl.h, ralloc.c, unexalpha.c, unexapollo.c, unexcw.c, unexelfsgi.c, unexnt.c, unexsni.c, s\aix3-1.h, s\bsd4-1.h, s\bsd4-2.h, s\bsd4-3.h, s\cxux.h, s\cygwin32.h, s\dgux.h, s\dgux5-4r2.h, s\dgux5-4r3.h, s\dgux5-4r4.h, s\ewsux5r4.h, s\gnu.h, s\hpux.h, s\iris3-5.h, s\iris3-6.h, s\irix3-3.h, s\linux.h, s\mingw32.h, s\newsos5.h, s\nextstep.h, s\ptx.h, s\riscix1-1.h, s\riscix1-2.h, s\rtu.h, s\sco4.h, s\sco5.h, s\template.h, s\ultrix.h, s\umax.h, s\umips.h, s\unipl5-0.h, s\unipl5-2.h, s\usg5-0.h, s\usg5-2-2.h, s\usg5-2.h, s\usg5-3.h, s\usg5-4.h, s\windowsnt.h, s\xenix.h: Rename 'GNU Emacs' to XEmacs in the copyright and comments. nas.c: Stylistic cleanup. Avoid preprocessing games with names such as play_sound_file. ------ signal-code changes ------ data.c, device-tty.c, emacs.c, floatfns.c, linuxplay.c, nas.c, process-unix.c, signal.c, sunplay.c, sysdep.c, syssignal.h: use EMACS_SIGNAL everywhere instead of playing preprocessing games with signal(). s\windowsnt.h, s\mingw32.h, syssignal.h: Remove mswindows signal code from s+m headers and move to syssignal.h as one of the five ways of signal handling, instead of playing preprocessing games. fileio.c, sysdep.c: Rename sys_do_signal to qxe_reliable_signal. signal.c, process-unix.c, profile.c: Create set_timeout_signal(); use instead of just EMACS_SIGNAL to establish a signal handler on a timeout signal; this does special things under Cygwin. nt.c: Eliminate term_ntproc(), which is blank; used as a SIGABRT handler, which was wrong anyway. nt.c, win32.c: Move signal code from nt.c to win32.c, since Cygwin needs it too when dealing with timeout signals. s\cygwin32.h: Define CYGWIN_BROKEN_SIGNALS. ------ other changes ------ s\mingw32.h: Fix problems with NOT_C_CODE being in the wrong place and excluding defines needed when building Makefile.in.in. filelock.c, mule-canna.c, mule-ccl.c, mule-ccl.h, ralloc.c, unexalpha.c, unexapollo.c, unexcw.c, unexelfsgi.c, unexnt.c, unexsni.c, s\aix3-1.h, s\bsd4-1.h, s\bsd4-2.h, s\bsd4-3.h, s\cxux.h, s\cygwin32.h, s\dgux.h, s\dgux5-4r2.h, s\dgux5-4r3.h, s\dgux5-4r4.h, s\ewsux5r4.h, s\gnu.h, s\hpux.h, s\iris3-5.h, s\iris3-6.h, s\irix3-3.h, s\linux.h, s\mingw32.h, s\newsos5.h, s\nextstep.h, s\ptx.h, s\riscix1-1.h, s\riscix1-2.h, s\rtu.h, s\sco4.h, s\sco5.h, s\template.h, s\ultrix.h, s\umax.h, s\umips.h, s\unipl5-0.h, s\unipl5-2.h, s\usg5-0.h, s\usg5-2-2.h, s\usg5-2.h, s\usg5-3.h, s\usg5-4.h, s\windowsnt.h, s\xenix.h: Rename 'GNU Emacs' to XEmacs in the copyright and comments. nas.c: Stylistic cleanup. Avoid preprocessing games with names such as play_sound_file. xemacs-faq.texi: Update sections on Windows and MacOS availability. alist.el, apropos.el, autoload.el, bytecomp.el, cl-compat.el, cl-extra.el, cl-macs.el, cl-seq.el, cl.el, cmdloop.el, cus-edit.el, derived.el, gpm.el, itimer.el, lisp-mode.el, shadow.el, version.el, wid-browse.el: Rename 'GNU Emacs' to XEmacs in the copyright. Fix other references to GNU Emacs that should be XEmacs or just Emacs. files.el: Fix warning. simple.el: transpose-line-up/down will now move the region up or down by a line if active. cvtmail.c, fakemail.c, gnuserv.c, gnuserv.h, gnuslib.c, make-msgfile.c, make-path.c, pop.c, pop.h, profile.c, tcp.c: Rename 'GNU Emacs' to XEmacs in the copyright. Fix comments in similar ways. digest-doc.c, sorted-doc.c: Fix program and author name to reflect XEmacs. diff -r ff0d9e7facba -r 023b83f4e54b lib-src/ChangeLog --- a/lib-src/ChangeLog Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/ChangeLog Sun Jun 10 10:42:39 2001 +0000 @@ -1,3 +1,24 @@ +2001-06-10 Ben Wing + + * cvtmail.c: + * fakemail.c: + * gnuserv.c: + * gnuserv.c (handle_ipc_request): + * gnuserv.h: + * gnuslib.c: + * make-msgfile.c: + * make-path.c: + * pop.c: + * pop.h: + * profile.c: + * tcp.c: + Rename 'GNU Emacs' to XEmacs in the copyright. + Fix comments in similar ways. + + * digest-doc.c (main): + * sorted-doc.c (main): + Fix program and author name to reflect XEmacs. + 2001-05-06 Karl M. Hegbloom * movemail.c (lock_dot): Use mkstemp if available diff -r ff0d9e7facba -r 023b83f4e54b lib-src/cvtmail.c --- a/lib-src/cvtmail.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/cvtmail.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,18 +1,18 @@ /* Copyright (C) 1985, 1993, 1994 Free Software Foundation -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b lib-src/digest-doc.c --- a/lib-src/digest-doc.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/digest-doc.c Sun Jun 10 10:42:39 2001 +0000 @@ -17,8 +17,8 @@ register int notfirst = 0; printf (".TL\n"); - printf ("Command Summary for GNU Emacs\n"); - printf (".AU\nRichard M. Stallman\n"); + printf ("Command Summary for XEmacs\n"); + printf (".AU\nThe XEmacs Advocacy Group\n"); while ((ch = getchar ()) != EOF) { if (ch == '\037') diff -r ff0d9e7facba -r 023b83f4e54b lib-src/fakemail.c --- a/lib-src/fakemail.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/fakemail.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,20 +1,20 @@ /* sendmail-like interface to /bin/mail for system V, Copyright (C) 1985, 1994 Free Software Foundation, Inc. -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b lib-src/gnuserv.c --- a/lib-src/gnuserv.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/gnuserv.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,8 +1,8 @@ /* -*-C-*- Server code for handling requests from clients and forwarding them - on to the GNU Emacs process. + on to the XEmacs process. - This file is part of GNU Emacs. + This file is part of XEmacs. Copying is permitted under those conditions described by the GNU General Public License. @@ -166,7 +166,7 @@ /* handle_ipc_request -- accept a request from a client, pass the request on - to the GNU Emacs process, then wait for its reply and + to the XEmacs process, then wait for its reply and pass that on to the client. */ void diff -r ff0d9e7facba -r 023b83f4e54b lib-src/gnuserv.h --- a/lib-src/gnuserv.h Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/gnuserv.h Sun Jun 10 10:42:39 2001 +0000 @@ -1,8 +1,8 @@ /* -*-C-*- - Header file for the GNU Emacs server and client C code. + Header file for the XEmacs server and client C code. - This file is part of GNU Emacs. + This file is part of XEmacs. Copying is permitted under those conditions described by the GNU General Public License. diff -r ff0d9e7facba -r 023b83f4e54b lib-src/gnuslib.c --- a/lib-src/gnuslib.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/gnuslib.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,7 +1,7 @@ /* -*-C-*- - Common library code for the GNU Emacs server and client. + Common library code for the XEmacs server and client. - This file is part of GNU Emacs. + This file is part of XEmacs. Copying is permitted under those conditions described by the GNU General Public License. diff -r ff0d9e7facba -r 023b83f4e54b lib-src/make-msgfile.c --- a/lib-src/make-msgfile.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/make-msgfile.c Sun Jun 10 10:42:39 2001 +0000 @@ -206,7 +206,7 @@ (interactive ...) The arguments given to this program are all the C and Lisp source files - of GNU Emacs. .el and .c files are allowed. There is no support for .elc + of XEmacs. .el and .c files are allowed. There is no support for .elc files at this time, but they may be specified; the corresponding .el file will be used. Similarly, .o files can also be specified, and the corresponding .c file will be used. This helps the makefile pass the correct list of files. diff -r ff0d9e7facba -r 023b83f4e54b lib-src/make-path.c --- a/lib-src/make-path.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/make-path.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,20 +1,20 @@ /* Make all the directories along a path. Copyright (C) 1992 Free Software Foundation, Inc. -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b lib-src/pop.c --- a/lib-src/pop.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/pop.c Sun Jun 10 10:42:39 2001 +0000 @@ -2,20 +2,20 @@ Copyright (c) 1991, 1993, 1996 Free Software Foundation, Inc. Written by Jonathan Kamens, jik@security.ov.com. -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b lib-src/pop.h --- a/lib-src/pop.h Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/pop.h Sun Jun 10 10:42:39 2001 +0000 @@ -2,20 +2,20 @@ Copyright (c) 1991,1993 Free Software Foundation, Inc. Written by Jonathan Kamens, jik@security.ov.com. -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b lib-src/profile.c --- a/lib-src/profile.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/profile.c Sun Jun 10 10:42:39 2001 +0000 @@ -3,20 +3,20 @@ Author: Boaz Ben-Zvi - This file is part of GNU Emacs. + This file is part of XEmacs. - GNU Emacs is free software; you can redistribute it and/or modify + XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - GNU Emacs is distributed in the hope that it will be useful, + XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with GNU Emacs; see the file COPYING. If not, write to + along with XEmacs; see the file COPYING. If not, write to the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b lib-src/sorted-doc.c --- a/lib-src/sorted-doc.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/sorted-doc.c Sun Jun 10 10:42:39 2001 +0000 @@ -204,8 +204,8 @@ printf ("\\input texinfo @c -*-texinfo-*-\n"); printf ("@setfilename ../info/summary\n"); - printf ("@settitle Command Summary for GNU Emacs\n"); - printf ("@unnumbered Command Summary for GNU Emacs\n"); + printf ("@settitle Command Summary for XEmacs\n"); + printf ("@unnumbered Command Summary for XEmacs\n"); printf ("@table @asis\n"); printf ("\n"); printf ("@iftex\n"); diff -r ff0d9e7facba -r 023b83f4e54b lib-src/tcp.c --- a/lib-src/tcp.c Sat Jun 09 09:02:04 2001 +0000 +++ b/lib-src/tcp.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,24 +1,24 @@ /* - * TCP/IP stream emulation for GNU Emacs. + * TCP/IP stream emulation for XEmacs. * Copyright (C) 1988, 1989, 1992, 1993 Free Software Foundation, Inc. * Author: Masanobu Umeda * Maintainer: umerin@mse.kyutech.ac.jp -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b lisp/ChangeLog --- a/lisp/ChangeLog Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/ChangeLog Sun Jun 10 10:42:39 2001 +0000 @@ -1,3 +1,40 @@ +2001-06-10 Ben Wing + + * alist.el: + * apropos.el: + * autoload.el: + * bytecomp.el: + * bytecomp.el (byte-compile-insert-header): + * cl-compat.el: + * cl-extra.el: + * cl-macs.el: + * cl-seq.el: + * cl.el: + * cmdloop.el (execute-extended-command): + * cus-edit.el (alloc): + * derived.el: + * gpm.el: + * itimer.el: + * lisp-mode.el (lisp-mode): + * shadow.el: + * version.el: + * wid-browse.el: + Rename 'GNU Emacs' to XEmacs in the copyright. + Fix other references to GNU Emacs that should be XEmacs or just + Emacs. + + * files.el (insert-directory): + Fix warning. + + * simple.el: + * simple.el (Simple-forward-line-creating-newline): New. + * simple.el (Simple-transpose-lines-mover): New. + * simple.el (transpose-line-up): + * simple.el (transpose-line-down): + * simple.el (transpose-subr): + transpose-line-up/down will now move the region up or down by + a line if active. + 2001-06-08 Mike Sperber * files.el (save-some-buffers-1): Don't zap the help window right diff -r ff0d9e7facba -r 023b83f4e54b lisp/alist.el --- a/lisp/alist.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/alist.el Sun Jun 10 10:42:39 2001 +0000 @@ -18,7 +18,7 @@ ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b lisp/apropos.el --- a/lisp/apropos.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/apropos.el Sun Jun 10 10:42:39 2001 +0000 @@ -20,7 +20,7 @@ ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b lisp/autoload.el --- a/lisp/autoload.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/autoload.el Sun Jun 10 10:42:39 2001 +0000 @@ -28,7 +28,7 @@ ;;; Commentary: -;; This code helps GNU Emacs maintainers keep the loaddefs.el file up to +;; This code helps XEmacs maintainers keep the loaddefs.el file up to ;; date. It interprets magic cookies of the form ";;;###autoload" in ;; lisp source files in various useful ways. To learn more, read the ;; source; if you're going to use this, you'd better be able to. diff -r ff0d9e7facba -r 023b83f4e54b lisp/bytecomp.el --- a/lisp/bytecomp.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/bytecomp.el Sun Jun 10 10:42:39 2001 +0000 @@ -184,7 +184,7 @@ ;;; o You can add this to /etc/magic to make file(1) recognize the files ;;; generated by this compiler: ;;; -;;; 0 string ;ELC GNU Emacs Lisp compiled file, +;;; 0 string ;ELC XEmacs Lisp compiled file, ;;; >4 byte x version %d ;;; ;;; TO DO: @@ -1776,7 +1776,7 @@ ;; say "Binary files differ" instead of actually doing a diff of two .elc ;; files. An extra benefit is that you can add this to /etc/magic: ;; - ;; 0 string ;ELC GNU Emacs Lisp compiled file, + ;; 0 string ;ELC XEmacs Lisp compiled file, ;; >4 byte x version %d ;; (insert diff -r ff0d9e7facba -r 023b83f4e54b lisp/cl-compat.el --- a/lisp/cl-compat.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cl-compat.el Sun Jun 10 10:42:39 2001 +0000 @@ -1,4 +1,4 @@ -;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) +;;; cl-compat.el --- Common Lisp extensions for XEmacs Lisp (compatibility) ;; Copyright (C) 1993 Free Software Foundation, Inc. diff -r ff0d9e7facba -r 023b83f4e54b lisp/cl-extra.el --- a/lisp/cl-extra.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cl-extra.el Sun Jun 10 10:42:39 2001 +0000 @@ -1,4 +1,4 @@ -;;; cl-extra.el --- Common Lisp extensions for GNU Emacs Lisp (part two) +;;; cl-extra.el --- Common Lisp extensions for XEmacs Lisp (part two) ;; Copyright (C) 1993 Free Software Foundation, Inc. diff -r ff0d9e7facba -r 023b83f4e54b lisp/cl-macs.el --- a/lisp/cl-macs.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cl-macs.el Sun Jun 10 10:42:39 2001 +0000 @@ -1,4 +1,4 @@ -;;; cl-macs.el --- Common Lisp extensions for GNU Emacs Lisp (part four) +;;; cl-macs.el --- Common Lisp extensions for XEmacs Lisp (part four) ;; Copyright (C) 1993 Free Software Foundation, Inc. diff -r ff0d9e7facba -r 023b83f4e54b lisp/cl-seq.el --- a/lisp/cl-seq.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cl-seq.el Sun Jun 10 10:42:39 2001 +0000 @@ -1,4 +1,4 @@ -;;; cl-seq.el --- Common Lisp extensions for GNU Emacs Lisp (part three) +;;; cl-seq.el --- Common Lisp extensions for XEmacs Lisp (part three) ;; Copyright (C) 1993 Free Software Foundation, Inc. diff -r ff0d9e7facba -r 023b83f4e54b lisp/cl.el --- a/lisp/cl.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cl.el Sun Jun 10 10:42:39 2001 +0000 @@ -1,4 +1,4 @@ -;;; cl.el --- Common Lisp extensions for GNU Emacs Lisp +;;; cl.el --- Common Lisp extensions for XEmacs Lisp ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. diff -r ff0d9e7facba -r 023b83f4e54b lisp/cmdloop.el --- a/lisp/cmdloop.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cmdloop.el Sun Jun 10 10:42:39 2001 +0000 @@ -306,7 +306,7 @@ (setq this-command (read-command ;; Note: this has the hard-wired ;; "C-u" and "M-x" string bug in common - ;; with all GNU Emacs's. + ;; with all Emacs's. ;; (i.e. it prints C-u and M-x regardless of ;; whether some other keys were actually bound ;; to `execute-extended-command' and diff -r ff0d9e7facba -r 023b83f4e54b lisp/cus-edit.el --- a/lisp/cus-edit.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/cus-edit.el Sun Jun 10 10:42:39 2001 +0000 @@ -232,7 +232,7 @@ :group 'customize) (defgroup alloc nil - "Storage allocation and gc for GNU Emacs Lisp interpreter." + "Storage allocation and gc for XEmacs Lisp interpreter." :tag "Storage Allocation" :group 'internal) diff -r ff0d9e7facba -r 023b83f4e54b lisp/derived.el --- a/lisp/derived.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/derived.el Sun Jun 10 10:42:39 2001 +0000 @@ -29,7 +29,7 @@ ;; This file is dumped with XEmacs. -;; GNU Emacs is already, in a sense, object oriented -- each object +;; XEmacs is already, in a sense, object oriented -- each object ;; (buffer) belongs to a class (major mode), and that class defines ;; the relationship between messages (input events) and methods ;; (commands) by means of a keymap. diff -r ff0d9e7facba -r 023b83f4e54b lisp/files.el --- a/lisp/files.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/files.el Sun Jun 10 10:42:39 2001 +0000 @@ -3166,7 +3166,8 @@ ;; my new naming scheme. --ben ((and (fboundp 'mswindows-insert-directory) (eq system-type 'windows-nt)) - (mswindows-insert-directory file switches wildcard full-directory-p)) + (declare-fboundp (mswindows-insert-directory + file switches wildcard full-directory-p))) (t (if wildcard ;; Run ls in the directory of the file pattern we asked for. diff -r ff0d9e7facba -r 023b83f4e54b lisp/gpm.el --- a/lisp/gpm.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/gpm.el Sun Jun 10 10:42:39 2001 +0000 @@ -18,7 +18,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b lisp/itimer.el --- a/lisp/itimer.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/itimer.el Sun Jun 10 10:42:39 2001 +0000 @@ -1,4 +1,4 @@ -;;; Interval timers for GNU Emacs +;;; Interval timers for XEmacs ;;; Copyright (C) 1988, 1991, 1993, 1997, 1998 Kyle E. Jones ;;; ;;; This program is free software; you can redistribute it and/or modify diff -r ff0d9e7facba -r 023b83f4e54b lisp/lisp-mode.el --- a/lisp/lisp-mode.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/lisp-mode.el Sun Jun 10 10:42:39 2001 +0000 @@ -332,7 +332,7 @@ ) (defun lisp-mode () - "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp. + "Major mode for editing Lisp code for Lisps other than Emacs Lisp. Commands: Delete converts tabs to spaces as it moves back. Blank lines separate paragraphs. Semicolons start comments. diff -r ff0d9e7facba -r 023b83f4e54b lisp/shadow.el --- a/lisp/shadow.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/shadow.el Sun Jun 10 10:42:39 2001 +0000 @@ -13,13 +13,13 @@ ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. -;; GNU Emacs is distributed in the hope that it will be useful, +;; XEmacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b lisp/simple.el --- a/lisp/simple.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/simple.el Sun Jun 10 10:42:39 2001 +0000 @@ -2517,53 +2517,62 @@ (interactive "*p") (transpose-subr 'forward-sexp arg)) +(defun Simple-forward-line-creating-newline () + ;; Move forward over a line, + ;; but create a newline if none exists yet. + (end-of-line) + (if (eobp) + (newline) + (forward-char 1))) + +(defun Simple-transpose-lines-mover (arg) + (if (= arg 1) + (Simple-forward-line-creating-newline) + (forward-line arg))) + (defun transpose-lines (arg) "Exchange current line and previous line, leaving point after both. With argument ARG, takes previous line and moves it past ARG lines. With argument 0, interchanges line point is in with line mark is in." (interactive "*p") - (transpose-subr #'(lambda (arg) - (if (= arg 1) - (progn - ;; Move forward over a line, - ;; but create a newline if none exists yet. - (end-of-line) - (if (eobp) - (newline) - (forward-char 1))) - (forward-line arg))) - arg)) + (transpose-subr 'Simple-transpose-lines-mover arg)) (defun transpose-line-up (arg) "Move current line one line up, leaving point at beginning of that line. -This can be run repeatedly to move the current line up a number of lines." +With argument ARG, move it ARG lines up. This can be run repeatedly +to move the current line up a number of lines. + +If the region is active, move the region up one line (or ARG lines, +if specified). The region will not be selected afterwards, but this +command can still be run repeatedly to move the region up a number +of lines." (interactive "*p") - ;; Move forward over a line, - ;; but create a newline if none exists yet. - (end-of-line) - (if (eobp) - (newline) - (forward-char 1)) - (transpose-lines (- arg)) - (forward-line -1)) + (transpose-line-down (- arg))) (defun transpose-line-down (arg) "Move current line one line down, leaving point at beginning of that line. -This can be run repeatedly to move the current line down a number of lines." +With argument ARG, move it ARG lines down. This can be run repeatedly +to move the current line down a number of lines. + +If the region is active, move the region down one line (or ARG lines, +if specified). The region will not be selected afterwards, but this +command can still be run repeatedly to move the region down a number +of lines." (interactive "*p") - ;; Move forward over a line, - ;; but create a newline if none exists yet. - (end-of-line) - (if (eobp) - (newline) - (forward-char 1)) - (transpose-lines arg) - (forward-line -1)) - -(defun transpose-subr (mover arg) + (if (or (region-active-p) + (getf last-command-properties 'transpose-region-by-line-command)) + (progn + (transpose-subr 'Simple-transpose-lines-mover arg t) + (putf this-command-properties 'transpose-region-by-line-command t)) + (Simple-forward-line-creating-newline) + (transpose-subr 'Simple-transpose-lines-mover arg) + (forward-line -1))) + +(defun transpose-subr (mover arg &optional move-region) (let (start1 end1 start2 end2) ;; XEmacs -- use flet instead of defining a separate function and - ;; relying on dynamic scope!!! + ;; relying on dynamic scope; use (mark t) etc; add code to support + ;; the new MOVE-REGION arg. (flet ((transpose-subr-1 () (if (> (min end1 end2) (max start1 start2)) (error "Don't have two things to transpose")) @@ -2583,36 +2592,63 @@ (setq end2 (point)) (funcall mover -1) (setq start2 (point)) - (goto-char (mark t)) ; XEmacs + (goto-char (mark t)) (funcall mover 1) (setq end1 (point)) (funcall mover -1) (setq start1 (point)) (transpose-subr-1)) - (exchange-point-and-mark t))) ; XEmacs - (while (> arg 0) - (funcall mover -1) - (setq start1 (point)) - (funcall mover 1) - (setq end1 (point)) - (funcall mover 1) - (setq end2 (point)) - (funcall mover -1) - (setq start2 (point)) - (transpose-subr-1) - (goto-char end2) - (setq arg (1- arg))) - (while (< arg 0) - (funcall mover -1) - (setq start2 (point)) - (funcall mover -1) - (setq start1 (point)) - (funcall mover 1) - (setq end1 (point)) - (funcall mover 1) - (setq end2 (point)) - (transpose-subr-1) - (setq arg (1+ arg)))))) + (exchange-point-and-mark t))) + (if move-region + (let ((rbeg (region-beginning)) + (rend (region-end))) + (while (> arg 0) + (goto-char rend) + (funcall mover 1) + (setq end2 (point)) + (funcall mover -1) + (setq start2 (point)) + (setq start1 rbeg end1 rend) + (transpose-subr-1) + (incf rbeg (- end2 start2)) + (incf rend (- end2 start2)) + (setq arg (1- arg))) + (while (< arg 0) + (goto-char rbeg) + (funcall mover -1) + (setq start1 (point)) + (funcall mover 1) + (setq end1 (point)) + (setq start2 rbeg end2 rend) + (transpose-subr-1) + (decf rbeg (- end1 start1)) + (decf rend (- end1 start1)) + (setq arg (1+ arg))) + (set-mark rbeg) + (goto-char rend)) + (while (> arg 0) + (funcall mover -1) + (setq start1 (point)) + (funcall mover 1) + (setq end1 (point)) + (funcall mover 1) + (setq end2 (point)) + (funcall mover -1) + (setq start2 (point)) + (transpose-subr-1) + (goto-char end2) + (setq arg (1- arg))) + (while (< arg 0) + (funcall mover -1) + (setq start2 (point)) + (funcall mover -1) + (setq start1 (point)) + (funcall mover 1) + (setq end1 (point)) + (funcall mover 1) + (setq end2 (point)) + (transpose-subr-1) + (setq arg (1+ arg))))))) (defcustom comment-column 32 diff -r ff0d9e7facba -r 023b83f4e54b lisp/version.el --- a/lisp/version.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/version.el Sun Jun 10 10:42:39 2001 +0000 @@ -18,7 +18,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b lisp/wid-browse.el --- a/lisp/wid-browse.el Sat Jun 09 09:02:04 2001 +0000 +++ b/lisp/wid-browse.el Sun Jun 10 10:42:39 2001 +0000 @@ -7,20 +7,20 @@ ;; Version: 1.9960 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ -;; This file is part of GNU Emacs. +;; This file is part of XEmacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; XEmacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. -;; GNU Emacs is distributed in the hope that it will be useful, +;; XEmacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the +;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. diff -r ff0d9e7facba -r 023b83f4e54b man/ChangeLog --- a/man/ChangeLog Sat Jun 09 09:02:04 2001 +0000 +++ b/man/ChangeLog Sun Jun 10 10:42:39 2001 +0000 @@ -1,3 +1,10 @@ +2001-06-10 Ben Wing + + * xemacs-faq.texi (Q1.0.10): + * xemacs-faq.texi (Q1.0.11): + * xemacs-faq.texi (Q1.0.12): + Update sections on Windows and MacOS availability. + 2001-06-08 Ben Wing * xemacs-faq.texi (Top): diff -r ff0d9e7facba -r 023b83f4e54b man/xemacs-faq.texi --- a/man/xemacs-faq.texi Sat Jun 09 09:02:04 2001 +0000 +++ b/man/xemacs-faq.texi Sun Jun 10 10:42:39 2001 +0000 @@ -7,7 +7,7 @@ @finalout @titlepage @title XEmacs FAQ -@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/06/08 12:21:15 $ +@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/06/10 10:42:25 $ @sp 1 @author Tony Rossini @author Ben Wing @@ -663,7 +663,8 @@ @node Q1.0.10, Q1.0.11, Q1.0.9, Introduction @unnumberedsubsec Q1.0.10: Is there a port of XEmacs to Microsoft ('95 or NT)? -Yes, see @ref{MS Windows}. +Yes. XEmacs can be built under MS Windows and is fully-featured and +actively developed. See @ref{MS Windows}. @node Q1.0.11, Q1.0.12, Q1.0.10, Introduction @unnumberedsubsec Q1.0.11: Is there a port of XEmacs to the Macintosh? @@ -676,9 +677,18 @@ @c For the MacOS, there is a port of @c @uref{ftp://ftp.cs.cornell.edu/pub/parmet/, Emacs 18.59}. -Yes, there is a port of XEmacs 19.14, tested on MacOS 7.6.1 and MacOS -8.5.1 by @email{pjarvis@@ispchannel.com, Pitts Jarvis}. It's available -at @uref{http://homepage.mac.com/pjarvis/xemacs.html}. +Yes. + +XEmacs 21.5 (perhaps 21.4 also?) works on MacOS X, although it certainly +will not feel very much like a Mac application as it has no Mac-specific +code in it. + +There is also a port of XEmacs 19.14 that works on all recent versions +of MacOS, from 8.1 through MacOS X, by @email{pjarvis@@ispchannel.com, +Pitts Jarvis}. It runs in an equivalent of TTY mode only (one single +Macintosh window, 25 colors), but has a large number of Mac-specific +additions. It's available at +@uref{http://homepage.mac.com/pjarvis/xemacs.html}. @node Q1.0.12, Q1.0.13, Q1.0.11, Introduction @unnumberedsubsec Q1.0.12: Is there a port of XEmacs to NextStep? diff -r ff0d9e7facba -r 023b83f4e54b src/ChangeLog --- a/src/ChangeLog Sat Jun 09 09:02:04 2001 +0000 +++ b/src/ChangeLog Sun Jun 10 10:42:39 2001 +0000 @@ -1,3 +1,145 @@ +2001-06-10 Ben Wing + + + ------ signal-code changes ------ + + * data.c (init_data_very_early): + * device-tty.c (init_device_tty): + * emacs.c (fatal_error_signal): + * emacs.c (memory_warning_signal): + * floatfns.c (init_floatfns_very_early): + * linuxplay.c (linux_play_data_or_file): + * nas.c (*): + * process-unix.c (unix_init_process): + * process-unix.c (unix_create_process): + * process-unix.c (unix_send_process): + * process-unix.c (unix_deactivate_process): + * signal.c (handle_signal_if_fatal): + * signal.c (init_signals_very_early): + * signal.c (init_interrupts_late): + * sunplay.c (play_sound_file): + * sunplay.c (play_sound_data): + * sysdep.c (save_signal_handlers): + * sysdep.c (restore_signal_handlers): + * sysdep.c (setup_pty): + * syssignal.h (EMACS_SIGNAL): + use EMACS_SIGNAL everywhere instead of playing preprocessing + games with signal(). + + * s\windowsnt.h: + * s\mingw32.h: + * syssignal.h: + Remove mswindows signal code from s+m headers and move to + syssignal.h as one of the five ways of signal handling, instead of + playing preprocessing games. + + * fileio.c: + * sysdep.c (qxe_reliable_signal): + Rename sys_do_signal to qxe_reliable_signal. + + * signal.c (set_timeout_signal): + * process-unix.c (close_safely): + * profile.c (Fstart_profiling): + * profile.c (Fstop_profiling): + * signal.c (init_async_timeouts): + * signal.c (start_async_timeouts): + Create set_timeout_signal(); use instead of just EMACS_SIGNAL to + establish a signal handler on a timeout signal; this does special + things under Cygwin. + + * nt.c (init_ntproc): + Eliminate term_ntproc(), which is blank; used as a SIGABRT handler, + which was wrong anyway. + + * nt.c: + * win32.c: + * win32.c (sigmask): + * win32.c (mswindows_sigset): + * win32.c (mswindows_sighold): + * win32.c (mswindows_sigrelse): + * win32.c (mswindows_raise): + * win32.c (setitimer_helper_proc): + * win32.c (syms_of_win32): + Move signal code from nt.c to win32.c, since Cygwin needs it + too when dealing with timeout signals. + + * s\cygwin32.h: + Define CYGWIN_BROKEN_SIGNALS. + + + ------ other changes ------ + + * s\mingw32.h: + Fix problems with NOT_C_CODE being in the wrong place and + excluding defines needed when building Makefile.in.in. + + * filelock.c: + * mule-canna.c: + * mule-canna.c (Fcanna_initialize): + * mule-canna.c (Fcanna_finalize): + * mule-ccl.c: + * mule-ccl.h: + * ralloc.c: + * unexalpha.c: + * unexapollo.c: + * unexcw.c: + * unexelfsgi.c: + * unexnt.c: + * unexsni.c: + * s\aix3-1.h: + * s\bsd4-1.h: + * s\bsd4-2.h: + * s\bsd4-3.h: + * s\cxux.h: + * s\cygwin32.h: + * s\dgux.h: + * s\dgux5-4r2.h: + * s\dgux5-4r3.h: + * s\dgux5-4r4.h: + * s\ewsux5r4.h: + * s\gnu.h: + * s\hpux.h: + * s\iris3-5.h: + * s\iris3-6.h: + * s\irix3-3.h: + * s\linux.h: + * s\mingw32.h: + * s\newsos5.h: + * s\nextstep.h: + * s\ptx.h: + * s\riscix1-1.h: + * s\riscix1-2.h: + * s\rtu.h: + * s\sco4.h: + * s\sco5.h: + * s\template.h: + * s\ultrix.h: + * s\umax.h: + * s\umips.h: + * s\unipl5-0.h: + * s\unipl5-2.h: + * s\usg5-0.h: + * s\usg5-2-2.h: + * s\usg5-2.h: + * s\usg5-3.h: + * s\usg5-4.h: + * s\windowsnt.h: + * s\xenix.h: + Rename 'GNU Emacs' to XEmacs in the copyright and comments. + + * nas.c (NAS_LITTLE_ENDIAN): + * nas.c (XTOOLKIT): + * nas.c (nas_play_sound_file): + * nas.c (nas_play_sound_data): + * nas.c (CatchIoErrorAndJump): + * nas.c (DataReadS): + * nas.c (DataReadL): + * nas.c (readChunk): + * nas.c (WaveOpenDataForReading): + Stylistic cleanup. + Avoid preprocessing games with names such as play_sound_file. + + 2001-06-08 Ben Wing ------ gc-in-window-procedure fixes ------ diff -r ff0d9e7facba -r 023b83f4e54b src/data.c --- a/src/data.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/data.c Sun Jun 10 10:42:39 2001 +0000 @@ -2032,9 +2032,9 @@ if (!initialized) return; #endif /* CANNOT_DUMP */ - signal (SIGFPE, arith_error); + EMACS_SIGNAL (SIGFPE, arith_error); #ifdef uts - signal (SIGEMT, arith_error); + EMACS_SIGNAL (SIGEMT, arith_error); #endif /* uts */ } diff -r ff0d9e7facba -r 023b83f4e54b src/device-tty.c --- a/src/device-tty.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/device-tty.c Sun Jun 10 10:42:39 2001 +0000 @@ -209,6 +209,6 @@ { #ifdef SIGWINCH if (initialized && !noninteractive) - signal (SIGWINCH, tty_device_size_change_signal); + EMACS_SIGNAL (SIGWINCH, tty_device_size_change_signal); #endif /* SIGWINCH */ } diff -r ff0d9e7facba -r 023b83f4e54b src/emacs.c --- a/src/emacs.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/emacs.c Sun Jun 10 10:42:39 2001 +0000 @@ -506,7 +506,7 @@ /* Now, reset our signal handler, so the next time, we just die. Don't do this before auto-saving. */ - signal (sig, SIG_DFL); + EMACS_SIGNAL (sig, SIG_DFL); /* Keep in mind that there's more than one signal that we can crash on. */ @@ -631,7 +631,7 @@ { /* #### bad bad bad; this function shouldn't do anything except set a flag, or weird corruption could happen. */ - signal (sig, memory_warning_signal); + EMACS_SIGNAL (sig, memory_warning_signal); malloc_warning (GETTEXT ("Operating system warns that virtual memory is running low.\n")); diff -r ff0d9e7facba -r 023b83f4e54b src/fileio.c --- a/src/fileio.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/fileio.c Sun Jun 10 10:42:39 2001 +0000 @@ -206,7 +206,7 @@ signal handler) because that's way too losing. (#### Actually, longjmp()ing out of the signal handler may not be - as losing as I thought. See sys_do_signal() in sysdep.c.) */ + as losing as I thought. See qxe_reliable_signal() in sysdep.c.) */ ssize_t read_allowing_quit (int fildes, void *buf, size_t size) diff -r ff0d9e7facba -r 023b83f4e54b src/filelock.c --- a/src/filelock.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/filelock.c Sun Jun 10 10:42:39 2001 +0000 @@ -1,19 +1,19 @@ /* Copyright (C) 1985, 86, 87, 93, 94, 96 Free Software Foundation, Inc. -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b src/floatfns.c --- a/src/floatfns.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/floatfns.c Sun Jun 10 10:42:39 2001 +0000 @@ -983,7 +983,7 @@ { #ifdef LISP_FLOAT_TYPE # ifdef FLOAT_CATCH_SIGILL - signal (SIGILL, float_error); + EMACS_SIGNAL (SIGILL, float_error); # endif in_float = 0; #endif /* LISP_FLOAT_TYPE */ diff -r ff0d9e7facba -r 023b83f4e54b src/linuxplay.c --- a/src/linuxplay.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/linuxplay.c Sun Jun 10 10:42:39 2001 +0000 @@ -311,8 +311,8 @@ this could lead to problems, when multiple sound cards are installed */ mix_fd = audio_fd; - sighup_handler = signal(SIGHUP, sighandler); - sigint_handler = signal(SIGINT, sighandler); + sighup_handler = EMACS_SIGNAL (SIGHUP, sighandler); + sigint_handler = EMACS_SIGNAL (SIGINT, sighandler); if (!audio_init(mix_fd,audio_fd,fmt,speed,tracks,&volume,&sndcnv)) goto END_OF_PLAY; @@ -357,8 +357,8 @@ ioctl(audio_fd,SNDCTL_DSP_SYNC,NULL); ioctl(audio_fd,SNDCTL_DSP_RESET,NULL); - signal(SIGHUP,sighup_handler); - signal(SIGINT,sigint_handler); + EMACS_SIGNAL (SIGHUP,sighup_handler); + EMACS_SIGNAL (SIGINT,sigint_handler); if (mix_fd > 0) { if (audio_vol >= 0) { diff -r ff0d9e7facba -r 023b83f4e54b src/mule-canna.c --- a/src/mule-canna.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/mule-canna.c Sun Jun 10 10:42:39 2001 +0000 @@ -55,7 +55,7 @@ - list of warning messages DESCRIPTION: Initialize ``canna'', which is a kana-to-kanji - converter for GNU Emacs. The first arg + converter for XEmacs. The first arg specifies if inserting space character between BUNSETSU when candidates are displayed. The second arg specifies server. The third arg @@ -69,7 +69,7 @@ list of warning messages DESCRIPTION: finalize ``canna'', which is a kana-to-kanji - converter for GNU Emacs. This cause to write + converter for XEmacs. This cause to write miscellaneous informations to kana-to-kanji dictionary. @@ -344,7 +344,7 @@ } DEFUN ("canna-initialize", Fcanna_initialize, 0, 3, 0, /* -Initialize ``canna'', which is a kana-to-kanji converter for GNU Emacs. +Initialize ``canna'', which is a kana-to-kanji converter for XEmacs. The first arg specifies if inserting space character between BUNSETSU when candidates are displayed. The second arg specifies server. @@ -462,7 +462,7 @@ } DEFUN ("canna-finalize", Fcanna_finalize, 0, 0, 0, /* -finalize ``canna'', which is a kana-to-kanji converter for GNU Emacs. +finalize ``canna'', which is a kana-to-kanji converter for XEmacs. This cause to write miscellaneous informations to kana-to-kanji dictionary. */ ()) diff -r ff0d9e7facba -r 023b83f4e54b src/mule-ccl.c --- a/src/mule-ccl.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/mule-ccl.c Sun Jun 10 10:42:39 2001 +0000 @@ -2,20 +2,20 @@ Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. -This file is part of GNU Emacs. +This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b src/mule-ccl.h --- a/src/mule-ccl.h Sat Jun 09 09:02:04 2001 +0000 +++ b/src/mule-ccl.h Sun Jun 10 10:42:39 2001 +0000 @@ -4,18 +4,18 @@ This file is part of XEmacs. -GNU Emacs is free software; you can redistribute it and/or modify +XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU Emacs is distributed in the hope that it will be useful, +XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to +along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff -r ff0d9e7facba -r 023b83f4e54b src/nas.c --- a/src/nas.c Sat Jun 09 09:02:04 2001 +0000 +++ b/src/nas.c Sun Jun 10 10:42:39 2001 +0000 @@ -82,37 +82,29 @@ /* NAS <= 1.2p5