commit: Convert lisp/ to GPLv3.
13 years, 11 months
Michael Sperber
changeset: 5414:91b3aa59f49b
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Fri Oct 15 15:18:27 2010 +0200
files: lisp/alist.el lisp/auto-save.el lisp/backquote.el lisp/code-process.el lisp/compat.el lisp/cus-face.el lisp/dumped-lisp.el lisp/font-mgr.el lisp/font.el lisp/fontconfig.el lisp/gnome.el lisp/gtk-compose.el lisp/gtk-marshal.el lisp/gtk-package.el lisp/gtk-widget-accessors.el lisp/gtk.el lisp/hyper-apropos.el lisp/itimer.el lisp/ldap.el lisp/lisp-mnt.el lisp/mule/canna-leim.el lisp/mule/kinsoku.el lisp/multicast.el lisp/resize-minibuffer.el lisp/site-load.el lisp/version.el lisp/view-less.el lisp/x-win-sun.el
description:
Convert lisp/ to GPLv3.
diff -r cf70940883ca -r 91b3aa59f49b lisp/alist.el
--- a/lisp/alist.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/alist.el Fri Oct 15 15:18:27 2010 +0200
@@ -7,10 +7,10 @@
;; This file is part of APEL (A Portable Emacs Library).
-;; This program 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
;; This program is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; 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.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;;###autoload
diff -r cf70940883ca -r 91b3aa59f49b lisp/auto-save.el
--- a/lisp/auto-save.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/auto-save.el Fri Oct 15 15:18:27 2010 +0200
@@ -9,20 +9,20 @@
;; Keywords: extensions, dumped
;; Version: 1.26
-;; 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.
+;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff -r cf70940883ca -r 91b3aa59f49b lisp/backquote.el
--- a/lisp/backquote.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/backquote.el Fri Oct 15 15:18:27 2010 +0200
@@ -7,20 +7,20 @@
;; This file is part of XEmacs.
-;; 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.
+;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched with FSF.
diff -r cf70940883ca -r 91b3aa59f49b lisp/code-process.el
--- a/lisp/code-process.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/code-process.el Fri Oct 15 15:18:27 2010 +0200
@@ -13,20 +13,18 @@
;; This file is very similar to code-process.el
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
diff -r cf70940883ca -r 91b3aa59f49b lisp/compat.el
--- a/lisp/compat.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/compat.el Fri Oct 15 15:18:27 2010 +0200
@@ -726,3 +726,4 @@
(fmakunbound 'compat-define-compat-functions)
+)
\ No newline at end of file
diff -r cf70940883ca -r 91b3aa59f49b lisp/cus-face.el
--- a/lisp/cus-face.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/cus-face.el Fri Oct 15 15:18:27 2010 +0200
@@ -8,6 +8,21 @@
;; Keywords: help, faces
;; Version: 1.9960-x
;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
+
+;; This file is part of XEmacs.
+
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched with: Not synched.
diff -r cf70940883ca -r 91b3aa59f49b lisp/dumped-lisp.el
--- a/lisp/dumped-lisp.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/dumped-lisp.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,3 +1,18 @@
+;; This file is part of XEmacs.
+
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
(defvar packages-hardcoded-lisp
'(
;; Nothing at this time
diff -r cf70940883ca -r 91b3aa59f49b lisp/font-mgr.el
--- a/lisp/font-mgr.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/font-mgr.el Fri Oct 15 15:18:27 2010 +0200
@@ -7,10 +7,10 @@
;; This file is part of XEmacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
+;; 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.
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,7 @@
;; for more details.
;; You should have received a copy of the GNU General Public License
-;; 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.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;; Synched up with: Not in GNU Emacs.
diff -r cf70940883ca -r 91b3aa59f49b lisp/font.el
--- a/lisp/font.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/font.el Fri Oct 15 15:18:27 2010 +0200
@@ -10,20 +10,20 @@
;; Keywords: faces
;; Version: 1.52
-;; 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.
+;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF
diff -r cf70940883ca -r 91b3aa59f49b lisp/fontconfig.el
--- a/lisp/fontconfig.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/fontconfig.el Fri Oct 15 15:18:27 2010 +0200
@@ -10,20 +10,20 @@
;; Updated: 05 Mar 2005 by Stephen J. Turnbull
;; Keywords: faces
-;; 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.
+;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in GNU
diff -r cf70940883ca -r 91b3aa59f49b lisp/gnome.el
--- a/lisp/gnome.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/gnome.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,19 +1,17 @@
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; 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.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-fboundp
'(gtk-type-from-name
diff -r cf70940883ca -r 91b3aa59f49b lisp/gtk-compose.el
--- a/lisp/gtk-compose.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/gtk-compose.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,19 +1,17 @@
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; 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.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(require 'x-compose)
diff -r cf70940883ca -r 91b3aa59f49b lisp/gtk-marshal.el
--- a/lisp/gtk-marshal.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/gtk-marshal.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,19 +1,17 @@
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; 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.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;
;; To regenerate ../src/emacs-marshals.c just load this file.
;;
diff -r cf70940883ca -r 91b3aa59f49b lisp/gtk-package.el
--- a/lisp/gtk-package.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/gtk-package.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,20 +1,18 @@
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; 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.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
-;;
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
+
;; A GTK version of package-ui.el
(globally-declare-fboundp
diff -r cf70940883ca -r 91b3aa59f49b lisp/gtk-widget-accessors.el
--- a/lisp/gtk-widget-accessors.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/gtk-widget-accessors.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,19 +1,17 @@
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; 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.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-fboundp
'(gtk-fundamental-type))
diff -r cf70940883ca -r 91b3aa59f49b lisp/gtk.el
--- a/lisp/gtk.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/gtk.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,19 +1,17 @@
;; This file is part of XEmacs.
-;;
-;; XEmacs is free software; you can redistribute it and/or modify it
+
+;; 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.
-;;
+;; Free Software Foundation, either version 3 of the License, or (at your
+;; option) any later version.
+
;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA. */
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
(globally-declare-fboundp
'(gtk-import-function-internal
diff -r cf70940883ca -r 91b3aa59f49b lisp/hyper-apropos.el
--- a/lisp/hyper-apropos.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/hyper-apropos.el Fri Oct 15 15:18:27 2010 +0200
@@ -11,20 +11,18 @@
;; This file is part of XEmacs.
-;; 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 of the License, or
-;; (at your option) any later version.
-;;
-;; 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.
-;;
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff -r cf70940883ca -r 91b3aa59f49b lisp/itimer.el
--- a/lisp/itimer.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/itimer.el Fri Oct 15 15:18:27 2010 +0200
@@ -1,22 +1,20 @@
-;;; 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
-;;; 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.
-;;;
-;;; This program 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.
-;;;
-;;; A copy of the GNU General Public License can be obtained from this
-;;; program's author (send electronic mail to kyle(a)uunet.uu.net) or from
-;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-;;; 02139, USA.
-;;;
-;;; Send bug reports to kyle_jones(a)wonderworks.com
+;; Interval timers for XEmacs
+;; Copyright (C) 1988, 1991, 1993, 1997, 1998 Kyle E. Jones
+;;
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs. If not, see <http://www.gnu.org/licenses/>.
+;;
+;; Send bug reports to kyle_jones(a)wonderworks.com
(provide 'itimer)
diff -r cf70940883ca -r 91b3aa59f49b lisp/ldap.el
--- a/lisp/ldap.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/ldap.el Fri Oct 15 15:18:27 2010 +0200
@@ -10,20 +10,18 @@
;; This file is part of XEmacs
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This file provides mid-level and user-level functions to access directory
diff -r cf70940883ca -r 91b3aa59f49b lisp/lisp-mnt.el
--- a/lisp/lisp-mnt.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/lisp-mnt.el Fri Oct 15 15:18:27 2010 +0200
@@ -580,20 +580,18 @@
(defconst lm-standard-permission
"\n;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.\n"
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.\n"
"Standard permissions notice for Lisp files that are part of XEmacs.
License version and FSF address are current as of 2009-04-01.")
diff -r cf70940883ca -r 91b3aa59f49b lisp/mule/canna-leim.el
--- a/lisp/mule/canna-leim.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/mule/canna-leim.el Fri Oct 15 15:18:27 2010 +0200
@@ -13,20 +13,18 @@
;; Keywords: japanese, input method, LEIM
;; Last Modified: 1997/10/27 10:08:49
-;; This program 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 versions 2, or (at your option)
-;; any later version.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; This program 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.
+;; 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 XEmacs, see the file COPYING. If not, write to the Free
-;; Software Foundation Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; TODO
;;
diff -r cf70940883ca -r 91b3aa59f49b lisp/mule/kinsoku.el
--- a/lisp/mule/kinsoku.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/mule/kinsoku.el Fri Oct 15 15:18:27 2010 +0200
@@ -4,20 +4,15 @@
;; This file is part of Mule (MULtilingual Enhancement of XEmacs).
;; This file contains Japanese and Chinese characters.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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 XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; 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.
;; Written by Jareth Hein (jhod(a)po.iijnet.or.jp) based off of
;; code by S.Tomura, Electrotechnical Lab. (tomura(a)etl.go.jp) from
diff -r cf70940883ca -r 91b3aa59f49b lisp/multicast.el
--- a/lisp/multicast.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/multicast.el Fri Oct 15 15:18:27 2010 +0200
@@ -12,20 +12,18 @@
;; This file is part of XEmacs.
-;; 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 of the License, or
-;; (at your option) any later version.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff -r cf70940883ca -r 91b3aa59f49b lisp/resize-minibuffer.el
--- a/lisp/resize-minibuffer.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/resize-minibuffer.el Fri Oct 15 15:18:27 2010 +0200
@@ -11,21 +11,18 @@
;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, you can either
-;; send email to this program's maintainer or write to: The Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not synched. Copied from rsz-minibuf.el to
;;; resize-minibuffer.el to avoid current problems where, when there's a
diff -r cf70940883ca -r 91b3aa59f49b lisp/site-load.el
--- a/lisp/site-load.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/site-load.el Fri Oct 15 15:18:27 2010 +0200
@@ -5,6 +5,19 @@
;; Keywords: internal
;; This file is part of XEmacs.
+
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff -r cf70940883ca -r 91b3aa59f49b lisp/version.el
--- a/lisp/version.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/version.el Fri Oct 15 15:18:27 2010 +0200
@@ -7,20 +7,18 @@
;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: FSF 19.34.
diff -r cf70940883ca -r 91b3aa59f49b lisp/view-less.el
--- a/lisp/view-less.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/view-less.el Fri Oct 15 15:18:27 2010 +0200
@@ -8,20 +8,18 @@
;; This file is part of XEmacs.
;;
-;; 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 of the License, or
-;; (at your option) any later version.
-;;
-;; 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.
-;;
+;; 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 3 of the License, or (at your
+;; option) any later version.
+
+;; 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 XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Synched up with: Not in FSF.
diff -r cf70940883ca -r 91b3aa59f49b lisp/x-win-sun.el
--- a/lisp/x-win-sun.el Fri Oct 15 15:12:08 2010 +0200
+++ b/lisp/x-win-sun.el Fri Oct 15 15:18:27 2010 +0200
@@ -6,20 +6,18 @@
;; This file is part of XEmacs.
-;; 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.
+;; 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 3 of the License, or (at your
+;; option) any later version.
-;; 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.
+;; 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 XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Added tag r21-5-latest-beta for changeset 3600e23880f7
13 years, 11 months
Stephen J. Turnbull
changeset: 5411:ae9e5251544d
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Wed Apr 27 04:26:11 2011 +0900
files: .hgtags
description:
Added tag r21-5-latest-beta for changeset 3600e23880f7
diff -r 3600e23880f7 -r ae9e5251544d .hgtags
--- a/.hgtags Wed Apr 27 04:17:14 2011 +0900
+++ b/.hgtags Wed Apr 27 04:26:11 2011 +0900
@@ -242,3 +242,4 @@
d185fa593d5fcf818ca0d27e53374348d936d7e8 last-version-with-netinstall
e7991690160358d5dd0a8adbf54e0bb8bfc56891 r21-5-30
1c87bdc11d65e3bcbe23895b6f585bede5ba4160 last-gplv2
+3600e23880f7ddb7b5d658c4d0421f480e109c36 r21-5-latest-beta
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Added tag last-gplv2 for changeset 1c87bdc11d65
13 years, 11 months
Stephen J. Turnbull
changeset: 5410:3600e23880f7
tag: r21-5-latest-beta
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Wed Apr 27 04:17:14 2011 +0900
files: .hgtags
description:
Added tag last-gplv2 for changeset 1c87bdc11d65
diff -r 1c87bdc11d65 -r 3600e23880f7 .hgtags
--- a/.hgtags Wed Apr 27 01:24:28 2011 +0900
+++ b/.hgtags Wed Apr 27 04:17:14 2011 +0900
@@ -241,3 +241,4 @@
3742ea8250b5fd339d6d797835faf8761f61d0ae ben-lisp-object-final-ws-year-2005
d185fa593d5fcf818ca0d27e53374348d936d7e8 last-version-with-netinstall
e7991690160358d5dd0a8adbf54e0bb8bfc56891 r21-5-30
+1c87bdc11d65e3bcbe23895b6f585bede5ba4160 last-gplv2
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Added tag r21-5-30 for changeset e79916901603
13 years, 11 months
Stephen J. Turnbull
changeset: 5409:1c87bdc11d65
tag: last-gplv2
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Wed Apr 27 01:24:28 2011 +0900
files: .hgtags
description:
Added tag r21-5-30 for changeset e79916901603
diff -r e79916901603 -r 1c87bdc11d65 .hgtags
--- a/.hgtags Wed Apr 27 01:24:28 2011 +0900
+++ b/.hgtags Wed Apr 27 01:24:28 2011 +0900
@@ -240,3 +240,4 @@
5c427ece884b7023a244fba8cad8cf41b37dd5ca r21-5-29
3742ea8250b5fd339d6d797835faf8761f61d0ae ben-lisp-object-final-ws-year-2005
d185fa593d5fcf818ca0d27e53374348d936d7e8 last-version-with-netinstall
+e7991690160358d5dd0a8adbf54e0bb8bfc56891 r21-5-30
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[COMMIT] Make sure distinct symbol macros with identical names expand distinctly.
13 years, 11 months
Aidan Kehoe
This still has a problem on non-bignum builds, where the Lisp-visible
eq-hash is not guaranteed distinct for any two symbols (since pointer values
are not all representable as Lisp integers, they are truncated before
escaping) This will be relevant with very large positive or very large
negative values in address space; if anyone’s working on a machine that does
this, shout, and we can think about this some more.
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1303635165 -3600
# Node ID 97ac18bd1fa393a50e607f6713afbbc4fd7bf5c8
# Parent 568ec109e73dcf3107daae6324ad4fb04e05077b
Make sure distinct symbol macros with identical names expand distinctly.
lisp/ChangeLog addition:
2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (symbol-macrolet):
* cl-macs.el (lexical-let):
* cl.el:
* cl.el (cl-macroexpand):
Distinct symbol macros with identical string names should
nonetheless expand to different things; implement this, storing
the symbol's eq-hash in the macro environment, rather than its
string name.
tests/ChangeLog addition:
2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
Check that distinct symbol macros with identical string names
expand to different things.
diff -r 568ec109e73d -r 97ac18bd1fa3 lisp/ChangeLog
--- a/lisp/ChangeLog Sat Apr 23 22:42:10 2011 +0100
+++ b/lisp/ChangeLog Sun Apr 24 09:52:45 2011 +0100
@@ -1,3 +1,14 @@
+2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl-macs.el (symbol-macrolet):
+ * cl-macs.el (lexical-let):
+ * cl.el:
+ * cl.el (cl-macroexpand):
+ Distinct symbol macros with identical string names should
+ nonetheless expand to different things; implement this, storing
+ the symbol's eq-hash in the macro environment, rather than its
+ string name.
+
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (define-char-comparisons):
diff -r 568ec109e73d -r 97ac18bd1fa3 lisp/cl-macs.el
--- a/lisp/cl-macs.el Sat Apr 23 22:42:10 2011 +0100
+++ b/lisp/cl-macs.el Sun Apr 24 09:52:45 2011 +0100
@@ -1791,12 +1791,14 @@
"Make symbol macro definitions.
Within the body FORMs, references to the variable NAME will be replaced
by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...)."
+ (check-type name symbol)
(cl-macroexpand-all (cons 'progn form)
- (append (list (list (symbol-name name) expansion))
- (loop
- for (name expansion) in symbol-macros
- collect (list (symbol-name name) expansion))
- cl-macro-environment)))
+ (nconc (list (list (eq-hash name) expansion))
+ (loop
+ for (name expansion) in symbol-macros
+ do (check-type name symbol)
+ collect (list (eq-hash name) expansion))
+ cl-macro-environment)))
(defvar cl-closure-vars nil)
;;;###autoload
@@ -1807,8 +1809,9 @@
(let* ((cl-closure-vars cl-closure-vars)
(vars (mapcar #'(lambda (x)
(or (consp x) (setq x (list x)))
- (push (gensym (format "--%s--" (car x)))
- cl-closure-vars)
+ (push (gensym (concat "--" (symbol-name (car x))
+ "--" ))
+ cl-closure-vars)
(set (car cl-closure-vars) [bad-lexical-ref])
(list (car x) (cadr x) (car cl-closure-vars)))
bindings))
@@ -1816,7 +1819,7 @@
(cl-macroexpand-all
(cons 'progn body)
(nconc (mapcar #'(lambda (x)
- (list (symbol-name (car x))
+ (list (eq-hash (car x))
(list 'symbol-value (caddr x))
t))
vars)
diff -r 568ec109e73d -r 97ac18bd1fa3 lisp/cl.el
--- a/lisp/cl.el Sat Apr 23 22:42:10 2011 +0100
+++ b/lisp/cl.el Sun Apr 24 09:52:45 2011 +0100
@@ -229,11 +229,17 @@
The second optional arg ENVIRONMENT specifies an environment of macro
definitions to shadow the loaded ones for use in file byte-compilation."
- (let ((cl-macro-environment cl-env))
- (while (progn (setq cl-macro (funcall cl-old-macroexpand cl-macro cl-env))
+ (let ((cl-macro-environment
+ (if cl-macro-environment (append cl-env cl-macro-environment) cl-env))
+ eq-hash)
+ (while (progn (setq cl-macro
+ (macroexpand-internal cl-macro cl-macro-environment))
(and (symbolp cl-macro)
- (cdr (assq (symbol-name cl-macro) cl-env))))
- (setq cl-macro (cadr (assq (symbol-name cl-macro) cl-env))))
+ (setq eq-hash (eq-hash cl-macro))
+ (if (fixnump eq-hash)
+ (assq eq-hash cl-macro-environment)
+ (assoc eq-hash cl-macro-environment))))
+ (setq cl-macro (cadr (assoc* eq-hash cl-macro-environment))))
cl-macro))
;;; Declarations.
diff -r 568ec109e73d -r 97ac18bd1fa3 tests/ChangeLog
--- a/tests/ChangeLog Sat Apr 23 22:42:10 2011 +0100
+++ b/tests/ChangeLog Sun Apr 24 09:52:45 2011 +0100
@@ -1,3 +1,9 @@
+2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ Check that distinct symbol macros with identical string names
+ expand to different things.
+
2011-03-24 Jerry James <james(a)xemacs.org>
* automated/query-coding-tests.el: "Compatiblity" -> "Compatibility".
diff -r 568ec109e73d -r 97ac18bd1fa3 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Sat Apr 23 22:42:10 2011 +0100
+++ b/tests/automated/lisp-tests.el Sun Apr 24 09:52:45 2011 +0100
@@ -2914,4 +2914,18 @@
"the function special operator doesn't create a lexical context."))
(Assert (eql 0 (needs-lexical-context 2 nil nil)))))
+;; Test symbol-macrolet with symbols with identical string names.
+
+(macrolet
+ ((test-symbol-macrolet ()
+ (let* ((symbol 'my-symbol)
+ (copy-symbol (copy-symbol symbol))
+ (third (copy-symbol copy-symbol)))
+ `(symbol-macrolet ((,symbol [symbol expansion])
+ (,copy-symbol [copy expansion])
+ (,third [third expansion]))
+ (list ,symbol ,copy-symbol ,third)))))
+ (Assert (equal '([symbol expansion] [copy expansion] [third expansion])
+ (test-symbol-macrolet))))
+
;;; end of lisp-tests.el
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Make sure distinct symbol macros with identical names expand distinctly.
13 years, 11 months
Aidan Kehoe
changeset: 5406:97ac18bd1fa3
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Apr 24 09:52:45 2011 +0100
files: lisp/ChangeLog lisp/cl-macs.el lisp/cl.el tests/ChangeLog tests/automated/lisp-tests.el
description:
Make sure distinct symbol macros with identical names expand distinctly.
lisp/ChangeLog addition:
2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (symbol-macrolet):
* cl-macs.el (lexical-let):
* cl.el:
* cl.el (cl-macroexpand):
Distinct symbol macros with identical string names should
nonetheless expand to different things; implement this, storing
the symbol's eq-hash in the macro environment, rather than its
string name.
tests/ChangeLog addition:
2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
Check that distinct symbol macros with identical string names
expand to different things.
diff -r 568ec109e73d -r 97ac18bd1fa3 lisp/ChangeLog
--- a/lisp/ChangeLog Sat Apr 23 22:42:10 2011 +0100
+++ b/lisp/ChangeLog Sun Apr 24 09:52:45 2011 +0100
@@ -1,3 +1,14 @@
+2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl-macs.el (symbol-macrolet):
+ * cl-macs.el (lexical-let):
+ * cl.el:
+ * cl.el (cl-macroexpand):
+ Distinct symbol macros with identical string names should
+ nonetheless expand to different things; implement this, storing
+ the symbol's eq-hash in the macro environment, rather than its
+ string name.
+
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (define-char-comparisons):
diff -r 568ec109e73d -r 97ac18bd1fa3 lisp/cl-macs.el
--- a/lisp/cl-macs.el Sat Apr 23 22:42:10 2011 +0100
+++ b/lisp/cl-macs.el Sun Apr 24 09:52:45 2011 +0100
@@ -1791,12 +1791,14 @@
"Make symbol macro definitions.
Within the body FORMs, references to the variable NAME will be replaced
by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...)."
+ (check-type name symbol)
(cl-macroexpand-all (cons 'progn form)
- (append (list (list (symbol-name name) expansion))
- (loop
- for (name expansion) in symbol-macros
- collect (list (symbol-name name) expansion))
- cl-macro-environment)))
+ (nconc (list (list (eq-hash name) expansion))
+ (loop
+ for (name expansion) in symbol-macros
+ do (check-type name symbol)
+ collect (list (eq-hash name) expansion))
+ cl-macro-environment)))
(defvar cl-closure-vars nil)
;;;###autoload
@@ -1807,8 +1809,9 @@
(let* ((cl-closure-vars cl-closure-vars)
(vars (mapcar #'(lambda (x)
(or (consp x) (setq x (list x)))
- (push (gensym (format "--%s--" (car x)))
- cl-closure-vars)
+ (push (gensym (concat "--" (symbol-name (car x))
+ "--" ))
+ cl-closure-vars)
(set (car cl-closure-vars) [bad-lexical-ref])
(list (car x) (cadr x) (car cl-closure-vars)))
bindings))
@@ -1816,7 +1819,7 @@
(cl-macroexpand-all
(cons 'progn body)
(nconc (mapcar #'(lambda (x)
- (list (symbol-name (car x))
+ (list (eq-hash (car x))
(list 'symbol-value (caddr x))
t))
vars)
diff -r 568ec109e73d -r 97ac18bd1fa3 lisp/cl.el
--- a/lisp/cl.el Sat Apr 23 22:42:10 2011 +0100
+++ b/lisp/cl.el Sun Apr 24 09:52:45 2011 +0100
@@ -229,11 +229,17 @@
The second optional arg ENVIRONMENT specifies an environment of macro
definitions to shadow the loaded ones for use in file byte-compilation."
- (let ((cl-macro-environment cl-env))
- (while (progn (setq cl-macro (funcall cl-old-macroexpand cl-macro cl-env))
+ (let ((cl-macro-environment
+ (if cl-macro-environment (append cl-env cl-macro-environment) cl-env))
+ eq-hash)
+ (while (progn (setq cl-macro
+ (macroexpand-internal cl-macro cl-macro-environment))
(and (symbolp cl-macro)
- (cdr (assq (symbol-name cl-macro) cl-env))))
- (setq cl-macro (cadr (assq (symbol-name cl-macro) cl-env))))
+ (setq eq-hash (eq-hash cl-macro))
+ (if (fixnump eq-hash)
+ (assq eq-hash cl-macro-environment)
+ (assoc eq-hash cl-macro-environment))))
+ (setq cl-macro (cadr (assoc* eq-hash cl-macro-environment))))
cl-macro))
;;; Declarations.
diff -r 568ec109e73d -r 97ac18bd1fa3 tests/ChangeLog
--- a/tests/ChangeLog Sat Apr 23 22:42:10 2011 +0100
+++ b/tests/ChangeLog Sun Apr 24 09:52:45 2011 +0100
@@ -1,3 +1,9 @@
+2011-04-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ Check that distinct symbol macros with identical string names
+ expand to different things.
+
2011-03-24 Jerry James <james(a)xemacs.org>
* automated/query-coding-tests.el: "Compatiblity" -> "Compatibility".
diff -r 568ec109e73d -r 97ac18bd1fa3 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Sat Apr 23 22:42:10 2011 +0100
+++ b/tests/automated/lisp-tests.el Sun Apr 24 09:52:45 2011 +0100
@@ -2914,4 +2914,18 @@
"the function special operator doesn't create a lexical context."))
(Assert (eql 0 (needs-lexical-context 2 nil nil)))))
+;; Test symbol-macrolet with symbols with identical string names.
+
+(macrolet
+ ((test-symbol-macrolet ()
+ (let* ((symbol 'my-symbol)
+ (copy-symbol (copy-symbol symbol))
+ (third (copy-symbol copy-symbol)))
+ `(symbol-macrolet ((,symbol [symbol expansion])
+ (,copy-symbol [copy expansion])
+ (,third [third expansion]))
+ (list ,symbol ,copy-symbol ,third)))))
+ (Assert (equal '([symbol expansion] [copy expansion] [third expansion])
+ (test-symbol-macrolet))))
+
;;; end of lisp-tests.el
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[COMMIT] Check types (unless `byte-compile-delete-errors' is t), #'char<, #'char=, etc.
13 years, 11 months
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1303594930 -3600
# Node ID 568ec109e73dcf3107daae6324ad4fb04e05077b
# Parent 82e220b08acebf3c5dffe0e9f8b4543db5f13e10
Check types (unless `byte-compile-delete-errors' is t), #'char<, #'char=, etc.
src/ChangeLog addition:
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* editfns.c:
* editfns.c (syms_of_editfns):
Implement #'char= in cl-extra.el, not here, accepting more than
two arguments as Common Lisp specifies.
lisp/ChangeLog addition:
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (define-char-comparisons):
Add type-checking when the various character-specific comparison
predicates are used; don't check types if
byte-compile-delete-errors is non-nil at compile-time, instead use
the corresponding built-in numeric byte codes.
diff -r 82e220b08ace -r 568ec109e73d lisp/ChangeLog
--- a/lisp/ChangeLog Sun Apr 24 01:01:34 2011 +0900
+++ b/lisp/ChangeLog Sat Apr 23 22:42:10 2011 +0100
@@ -1,3 +1,11 @@
+2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl-extra.el (define-char-comparisons):
+ Add type-checking when the various character-specific comparison
+ predicates are used; don't check types if
+ byte-compile-delete-errors is non-nil at compile-time, instead use
+ the corresponding built-in numeric byte codes.
+
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* font.el:
diff -r 82e220b08ace -r 568ec109e73d lisp/cl-extra.el
--- a/lisp/cl-extra.el Sun Apr 24 01:01:34 2011 +0900
+++ b/lisp/cl-extra.el Sat Apr 23 22:42:10 2011 +0100
@@ -690,13 +690,59 @@
(setq float-negative-epsilon (* x 2))))))
(cl-float-limits))
-;; No type-checking here, we should add it.
-(defalias 'char< '<)
-(defalias 'char>= '>=)
-(defalias 'char> '>)
-(defalias 'char<= '<=)
;;; Character functions.
+(macrolet
+ ((define-char-comparisons (&rest alist)
+ "Provide Common Lisp's character-specific comparison predicates.
+
+These throw errors if any arguments are non-characters, conflicting with
+typical emacs behavior. This is not the case if
+`byte-compile-delete-errors' is non-nil; see the documentation of that
+variable.
+
+This doesn't include the case-insensitive comparisons, and it probably
+should."
+ (let* ((functions (mapcar 'car alist))
+ (map (mapcar #'(lambda (symbol)
+ `(,symbol .
+ ,(intern (substring (symbol-name symbol)
+ (length "char")))))
+ functions)))
+ `(progn
+ (mapc
+ (function*
+ (lambda ((function . cl-unsafe-comparison))
+ (put function 'cl-unsafe-comparison cl-unsafe-comparison)
+ (put function 'cl-compiler-macro
+ #'(lambda (form &rest arguments)
+ (if byte-compile-delete-errors
+ (cons (get (car form) 'cl-unsafe-comparison)
+ (cdr form))
+ form)))))
+ ',map)
+ ,@(mapcar
+ (function*
+ (lambda ((function . documentation))
+ `(defun ,function (character &rest more-characters)
+ ,documentation
+ (check-type character character)
+ (check-type more-characters
+ (satisfies (lambda (list)
+ (every 'characterp list))))
+ (apply ',(cdr (assq function map))
+ character more-characters))))
+ alist)))))
+ (define-char-comparisons
+ (char= . "Return t if all character arguments are the same object.")
+ (char/= . "Return t if no two character arguments are the same object.")
+ (char< . "Return t if the character arguments monotonically increase.")
+ (char> . "Return t if the character arguments monotonically decrease.")
+ (char<= . "Return t if the character arguments are monotonically \
+nondecreasing.")
+ (char>= . "Return t if the character arguments are monotonically \
+nonincreasing.")))
+
(defun* digit-char-p (character &optional (radix 10))
"Return non-nil if CHARACTER represents a digit in base RADIX.
diff -r 82e220b08ace -r 568ec109e73d src/ChangeLog
--- a/src/ChangeLog Sun Apr 24 01:01:34 2011 +0900
+++ b/src/ChangeLog Sat Apr 23 22:42:10 2011 +0100
@@ -1,3 +1,10 @@
+2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * editfns.c:
+ * editfns.c (syms_of_editfns):
+ Implement #'char= in cl-extra.el, not here, accepting more than
+ two arguments as Common Lisp specifies.
+
2011-04-17 Jeff Sparkes <jsparkes(a)gmail.com>
* device-tty.c (tty_device_system_metrics): Fix compile issues for
diff -r 82e220b08ace -r 568ec109e73d src/editfns.c
--- a/src/editfns.c Sun Apr 24 01:01:34 2011 +0900
+++ b/src/editfns.c Sat Apr 23 22:42:10 2011 +0100
@@ -2260,18 +2260,6 @@
: x1 == x2)
? Qt : Qnil;
}
-
-DEFUN ("char=", Fchar_Equal, 2, 2, 0, /*
-Return t if two characters match, case is significant.
-Both arguments must be characters (i.e. NOT integers).
-*/
- (character1, character2))
-{
- CHECK_CHAR_COERCE_INT (character1);
- CHECK_CHAR_COERCE_INT (character2);
-
- return EQ (character1, character2) ? Qt : Qnil;
-}
#if 0 /* Undebugged FSFmacs code */
/* Transpose the markers in two regions of the current buffer, and
@@ -2397,7 +2385,6 @@
DEFSYMBOL (Quser_files_and_directories);
DEFSUBR (Fchar_equal);
- DEFSUBR (Fchar_Equal);
DEFSUBR (Fgoto_char);
DEFSUBR (Fstring_to_char);
DEFSUBR (Fchar_to_string);
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Check types (unless `byte-compile-delete-errors' is t), #'char<, #'char=, etc.
13 years, 11 months
Aidan Kehoe
changeset: 5405:568ec109e73d
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Apr 23 22:42:10 2011 +0100
files: lisp/ChangeLog lisp/cl-extra.el src/ChangeLog src/editfns.c
description:
Check types (unless `byte-compile-delete-errors' is t), #'char<, #'char=, etc.
src/ChangeLog addition:
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* editfns.c:
* editfns.c (syms_of_editfns):
Implement #'char= in cl-extra.el, not here, accepting more than
two arguments as Common Lisp specifies.
lisp/ChangeLog addition:
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (define-char-comparisons):
Add type-checking when the various character-specific comparison
predicates are used; don't check types if
byte-compile-delete-errors is non-nil at compile-time, instead use
the corresponding built-in numeric byte codes.
diff -r 82e220b08ace -r 568ec109e73d lisp/ChangeLog
--- a/lisp/ChangeLog Sun Apr 24 01:01:34 2011 +0900
+++ b/lisp/ChangeLog Sat Apr 23 22:42:10 2011 +0100
@@ -1,3 +1,11 @@
+2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl-extra.el (define-char-comparisons):
+ Add type-checking when the various character-specific comparison
+ predicates are used; don't check types if
+ byte-compile-delete-errors is non-nil at compile-time, instead use
+ the corresponding built-in numeric byte codes.
+
2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
* font.el:
diff -r 82e220b08ace -r 568ec109e73d lisp/cl-extra.el
--- a/lisp/cl-extra.el Sun Apr 24 01:01:34 2011 +0900
+++ b/lisp/cl-extra.el Sat Apr 23 22:42:10 2011 +0100
@@ -690,13 +690,59 @@
(setq float-negative-epsilon (* x 2))))))
(cl-float-limits))
-;; No type-checking here, we should add it.
-(defalias 'char< '<)
-(defalias 'char>= '>=)
-(defalias 'char> '>)
-(defalias 'char<= '<=)
;;; Character functions.
+(macrolet
+ ((define-char-comparisons (&rest alist)
+ "Provide Common Lisp's character-specific comparison predicates.
+
+These throw errors if any arguments are non-characters, conflicting with
+typical emacs behavior. This is not the case if
+`byte-compile-delete-errors' is non-nil; see the documentation of that
+variable.
+
+This doesn't include the case-insensitive comparisons, and it probably
+should."
+ (let* ((functions (mapcar 'car alist))
+ (map (mapcar #'(lambda (symbol)
+ `(,symbol .
+ ,(intern (substring (symbol-name symbol)
+ (length "char")))))
+ functions)))
+ `(progn
+ (mapc
+ (function*
+ (lambda ((function . cl-unsafe-comparison))
+ (put function 'cl-unsafe-comparison cl-unsafe-comparison)
+ (put function 'cl-compiler-macro
+ #'(lambda (form &rest arguments)
+ (if byte-compile-delete-errors
+ (cons (get (car form) 'cl-unsafe-comparison)
+ (cdr form))
+ form)))))
+ ',map)
+ ,@(mapcar
+ (function*
+ (lambda ((function . documentation))
+ `(defun ,function (character &rest more-characters)
+ ,documentation
+ (check-type character character)
+ (check-type more-characters
+ (satisfies (lambda (list)
+ (every 'characterp list))))
+ (apply ',(cdr (assq function map))
+ character more-characters))))
+ alist)))))
+ (define-char-comparisons
+ (char= . "Return t if all character arguments are the same object.")
+ (char/= . "Return t if no two character arguments are the same object.")
+ (char< . "Return t if the character arguments monotonically increase.")
+ (char> . "Return t if the character arguments monotonically decrease.")
+ (char<= . "Return t if the character arguments are monotonically \
+nondecreasing.")
+ (char>= . "Return t if the character arguments are monotonically \
+nonincreasing.")))
+
(defun* digit-char-p (character &optional (radix 10))
"Return non-nil if CHARACTER represents a digit in base RADIX.
diff -r 82e220b08ace -r 568ec109e73d src/ChangeLog
--- a/src/ChangeLog Sun Apr 24 01:01:34 2011 +0900
+++ b/src/ChangeLog Sat Apr 23 22:42:10 2011 +0100
@@ -1,3 +1,10 @@
+2011-04-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * editfns.c:
+ * editfns.c (syms_of_editfns):
+ Implement #'char= in cl-extra.el, not here, accepting more than
+ two arguments as Common Lisp specifies.
+
2011-04-17 Jeff Sparkes <jsparkes(a)gmail.com>
* device-tty.c (tty_device_system_metrics): Fix compile issues for
diff -r 82e220b08ace -r 568ec109e73d src/editfns.c
--- a/src/editfns.c Sun Apr 24 01:01:34 2011 +0900
+++ b/src/editfns.c Sat Apr 23 22:42:10 2011 +0100
@@ -2260,18 +2260,6 @@
: x1 == x2)
? Qt : Qnil;
}
-
-DEFUN ("char=", Fchar_Equal, 2, 2, 0, /*
-Return t if two characters match, case is significant.
-Both arguments must be characters (i.e. NOT integers).
-*/
- (character1, character2))
-{
- CHECK_CHAR_COERCE_INT (character1);
- CHECK_CHAR_COERCE_INT (character2);
-
- return EQ (character1, character2) ? Qt : Qnil;
-}
#if 0 /* Undebugged FSFmacs code */
/* Transpose the markers in two regions of the current buffer, and
@@ -2397,7 +2385,6 @@
DEFSYMBOL (Quser_files_and_directories);
DEFSUBR (Fchar_equal);
- DEFSUBR (Fchar_Equal);
DEFSUBR (Fgoto_char);
DEFSUBR (Fstring_to_char);
DEFSUBR (Fchar_to_string);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches