February 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH] New pkg, latin-euro-standards, factored out from latin-unity. 19 years, 10 months

Aidan Kehoe

This is the first part of my work to get Mule-UCS interpreting ISO-8859-{13,14,15,16}. This part can’t break anyone else’s build, but Norbert will need to do some work to integrate the new package. 2005-02-08 Aidan Kehoe <kehoea(a)parhasard.net> * latin-euro-standards: New package, refactored from latin-unity. * latin-euro-latin10.el: * latin-euro-latin7.el: * latin-euro-latin8.el: * latin-euro-latin9.el: Refactored from latin-unity-latin{7,8,9,10}.el. * Makefile: * latin-euro-standards.el: * latin-euro-standards.texi: Created. Index: packages/package-compile.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/package-compile.el,v retrieving revision 1.65 diff -u -r1.65 package-compile.el --- packages/package-compile.el 2004/03/23 17:45:05 1.65 +++ packages/package-compile.el 2005/02/08 22:13:41 ＠＠ -205,6 +205,7 ＠＠ ;; mule-packages ("edict" . "mule-packages") ("egg-its" . "mule-packages") + ("latin-euro-standards" . "mule-packages") ("latin-unity" . "mule-packages") ("leim" . "mule-packages") ("locale" . "mule-packages") Index: packages/mule-packages/latin-euro-standards/Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null Tue Feb 8 23:07:32 2005 +++ Makefile Tue Feb 8 23:07:36 2005 ＠＠ -0,0 +1,36 ＠＠ +# Makefile for latin-euro-standards + +# 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 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. + +VERSION = 1.0 +# XEmacs CVS version is canonical. +AUTHOR_VERSION = $(VERSION) +MAINTAINER = Aidan Kehoe <aidan(a)xemacs.org> +PACKAGE = latin-euro-standards +PKG_TYPE = regular +REQUIRES = mule-base +CATEGORY = mule + +STANDARD_DOCS = t + +ELCS = latin-euro-latin7.elc latin-euro-latin8.elc latin-euro-latin9.elc \ + latin-euro-latin10.elc latin-euro-standards.elc + +EXTRA_DEPENDENCIES = $(ELCS) + +include ../../XEmacs.rules Index: packages/mule-packages/latin-euro-standards/_pkg.el =================================================================== RCS file: _pkg.el diff -N _pkg.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ _pkg.el Tue Feb 8 23:07:36 2005 ＠＠ -0,0 +1,5 ＠＠ +;;;###autoload +(package-provide 'latin-euro-standards + :version 1.0 +:author-version "1.0" + :type 'regular) Index: packages/mule-packages/latin-euro-standards/auto-autoloads.el =================================================================== RCS file: auto-autoloads.el diff -N auto-autoloads.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ auto-autoloads.el Tue Feb 8 23:07:37 2005 ＠＠ -0,0 +1,46 ＠＠ +;;; DO NOT MODIFY THIS FILE +(if (featurep 'latin-euro-standards-autoloads) (error "Already loaded")) + +;;;### (autoloads nil "_pkg" "latin-euro-standards/_pkg.el") + +(package-provide 'latin-euro-standards :version 1.0 :author-version "1.0" :type 'regular) + +;;;*** + +;;;### (autoloads nil "latin-euro-latin10" "latin-euro-standards/latin-euro-latin10.el") + +(unless (find-charset 'latin-iso8859-16) (make-charset 'latin-iso8859-16 "ISO8859-16 (Latin 10)" (append (if (emacs-version>= 21 4) '(short-name "Latin-10" long-name "ISO8859-16 (Latin 10)") nil) '(registry "iso8859-16" dimension 1 columns 1 chars 96 final ?f graphic 1 direction l2r))) (require 'cl) (load "cl-macs" nil t) (loop for c from 64 to 127 do (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w")) (mapc (lambda (c) (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w")) '(161 162 163 166 168 170 172 174 175 179 180 181 184 185 186 188 189 190 191))) + +(unless (find-coding-system 'iso-8859-16) (make-coding-system 'iso-8859-16 'iso2022 "MIME ISO-8859-16" '(charset-g0 ascii charset-g1 latin-iso8859-16 charset-g2 t charset-g3 t mnemonic "MIME/Ltn-10"))) + +(unless (assoc "Latin-10" language-info-alist) (defun setup-latin10-environment nil "Set up multilingual environment (MULE) for European Latin-10 users." (interactive) (set-language-environment "Latin-10")) (apply (function set-language-info-alist) (append (backquote ("Latin-10" ((charset ascii latin-iso8859-16) (coding-system iso-8859-16) (coding-priority iso-8859-16) (input-method . "latin-10-prefix") (sample-text \, (format "Hey, if you know Romanian, send sample encoded text (eg, using \"comma-below\"\ncharacters) to xemacs-beta(a)xemacs.org. Please use a MIME\napplication/octet-stream attachment if possible.")) (documentation . "This is a generic language environment for Latin-10 (ISO-8859-16). It\nsupports Romanian and most Western European languages.")))) (if (emacs-version>= 21 1 15) '(("European")) nil)))) + +;;;*** + +;;;### (autoloads nil "latin-euro-latin7" "latin-euro-standards/latin-euro-latin7.el") + +;;;*** + +;;;### (autoloads nil "latin-euro-latin8" "latin-euro-standards/latin-euro-latin8.el") + +(unless (find-charset 'latin-iso8859-14) (make-charset 'latin-iso8859-14 "ISO8859-14 (Latin 8)" (append (if (emacs-version>= 21 4) '(short-name "Latin-8" long-name "ISO8859-16 (Latin 8)") nil) '(registry "iso8859-14" dimension 1 columns 1 chars 96 final ?_ graphic 1 direction l2r))) (require 'cl) (load "cl-macs" nil t) (loop for c from 32 to 127 do (modify-syntax-entry (make-char 'latin-iso8859-14 c) "w")) (mapc (lambda (c) (modify-syntax-entry (make-char 'latin-iso8859-14 c) "_")) '(163 167 169 173 174 182))) + +(unless (find-coding-system 'iso-8859-14) (make-coding-system 'iso-8859-14 'iso2022 "MIME ISO-8859-14" '(charset-g0 ascii charset-g1 latin-iso8859-14 charset-g2 t charset-g3 t mnemonic "MIME/Ltn-8"))) + +(unless (assoc "Latin-8" language-info-alist) (defun setup-latin8-environment nil "Set up multilingual environment (MULE) for European Latin-8 users." (interactive) (set-language-environment "Latin-8")) (apply (function set-language-info-alist) (append (backquote ("Latin-8" ((charset ascii latin-iso8859-14) (coding-system iso-8859-14) (coding-priority iso-8859-14) (input-method . "latin-8-prefix") (sample-text \, (format "Hey, if you know a Celtic language, send sample encoded text (eg, using\n\"dot-above\" characters) to xemacs-beta(a)xemacs.org. Please use a MIME\napplication/octet-stream attachment if possible.")) (documentation . "This is a generic language environment for Latin-8 (ISO-8859-14). It\nsupports Celtic and most Western European languages.")))) (if (emacs-version>= 21 1 15) '(("European")) nil)))) + +;;;*** + +;;;### (autoloads nil "latin-euro-latin9" "latin-euro-standards/latin-euro-latin9.el") + +(unless (find-charset 'latin-iso8859-15) (make-charset 'latin-iso8859-15 "ISO8859-15 (Latin 9)" (append (if (emacs-version>= 21 4) '(short-name "Latin-9" long-name "ISO8859-15 (Latin 9)") nil) '(registry "iso8859-15" dimension 1 columns 1 chars 96 final ?b graphic 1 direction l2r))) (require 'cl) (load "cl-macs" nil t) (loop for c from 64 to 127 do (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w")) (mapc (lambda (c) (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w")) '(166 168 180 184 188 189 190)) (modify-syntax-entry (make-char 'latin-iso8859-15 32) "w") (modify-syntax-entry (make-char 'latin-iso8859-15 87) "_") (modify-syntax-entry (make-char 'latin-iso8859-15 119) "_")) + +(unless (find-coding-system 'iso-8859-15) (make-coding-system 'iso-8859-15 'iso2022 "MIME ISO-8859-15" '(charset-g0 ascii charset-g1 latin-iso8859-15 charset-g2 t charset-g3 t mnemonic "MIME/Ltn-9"))) + +(unless (assoc "Latin-9" language-info-alist) (defun setup-latin9-environment nil "Set up multilingual environment (MULE) for European Latin-9 users." (interactive) (set-language-environment "Latin-9")) (apply (function set-language-info-alist) (append (backquote ("Latin-9" ((charset ascii latin-iso8859-15) (coding-system iso-8859-15) (coding-priority iso-8859-15) (input-method . "latin-9-prefix") (sample-text \, (format "Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!, my %c0.02" (make-char 'latin-iso8859-15 124) (make-char 'latin-iso8859-15 95) (make-char 'latin-iso8859-15 33) (make-char 'latin-iso8859-15 36))) (documentation . "This is a generic language environment for Latin-9 (ISO-8859-15). It\nsupports the Euro and the following languages:\n Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,\n Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish.\nWe also have a German specific language environment \"German\".")))) (if (emacs-vers! ion>= 21 1 15) '(("European")) nil)))) + +(flet ((define-keysym-as-char (keysym character) (unless (lookup-key global-map (vector keysym)) (define-key global-map (vector keysym) (function self-insert-command))) (unless (get keysym 'ascii-character) (put keysym 'ascii-character character))) (foo (k o) (define-keysym-as-char k (make-char 'latin-iso8859-15 o)))) (foo 'EuroSign 36) (foo 'Scaron 38) (foo 'scaron 40) (foo 'Zcaron 52) (foo 'zcaron 56) (foo 'OE 60) (foo 'oe 61) (foo 'Ydiaeresis 62)) + +;;;*** + +(provide 'latin-euro-standards-autoloads) Index: packages/mule-packages/latin-euro-standards/custom-load.el =================================================================== RCS file: custom-load.el diff -N custom-load.el Index: packages/mule-packages/latin-euro-standards/latin-euro-latin10.el =================================================================== RCS file: latin-euro-latin10.el diff -N latin-euro-latin10.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ latin-euro-latin10.el Tue Feb 8 23:07:37 2005 ＠＠ -0,0 +1,108 ＠＠ +;;; latin-euro-latin10.el --- Define language environment + +;; Copyright (C) 2002 Free Software Foundation, Inc + +;; Author: Stephen J. Turnbull +;; Keywords: mule, charsets +;; Created: 2002 October 24 (as latin-unity-latin10.el) +;; Last-modified: 2005 February 7 + +;; 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 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. + + +;;; Commentary: + +;; Provides the latin-10 language environment, character set and coding +;; system. + +;;; Code: + +;; define ISO-8859-16 for XEmacs 21.4 and earlier +;;;###autoload +(unless (find-charset 'latin-iso8859-16) + ;; Create character set + (make-charset + 'latin-iso8859-16 "ISO8859-16 (Latin 10)" + ;; sheesh, what we do for backward compatibility + ;; #### this test and the similar one below probably should be + ;; reformulated to use condition-case + (append (if (emacs-version>= 21 4) + '(short-name "Latin-10" + long-name "ISO8859-16 (Latin 10)") + nil) + '(registry "iso8859-16" + dimension 1 + columns 1 + chars 96 + final ?f ; octet 06/06; cf ISO-IR 226 + graphic 1 + direction l2r))) + ;; For syntax of Latin-10 characters. + (require 'cl) + (load "cl-macs" nil t) + (loop for c from 64 to 127 + do (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w")) + (mapc (lambda (c) + (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w")) + '(#xA1 #xA2 #xA3 #xA6 #xA8 #xAA #xAC #xAE #xAF + #xB3 #xB4 #xB5 #xB8 #xB9 #xBA #xBC #xBD #xBE #xBF)) + ) + +;;;###autoload +(unless (find-coding-system 'iso-8859-16) + ;; Create coding system + (make-coding-system + 'iso-8859-16 'iso2022 "MIME ISO-8859-16" + '(charset-g0 ascii + charset-g1 latin-iso8859-16 + charset-g2 t ; grrr + charset-g3 t ; grrr + mnemonic "MIME/Ltn-10"))) + +;;;###autoload +(unless (assoc "Latin-10" language-info-alist) + (defun setup-latin10-environment () + "Set up multilingual environment (MULE) for European Latin-10 users." + (interactive) + (set-language-environment "Latin-10")) + + ;; sheesh, what we do for backward compatibility + (apply #'set-language-info-alist + (append `("Latin-10" + ((charset ascii latin-iso8859-16) + (coding-system iso-8859-16) + (coding-priority iso-8859-16) + (input-method . "latin-10-prefix") + (sample-text + . + ;; #### OK, who knows some Romanian? + ,(format "\ +Hey, if you know Romanian, send sample encoded text (eg, using \"comma-below\" +characters) to xemacs-beta(a)xemacs.org. Please use a MIME +application/octet-stream attachment if possible." + )) + (documentation . "\ +This is a generic language environment for Latin-10 (ISO-8859-16). It +supports Romanian and most Western European languages."))) + (if (emacs-version>= 21 1 15) + '(("European")) + nil)))) + +(provide 'latin-euro-latin10) + +;;; end of latin-euro-latin10.el Index: packages/mule-packages/latin-euro-standards/latin-euro-latin7.el =================================================================== RCS file: latin-euro-latin7.el diff -N latin-euro-latin7.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ latin-euro-latin7.el Tue Feb 8 23:07:37 2005 ＠＠ -0,0 +1,131 ＠＠ +;;; latin-euro-latin7.el --- Define language environment -*- coding: iso-2022-7 -*- + +;; Copyright (C) 2002 Free Software Foundation, Inc + +;; Author: Stephen J. Turnbull +;; Keywords: mule, charsets +;; Created: 2002 March 7 (as latin-unity-latin7.el) +;; Last-modified: 2005 February 7 + +;; 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 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. + + +;;; Commentary: + +;; Provides the latin-7 language environment, character set, and coding +;; system. + +;;; Code: + +;; define ISO-8859-13 for XEmacs 21.4 and earlier +; don't ;;;###autoload +(unless (find-charset 'latin-iso8859-13) + ;; Create character set + (make-charset + 'latin-iso8859-13 "ISO8859-13 (Latin 7)" + ;; sheesh, what we do for backward compatibility + ;; #### this test and the similar one below probably should be + ;; reformulated to use condition-case + (append (if (emacs-version>= 21 4) + '(short-name "Latin-7" + long-name "ISO8859-13 (Latin 7)") + nil) + '(registry "iso8859-13" + dimension 1 + columns 1 + chars 96 + final ?Y + graphic 1 + direction l2r))) + ;; For syntax of Latin-7 characters. + (require 'cl) + (load "cl-macs" nil t) ; howcum no #'provide? + (loop for c from 64 to 127 ; from ',A＠(B' to ',A(B' + do (modify-syntax-entry (make-char 'latin-iso8859-13 c) "w")) + (mapc (lambda (c) + (modify-syntax-entry (make-char 'latin-iso8859-13 c) "w")) + '(#xA8 #xAA #xAF #xB8 #xBA #xBF)) + + (modify-syntax-entry (make-char 'latin-iso8859-13 32) "w") ; no-break space + (modify-syntax-entry (make-char 'latin-iso8859-13 87) "_") ; multiply + (modify-syntax-entry (make-char 'latin-iso8859-13 119) "_") ; divide + (modify-syntax-entry (make-char 'latin-iso8859-13 127) ".") ; right squote + ) + +(defvar iso8859/13-case-table + (let ((table (copy-case-table (standard-case-table)))) + (mapc (lambda (pair) + (put-case-table-pair (make-char 'latin-iso8859-13 (car pair)) + (make-char 'latin-iso8859-13 (cdr pair)) + table)) + '((#xA8 . #xB8) (#xAA . #xBA) (#xAF . #xBF))) + (let ((i #xC0)) + (while (< i #xDF) + (unless (= i #xD7) + (put-case-table-pair (make-char 'latin-iso8859-13 i) + (make-char 'latin-iso8859-13 (+ i #x20)) + table)) + (setq i (1+ i)))) + table) + "Case table for Latin 7, right half of ISO 8859/13.") + +; don't ;;;###autoload +(unless (find-coding-system 'iso-8859-13) + ;; Create coding system + (make-coding-system + 'iso-8859-13 'iso2022 "MIME ISO-8859-13" + '(charset-g0 ascii + charset-g1 latin-iso8859-13 + charset-g2 t ; grrr + charset-g3 t ; grrr + mnemonic "MIME/Ltn-7"))) + +; don't ;;;###autoload +(unless (assoc "Latin-7" language-info-alist) + (defun setup-latin7-environment () + "Set up multilingual environment (MULE) for Baltic Rim Latin-7 users." + (interactive) + (set-language-environment "Latin-7")) + + ;; sheesh, what we do for backward compatibility + (apply #'set-language-info-alist + (append `("Latin-7" + ((charset ascii latin-iso8859-13) + (coding-system iso-8859-13) + (coding-priority iso-8859-13) + (input-method . "latin-7-prefix") + (sample-text + . + ,(format "\ +Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!" + ;; SMALL U WITH UMLAUT + (make-char 'latin-iso8859-13 #x7C) + ;; GERMAN SHARP S + (make-char 'latin-iso8859-13 #x5F) + ;; INVERTED EXCLAMATION MARK + (make-char 'latin-iso8859-13 #x21))) + (documentation . "\ +This is a generic language environment for Latin-7 (ISO-8859-13). It +supports the Baltic Rim languages."))) + (if (emacs-version>= 21 1 15) + '(("Baltic Rim")) + nil)))) + +(provide 'latin-euro-latin7) + +;;; end of latin-euro-latin7.el Index: packages/mule-packages/latin-euro-standards/latin-euro-latin8.el =================================================================== RCS file: latin-euro-latin8.el diff -N latin-euro-latin8.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ latin-euro-latin8.el Tue Feb 8 23:07:37 2005 ＠＠ -0,0 +1,106 ＠＠ +;;; latin-euro-latin8.el --- Define language environment + +;; Copyright (C) 2002 Free Software Foundation, Inc + +;; Author: Stephen J. Turnbull +;; Keywords: mule, charsets +;; Created: 2002 October 24 (as latin-unity-latin8.el) +;; Last-modified: 2005 February 7 + +;; 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 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. + + +;;; Commentary: + +;; Provides the latin-8 language environment, character set and coding +;; system. + +;;; Code: + +;; define ISO-8859-14 for XEmacs 21.4 and earlier +;;;###autoload +(unless (find-charset 'latin-iso8859-14) + ;; Create character set + (make-charset + 'latin-iso8859-14 "ISO8859-14 (Latin 8)" + ;; sheesh, what we do for backward compatibility + ;; #### this test and the similar one below probably should be + ;; reformulated to use condition-case + (append (if (emacs-version>= 21 4) + '(short-name "Latin-8" + long-name "ISO8859-16 (Latin 8)") + nil) + '(registry "iso8859-14" + dimension 1 + columns 1 + chars 96 + final ?_ ; octet 05/15; cf ISO-IR 199 + graphic 1 + direction l2r))) + ;; For syntax of Latin-8 characters. + (require 'cl) + (load "cl-macs" nil t) + (loop for c from 32 to 127 + do (modify-syntax-entry (make-char 'latin-iso8859-14 c) "w")) + (mapc (lambda (c) + (modify-syntax-entry (make-char 'latin-iso8859-14 c) "_")) + '(#xA3 #xA7 #xA9 #xAD #xAE #xB6)) + ) + +;;;###autoload +(unless (find-coding-system 'iso-8859-14) + ;; Create coding system + (make-coding-system + 'iso-8859-14 'iso2022 "MIME ISO-8859-14" + '(charset-g0 ascii + charset-g1 latin-iso8859-14 + charset-g2 t ; grrr + charset-g3 t ; grrr + mnemonic "MIME/Ltn-8"))) + +;;;###autoload +(unless (assoc "Latin-8" language-info-alist) + (defun setup-latin8-environment () + "Set up multilingual environment (MULE) for European Latin-8 users." + (interactive) + (set-language-environment "Latin-8")) + + ;; sheesh, what we do for backward compatibility + (apply #'set-language-info-alist + (append `("Latin-8" + ((charset ascii latin-iso8859-14) + (coding-system iso-8859-14) + (coding-priority iso-8859-14) + (input-method . "latin-8-prefix") + (sample-text + . + ;; #### OK, who knows some Gaelic? + ,(format "\ +Hey, if you know a Celtic language, send sample encoded text (eg, using +\"dot-above\" characters) to xemacs-beta(a)xemacs.org. Please use a MIME +application/octet-stream attachment if possible." + )) + (documentation . "\ +This is a generic language environment for Latin-8 (ISO-8859-14). It +supports Celtic and most Western European languages."))) + (if (emacs-version>= 21 1 15) + '(("European")) + nil)))) + +(provide 'latin-euro-latin8) +;;; end of latin-euro-latin8.el Index: packages/mule-packages/latin-euro-standards/latin-euro-latin9.el =================================================================== RCS file: latin-euro-latin9.el diff -N latin-euro-latin9.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ latin-euro-latin9.el Tue Feb 8 23:07:38 2005 ＠＠ -0,0 +1,139 ＠＠ +;;; latin-euro-latin9.el --- Define language environment + +;; Copyright (C) 2002, 2003 Free Software Foundation, Inc + +;; Author: Stephen J. Turnbull +;; Keywords: mule, charsets +;; Created: 2002 March 7 (as latin-unity-latin9.el) +;; Last-modified: 2005 February 7 + +;; 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 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. + + +;;; Commentary: + +;; Provides the latin-9 language environment, character set and coding +;; system. + +;;; Code: + +;; define ISO-8859-15 for XEmacs 21.4 and earlier +;;;###autoload +(unless (find-charset 'latin-iso8859-15) + ;; Create character set + (make-charset + 'latin-iso8859-15 "ISO8859-15 (Latin 9)" + ;; sheesh, what we do for backward compatibility + ;; #### this test and the similar one below probably should be + ;; reformulated to use condition-case + (append (if (emacs-version>= 21 4) + '(short-name "Latin-9" + long-name "ISO8859-15 (Latin 9)") + nil) + '(registry "iso8859-15" + dimension 1 + columns 1 + chars 96 + final ?b + graphic 1 + direction l2r))) + ;; For syntax of Latin-9 characters. + (require 'cl) + (load "cl-macs" nil t) ; howcum no #'provide? + (loop for c from 64 to 127 ; from 'À' to 'ÿ' + do (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w")) + (mapc (lambda (c) + (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w")) + '(#xA6 #xA8 #xB4 #xB8 #xBC #xBD #xBE)) + + (modify-syntax-entry (make-char 'latin-iso8859-15 32) "w") ; no-break space + (modify-syntax-entry (make-char 'latin-iso8859-15 87) "_") ; multiply + (modify-syntax-entry (make-char 'latin-iso8859-15 119) "_") ; divide + ) + +;;;###autoload +(unless (find-coding-system 'iso-8859-15) + ;; Create coding system + (make-coding-system + 'iso-8859-15 'iso2022 "MIME ISO-8859-15" + '(charset-g0 ascii + charset-g1 latin-iso8859-15 + charset-g2 t ; grrr + charset-g3 t ; grrr + mnemonic "MIME/Ltn-9"))) + +;;;###autoload +(unless (assoc "Latin-9" language-info-alist) + (defun setup-latin9-environment () + "Set up multilingual environment (MULE) for European Latin-9 users." + (interactive) + (set-language-environment "Latin-9")) + + ;; sheesh, what we do for backward compatibility + (apply #'set-language-info-alist + (append `("Latin-9" + ((charset ascii latin-iso8859-15) + (coding-system iso-8859-15) + (coding-priority iso-8859-15) + (input-method . "latin-9-prefix") + (sample-text + . + ,(format "\ +Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!, my %c0.02" + ;; SMALL U WITH UMLAUT + (make-char 'latin-iso8859-15 #x7C) + ;; GERMAN SHARP S + (make-char 'latin-iso8859-15 #x5F) + ;; INVERTED EXCLAMATION MARK + (make-char 'latin-iso8859-15 #x21) + ;; EURO SIGN + (make-char 'latin-iso8859-15 #x24))) + (documentation . "\ +This is a generic language environment for Latin-9 (ISO-8859-15). It +supports the Euro and the following languages: + Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic, + Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish. +We also have a German specific language environment \"German\"."))) + (if (emacs-version>= 21 1 15) + '(("European")) + nil)))) + +;; #### move these to a separate file for keysyms +;; These are all the ones not in Latin-1. + +;;;###autoload +(flet ((define-keysym-as-char (keysym character) + (unless (lookup-key global-map (vector keysym)) + (define-key global-map (vector keysym) #'self-insert-command)) + (unless (get keysym 'ascii-character) + (put keysym 'ascii-character character))) + (foo (k o) + (define-keysym-as-char k (make-char 'latin-iso8859-15 o)))) + (foo 'EuroSign #x24) + (foo 'Scaron #x26) + (foo 'scaron #x28) + (foo 'Zcaron #x34) + (foo 'zcaron #x38) + (foo 'OE #x3C) + (foo 'oe #x3D) + (foo 'Ydiaeresis #x3E)) + + +(provide 'latin-euro-latin9) + +;;; end of latin-euro-latin9.el Index: packages/mule-packages/latin-euro-standards/latin-euro-standards.el =================================================================== RCS file: latin-euro-standards.el diff -N latin-euro-standards.el --- /dev/null Tue Feb 8 23:07:32 2005 +++ latin-euro-standards.el Tue Feb 8 23:07:38 2005 ＠＠ -0,0 +1,53 ＠＠ +;;; latin-euro-standards.el -*- coding: iso-2022-7 -*- + +;; Copyright (C) 2002 Free Software Foundation, Inc + +;; Author: Aidan Kehoe +;; Keywords: mule, charsets +;; Created: 2005 February 7 +;; Last-modified: 2005 February 7 + +;; 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 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. + +;;; Commentary: + +;; The latin-euro-standards package provides coding systems, Mule character +;; sets, and language environments for the ISO-8859-13, -14, -15 and -16 +;; standard character encodings. Besides the Euro sign--whence the name of +;; this package--among these encodings we have single-width directed +;; quotation marks, handy if you're if you're in an environment where your +;; TTY has a UTF-8 coding system which interprets these characters as +;; single-width. + +;; These have been refactored out from the latin-unity package because it +;; turns out that, to have Mule-UCS support the Euro sign, the simplest +;; approach is to have these character sets available to it when +;; byte-compiling. Since latin-unity already depends on mule-ucs, and since +;; moving these character sets out from latin-unity and making it depend on +;; them is pretty practical, we've moved them here, to avoid a nasty +;; circular dependency. + +;;; Code: + +(require 'latin-euro-latin7) +(require 'latin-euro-latin8) +(require 'latin-euro-latin9) +(require 'latin-euro-latin10) + +(provide 'latin-euro-standards) +;; end of latin-euro-standards.el \ No newline at end of file Index: packages/mule-packages/latin-euro-standards/latin-euro-standards.texi =================================================================== RCS file: latin-euro-standards.texi diff -N latin-euro-standards.texi --- /dev/null Tue Feb 8 23:07:32 2005 +++ latin-euro-standards.texi Tue Feb 8 23:07:39 2005 ＠＠ -0,0 +1,286 ＠＠ +\input texinfo ＠c -*-texinfo-*- + +＠c Manual for the XEmacs latin-unity package. + +＠c ** #### something uses these headers, find out how and explain here +＠c %**start of header +＠setfilename latin-euro-standards.info +＠settitle Recent ISO 8859 character encoding standards +＠setchapternewpage odd +＠c %**end of header + +＠c Version values, for easy modification +＠set VERSION 1.0 +＠set CREATED Monday, February 7, 2005 +＠set UPDATED Monday, February 7, 2005 + +＠c ** Many people seem to prefer this footnote style. +＠footnotestyle end + +＠direntry +* latin-euro-standards:: Make recent ISO 8859 character +encodings available to XEmacs. +＠end direntry + +＠c ** It is often convenient to use a macro for names which have unusual +＠c ** spelling or formatting conventions. +＠c Macro to make formatting of the package name consistent. +＠macro pkgname +＠i{latin-euro-standards} +＠end macro + +＠c Copying permissions, et al +＠c Note that this whole section is repeated thrice, once for the Info +＠c version, once for TeX, and once for HTML. +＠c Note that if you combine this document with others' work, you may +＠c need to change the permissions statement. Make sure you do so in all +＠c three places. +＠c #### Probably not the right place for HTML. +＠html +This file is part of XEmacs. It documents the ＠pkgname{} package, +which ensures that wherever possible representations of all Latin +characters are drawn from the same 8-bit character set. + +Copyright ＠copyright{} 2005 Free Software Foundation, Inc. + +Permission is granted to make and distribute verbatim or modified copies +of this manual provided that the copyright notice above is preserved, +and at least one of the numbered paragraphs below up to the phrase "End +of permissions notice." is included, under the terms of any of the +licenses enumerated below. + +1. The GNU General Public License, version 2 or any later version +published by the Free Software Foundation, Inc. A copy of the GNU +General Public License was included with your copy of XEmacs. +Alternatively, you may request a copy from the Free Software Foundation, +Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +2. The license used for XEmacs documentation (see the file +man/xemacs/xemacs.texi distributed with XEmacs). + +3. The GNU Free Documentation License (available from the Free Software +Foundation at the address above). + +End of permissions notice. + +Because the XEmacs documentation license and the GNU Free Documentation +License are not free software licenses, and are mutually incompatible +with each other and with the GNU General Public License, it is desirable +that the permissions given here be preserved if possible. This normally +requires that you write fresh text for any additions or modifications to +this file, rather than copying code or comments from other sources. The +exceptions are if you are sole copyright holder for the other source, or +if you receive permission from the holders of the copyrights for the +other sources. + +That is, if you merge code or comments from a file licensed to you only +under the GNU General Public License you ＠emph{may not} distribute +under the documentation licenses or with a dual license; such a +combination may be distributed under the GNU General Public License +＠emph{only}. Similarly, if you copy text from a file licensed to you +only under the XEmacs documentation license or the GNU Free +Documentation License you may distribute the result ＠emph{only} under +the appropriate license. +＠end html + +＠ifinfo +This file is part of XEmacs. It documents the ＠pkgname{} package, +which ensures that wherever possible representations of all Latin +characters are drawn from the same 8-bit character set. + +Copyright ＠copyright{} 2005 Free Software Foundation, Inc. + +Permission is granted to make and distribute verbatim or modified copies +of this manual provided that the copyright notice above is preserved, +and at least one of the numbered paragraphs below up to the phrase "End +of permissions notice." is included, under the terms of any of the +licenses enumerated below. + +＠ignore +Permission is granted to process this file through TeX and print the +results, provided the printed document carries a copying permission +notice identical to this one except for the removal of this paragraph +(this paragraph not being relevant to the printed manual). + +＠end ignore +1. The GNU General Public License, version 2 or any later version +published by the Free Software Foundation, Inc. A copy of the GNU +General Public License was included with your copy of XEmacs. +Alternatively, you may request a copy from the Free Software Foundation, +Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +2. The license used for XEmacs documentation (see the file +man/xemacs/xemacs.texi distributed with XEmacs). + +3. The GNU Free Documentation License (available from the Free Software +Foundation at the address above). + +End of permissions notice. + +Because the XEmacs documentation license and the GNU Free Documentation +License are not free software licenses, and are mutually incompatible +with each other and with the GNU General Public License, it is desirable +that the permissions given here be preserved if possible. This normally +requires that you write fresh text for any additions or modifications to +this file, rather than copying code or comments from other sources. The +exceptions are if you are sole copyright holder for the other source, or +if you receive permission from the holders of the copyrights for the +other sources. + +That is, if you merge code or comments from a file licensed to you only +under the GNU General Public License you ＠emph{may not} distribute +under the documentation licenses or with a dual license; such a +combination may be distributed under the GNU General Public License +＠emph{only}. Similarly, if you copy text from a file licensed to you +only under the XEmacs documentation license or the GNU Free +Documentation License you may distribute the result ＠emph{only} under +the appropriate license. +＠end ifinfo + +＠tex + +＠titlepage +＠title Recent ISO 8859 character encodings +＠subtitle Last updated ＠value{UPDATED} + +＠author Aidan Kehoe +＠page + +This file is part of XEmacs. It documents the ＠pkgname{} package, +which ensures that wherever possible representations of all Latin +characters are drawn from the same 8-bit character set. + +Copyright ＠copyright{} 2005 Free Software Foundation, Inc. + +＠vskip 0pt plus 1filll +Permission is granted to make and distribute verbatim or modified copies +of this manual provided that the copyright notice above is preserved, +and at least one of the numbered paragraphs below up to the phrase "End +of permissions notice." is included, under the terms of any of the +licenses enumerated below. + +＠ignore +Permission is granted to process this file through TeX and print the +results, provided the printed document carries a copying permission +notice identical to this one except for the removal of this paragraph +(this paragraph not being relevant to the printed manual). + +＠end ignore +1. The GNU General Public License, version 2 or any later version +published by the Free Software Foundation, Inc. A copy of the GNU +General Public License was included with your copy of XEmacs. +Alternatively, you may request a copy from the Free Software Foundation, +Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +2. The license used for XEmacs documentation (see the file +man/xemacs/xemacs.texi distributed with XEmacs). + +3. The GNU Free Documentation License (available from the Free Software +Foundation at the address above). + +End of permissions notice. + +Because the XEmacs documentation license and the GNU Free Documentation +License are not free software licenses, and are mutually incompatible +with each other and with the GNU General Public License, it is desirable +that the permissions given here be preserved if possible. This normally +requires that you write fresh text for any additions or modifications to +this file, rather than copying code or comments from other sources. The +exceptions are if you are sole copyright holder for the other source, or +if you receive permission from the holders of the copyrights for the +other sources. + +That is, if you merge code or comments from a file licensed to you only +under the GNU General Public License you ＠emph{may not} distribute +under the documentation licenses or with a dual license; such a +combination may be distributed under the GNU General Public License +＠emph{only}. Similarly, if you copy text from a file licensed to you +only under the XEmacs documentation license or the GNU Free +Documentation License you may distribute the result ＠emph{only} under +the appropriate license. + +＠end titlepage +＠page + +＠end tex + +＠ifnottex +＠node Top, Copying, (dir), (dir) +＠top Recent ISO 8859 character encodings +＠end ifnottex + +This package provides several recent character encodings that have been +standardized by ISO, the international organization for standardization, +together with the associated Mule character sets and coding systems. + +It is intended to be used by the Mule-UCS (＠pxref{Top,,, mule-ucs, +Mule-UCS User Manual}) and Latin Unity (＠pxref{Top,,, latin-unity, +Latin Unity for Emacsen}) packages, and was, indeed, refactored out +from the former. + +Each file provides a language environment named, e.g. ＠samp{Latin-7}, a +coding system named ＠samp{iso-8859-13} (etc.) and a Mule character set +named ＠samp{latin-iso8859-13} (again, etc.). + +＠menu +* Copying:: ＠pkgname{} copying conditions. +* Standards:: Details of the relevant ISO character encodings. +＠end menu + +＠node Copying, Standards, Top, Top +＠chapter ＠pkgname{} Copying Conditions + +＠c ** CHECK THE COPYRIGHT DATE(S) AND HOLDER(S)! + +Copyright (C) 2005 Free Software Foundation, Inc. + +＠pkgname{} 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. + +＠pkgname{} 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. + +＠node Standards, , Copying, Top +＠chapter Standards + +＠section Latin 7 + +ISO 8859-13 dates from 1998, is the seventh Roman-alphabet standard of +the ISO-8859 series, and is intended for use along the Baltic rim. It +notably includes support for Latvian, something that wasn't available in +its predecessor in North European support, ISO-8859-6. + +＠section Latin 8 + +ISO 8859-14 gives full support to Welsh and Gaelic---note that modern +Irish Gaelic fits quite comfortably in ISO-8859-1, so in practical terms +this is more likely to be used for Welsh and Scots Gaelic, if even +then. It dates from 1998. + +＠section Latin 9 + +ISO 8859 15 dates from 1999, and is a mostly-compatible revision to ISO +8859 1, replacing the disused CURRENCY SIGN with U+20AC, EURO SIGN, and +making seven other changes to give better support to French and +Finnish. It's most often encountered in Western European Usenet groups, +in this author's experience. + +＠section Latin 10, or ISO 8859-10 + +This standard is from 2001, and gives better support to Romanian and +some other languages than was widely available at that point. It also +has single-width directed quotation marks, which are useful in a TTY +environment where using the corresponding CNS characters within XEmacs +would result in a miscalculation of column numbers and corresponding +second-guessing and minor derangement when directed quotation marks are +used. + Index: packages/mule-packages/latin-euro-standards/package-info.in =================================================================== RCS file: package-info.in diff -N package-info.in --- /dev/null Tue Feb 8 23:07:32 2005 +++ package-info.in Tue Feb 8 23:07:39 2005 ＠＠ -0,0 +1,20 ＠＠ +(locale + (standards-version 1.1 + version VERSION + author-version AUTHOR_VERSION + date DATE + build-date BUILD_DATE + maintainer MAINTAINER + distribution mule + priority high + category CATEGORY + dump nil + description + "MULE: Support for the Latin{7,8,9,10} character sets & coding systems." + filename FILENAME + md5sum MD5SUM + size SIZE + provides () + requires (REQUIRES) + type regular +)) -- “Ah come on now Ted, a Volkswagen with a mind of its own, driving all over the place and going mad, if that’s not scary I don’t know what is.”

1 participants
0 comments

[COMMIT] fix bug in find-menu-item-1 19 years, 10 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-02-07 Ben Wing <ben(a)xemacs.org> * menubar.el (find-menu-item-1): Forgot to rename this when find-menu-item-1 was extracted. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/menubar.el Index: lisp/menubar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/menubar.el,v retrieving revision 1.11 diff -u -p -r1.11 menubar.el --- lisp/menubar.el 2005/02/03 05:03:37 1.11 +++ lisp/menubar.el 2005/02/07 19:29:19 ＠＠ -202,7 +202,7 ＠＠ If some menu in the ITEM-PATH-LIST does (setq rest (cdr rest)))) (if (cdr item-path-list) (cond ((consp result) - (find-menu-item (cdr result) (cdr item-path-list) result)) + (find-menu-item-1 (cdr result) (cdr item-path-list) result)) (result (signal 'error (list (gettext "not a submenu") result))) (t

1 participants
0 comments

[COMMIT] Fix usage and further fix deleted files 19 years, 10 months

Ben Wing

NOTE: This patch has been committed. ben/ChangeLog addition: 2005-02-07 Ben Wing <ben(a)xemacs.org> * cvs-merge-diff: * cvs-merge-diff (Value): Update usage message. Always compute revision C because in the process of doing so we may discover that the local file has been killed, which will affect the computation of all files/revisions. xemacs-builds source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: ben/cvs-merge-diff Index: ben/cvs-merge-diff =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/cvs-merge-diff,v retrieving revision 1.3 diff -u -p -r1.3 cvs-merge-diff --- ben/cvs-merge-diff 2005/02/07 13:33:22 1.3 +++ ben/cvs-merge-diff 2005/02/07 13:53:52 ＠＠ -34,8 +34,8 ＠＠ my ($myName, $myPath) = fileparse ($0); require $myPath . "process-diff-args.pl"; -my $usage=" -Usage: $myName -from SPEC -to SPEC FILE +my $usage=<<EOF; +Usage: $myName -from SPEC -to SPEC [-debug] [DIFF-OPTIONS...] FILE Do a diff between various versions of a file, no weird tag syntax necessary. Quite useful after an update when a manual merge is in progress. Then ＠＠ -77,8 +77,35 ＠＠ is one of Z, A, B, C, or D or a number, Note that in the after-merge case, there is no fixed ordering between the common ancestor (A) and any of the numbered ancestors of (C) -- (A) could be the same as (1), (3), (8), or any other ancestor. -"; +Note that, in addition to `-from' and `-to', you can specify any option +that is valid to `diff' (or to `cvs diff', if both specs are Z, A, C or +a number, but for the most part the options are the same to both kinds of +diff). Particularly useful options are `-w', for ignoring all whitespace, +and `-p', for showing the C function that a change is within. + +You can also give the option `-debug' to show debugging information about +what is executed and which files and revisions are being computed. + +Probably the most useful way to run this file is to create shell functions +as follows: + +# `cthis FILE ...': when merging: what change did I make that led to the merge? + +function cthis() +{ + cvs-merge-diff -from a -to b "$＠" | more +} + +# `cthat FILE ...': when merging: what change did the other guy make that +# led to the merge? + +function cthat() +{ + cvs-merge-diff -from a -to c "$＠" | more +} +EOF + my ＠SAVE_ARGV = ＠ARGV; my %options; ＠＠ -138,22 +165,23 ＠＠ die "File $file unknown to CVS" if $cvss sub Value { return defined $_[0] ? $_[0] : "(undefined)"; } -if ($spec1 =~ /[bc]/i || $spec2 =~ /[bc]/i) { - ($killedthis, $filec) = ($cvsstatus =~ /Working revision:\s*(-?)([0-9.]+)$/m); - die "Can't parse working revision?" if !$filec; - - if ($killedthis) - { - $filea = $filec; - print "Revision A (common ancestor): " . Value($filea) . "\n" if $debug; - ($filec) = ($cvsstatus =~ /Repository revision:\s*([0-9.]+)\s/); +# We need to calculate this always because if the file is removed in the +# local workspace, this will affect all the other files. +($killedthis, $filec) = ($cvsstatus =~ /Working revision:\s*(-?)([0-9.]+)$/m); +die "Can't parse working revision?" if !$filec; + +if ($killedthis) + { + $filea = $filec; + print "Revision A (common ancestor): " . Value($filea) . "\n" if $debug; + ($filec) = ($cvsstatus =~ /Repository revision:\s*([0-9.]+)\s/); - die "Can't parse repository revision?" if !$filec; + die "Can't parse repository revision?" if !$filec; - print "Revision C (repository change merged in): " . Value($filec) . "\n" - if $debug; + print "Revision C (repository change merged in): " . Value($filec) . "\n" + if $debug; - print <<EOF; + print <<EOF; WARNING: File has been removed in this repository. Impossible to determine repository change merged into workspace. ＠＠ -167,12 +195,11 ＠＠ the merged revision), so diffs between t actual diffs and possibly some extra ones. EOF - } + } else - { - print "Revision C (repository change merged in): " . Value($filec) . "\n" - if $debug; - } + { + print "Revision C (repository change merged in): " . Value($filec) . "\n" + if $debug; } sub sort_dot_pound_files { -M "$path$a" <=> -M "$path$b"; }

1 participants
0 comments

[COMMIT] Update cvs-merge-diff to handle removed files in local ws 19 years, 10 months

Ben Wing

NOTE: This patch has been committed. ben/ChangeLog addition: 2005-02-07 Ben Wing <ben(a)xemacs.org> * cvs-merge-diff: * cvs-merge-diff (Value): * cvs-merge-diff (sort_dot_pound_files): * cvs-merge-diff (getfile): Add -debug option and output debug info if so. Correctly handle (as much as possible) the case where the repository file was removed in the local workspace and changed in the repository revisions being merged in. xemacs-builds source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: ben/cvs-merge-diff Index: ben/cvs-merge-diff =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/ben/cvs-merge-diff,v retrieving revision 1.2 diff -u -p -r1.2 cvs-merge-diff --- ben/cvs-merge-diff 2004/11/13 23:01:09 1.2 +++ ben/cvs-merge-diff 2005/02/07 13:30:26 ＠＠ -4,7 +4,7 ＠＠ eval 'exec perl -w -S $0 ${1+"$＠"}' # Po ### cvs-merge-diff --- Show the diff between various versions of a file -## Copyright (C) 2001, 2003, 2004 Ben Wing. +## Copyright (C) 2001, 2003, 2004, 2005 Ben Wing. ## Author: Ben Wing <ben(a)xemacs.org> ## Maintainer: Ben Wing <ben(a)xemacs.org> ＠＠ -82,13 +82,15 ＠＠ be the same as (1), (3), (8), or any oth my ＠SAVE_ARGV = ＠ARGV; my %options; -GetDiffOptions (\%options, 'from=s', 'to=s',); +GetDiffOptions (\%options, 'from=s', 'to=s', 'debug'); die $usage if $options{"help"}; +my $debug = $options{"debug"} || defined $ENV{VERBOSE} || defined $ENV{DEBUG}; + # extract options, but eliminate -from=X, -to=X -my ＠OPTIONS = grep (!/(-|--|\+)(from|to)=/, +my ＠OPTIONS = grep (!/(-|--|\+)(debug|from=|to=)/, ＠SAVE_ARGV[0 .. (＠SAVE_ARGV - ＠ARGV - 1)]); # eliminate -from X, -to X ＠＠ -115,9 +117,13 ＠＠ die $usage unless (defined ($spec1) and $spec1 =~ /^([zabcd]|([0-9]+))$/i and $spec2 =~ /^([zabcd]|([0-9]+))$/i); -my ($filez, $filea, $fileb, $filec, $filed, $filetmp); +my ($filez, $filea, $fileb, $filec, $filed, $filetmp, $killedthis); my $cvsstatus = `cvs status $file`; +print "`cvs status file`:\n$cvsstatus" if $debug; + +my ($name, $path) = fileparse ($file); + # To find the various versions: # B = look for files named .#FILE(.[0-9]+)+ and take the most recent one. ＠＠ -130,31 +136,80 ＠＠ my $cvsstatus = `cvs status $file`; die "File $file unknown to CVS" if $cvsstatus =~ /Status: Unknown/; -if ($spec1 =~ /c/i || $spec2 =~ /c/i) { - ($filec) = ($cvsstatus =~ /Working revision:\s*([0-9.]+)$/m); -} +sub Value { return defined $_[0] ? $_[0] : "(undefined)"; } + +if ($spec1 =~ /[bc]/i || $spec2 =~ /[bc]/i) { + ($killedthis, $filec) = ($cvsstatus =~ /Working revision:\s*(-?)([0-9.]+)$/m); + die "Can't parse working revision?" if !$filec; + + if ($killedthis) + { + $filea = $filec; + print "Revision A (common ancestor): " . Value($filea) . "\n" if $debug; + ($filec) = ($cvsstatus =~ /Repository revision:\s*([0-9.]+)\s/); + + die "Can't parse repository revision?" if !$filec; + + print "Revision C (repository change merged in): " . Value($filec) . "\n" + if $debug; + + print <<EOF; +WARNING: File has been removed in this repository. + +Impossible to determine repository change merged into workspace. +Assuming current repository revision $filec as merged revision. +It may also be impossible to determine the common ancestor, if +multiple merges have occurred in this workspace, since deletion +of the file. Assuming revision $filea as common ancestor. If +these values are wrong, then they err on the conservative side +(i.e. being too early for the common ancestor and too late for +the merged revision), so diffs between them will show all the +actual diffs and possibly some extra ones. + +EOF + } + else + { + print "Revision C (repository change merged in): " . Value($filec) . "\n" + if $debug; + } + } -sub sort_dot_pound_files { -M $a <=> -M $b; } +sub sort_dot_pound_files { -M "$path$a" <=> -M "$path$b"; } if ($spec1 =~ /[baz]/i || $spec2 =~ /[baz]/i) { - opendir DIR, "."; - my ＠files = grep /^\.\#$file(.[0-9]+)+/, readdir DIR; - closedir DIR; - ＠files = sort sort_dot_pound_files ＠files; - $fileb = $files[0]; - die "No merge in progress on $file" if !$fileb; - ($filea = $fileb) =~ s/^\.\#$file.//; + if (!$killedthis) + { + opendir DIR, $path; + my ＠files = grep /^\.\#$name(.[0-9]+)+/, readdir DIR; + closedir DIR; + print "Found dot-files: ＠files\n" if $debug; + ＠files = sort sort_dot_pound_files ＠files; + $fileb = $files[0]; + print "File B (pre-merge in this workspace): " . Value($fileb) . "\n" + if $debug; + die "No merge in progress on $file" if !$fileb; + ($filea = $fileb) =~ s/^\.\#$name.//; + print "Revision A (common ancestor): " . Value($filea) . "\n" if $debug; + $fileb = "$path$fileb"; + } + else + { + $fileb = "/dev/null"; + } ($filez = $filea) =~ s/(\d+)$/$1-1/e; if ($filez =~ /\.0$/) { $filez =~ s/\.\d+\.\d+$//; } + print "Revision Z (common ancestor's parent): " . Value($filez) . "\n" + if $debug; } sub getfile { return $filea if ($_[0] =~ /a/i); return $fileb if ($_[0] =~ /b/i); return $filec if ($_[0] =~ /c/i); - return $file if ($_[0] =~ /d/i); + return "$path$name" if ($_[0] =~ /d/i); return $filez if ($_[0] =~ /z/i); ($filetmp = $filec) =~ s/(\d+)$/$1-$_[0]/e, return $filetmp if ($_[0] =~ /[0-9]/i); ＠＠ -171,20 +226,26 ＠＠ my $spec2_is_rev = $spec2 =~ /([azc]|[0- if ($spec1_is_rev && $spec2_is_rev) { # We are diffing two repository revisions. + print "Executing: cvs diff -u ＠OPTIONS -r $file1 -r $file2 $file\n" if $debug; system "cvs diff -u ＠OPTIONS -r $file1 -r $file2 $file"; } elsif (!$spec1_is_rev && !$spec2_is_rev) { # We are diffing two real files. + print "Executing: diff -u ＠OPTIONS $file1 $file2\n" if $debug; system "diff -u ＠OPTIONS $file1 $file2"; } else { # We are diffing a repository revision and a real file. Fetch the # repository revision. - my $tmpfile = "/tmp/$file.$$"; + my $tmpfile = "/tmp/$name.$$"; if ($spec1_is_rev) { + print "Executing: cvs update -p -r $file1 $file > $tmpfile\n" if $debug; system "cvs update -p -r $file1 $file > $tmpfile"; + print "diff -u ＠OPTIONS $tmpfile $file2\n" if $debug; system "diff -u ＠OPTIONS $tmpfile $file2"; system "rm $tmpfile"; } else { + print "cvs update -p -r $file2 $file > $tmpfile\n" if $debug; system "cvs update -p -r $file2 $file > $tmpfile"; + print "diff -u ＠OPTIONS $file1 $tmpfile\n" if $debug; system "diff -u ＠OPTIONS $file1 $tmpfile"; system "rm $tmpfile"; }

1 participants
0 comments

[PATCH] Additions to the packages module. 19 years, 10 months

Malcolm Purvis

This patch adds the top level files that are currently not checked out when 'cvs checkout packages' is run. I'd like approval from someone with more experience with our CVS system before I commit this. Malcolm ChangeLog addition: 2005-02-06 Malcolm Purvis <malcolmp(a)xemacs.org> * modules: Add MAINTAINERS, Version.rules, iterate-1.rules and meta-iterate.targets to the package-ctlfile target. xemacs-CVSROOT source patch: Diff command: cvs -q diff -u Files affected: modules Index: modules =================================================================== RCS file: /pack/xemacscvs/CVSROOT/modules,v retrieving revision 1.25 diff -u -r1.25 modules --- modules 2004/03/17 21:22:06 1.25 +++ modules 2005/02/06 10:46:54 ＠＠ -191,7 +191,11 ＠＠ Makefile \ INSTALL \ NEWS.packages \ - .cvsignore + .cvsignore \ + MAINTAINERS \ + Version.rules \ + iterate-1.rules \ + meta-iterate.targets package-control -a \ package-ctlfile standard-Makefile \ -- Malcolm Purvis <malcolmp(a)xemacs.org>

2 participants
2 comments

Banned file: viupd02.com in mail from you 19 years, 10 months

MAILER DAEMON

BANNED FILENAME ALERT Your message to: WMorris(a)gensym.com was blocked by our Spam Firewall. The email you sent with the following subject has NOT BEEN DELIVERED: Subject: Delivery service mail An attachment in that mail was of a file type that the Spam Firewall is set to block.

1 participants
0 comments

[PATCH] defaults.el: record and revert changing XEmacs defaults across time 19 years, 10 months

Nix

On Thu, 03 Feb 2005, nix(a)esperi.org.uk mused: > On Thu, 3 Feb 2005, Aidan Kehoe stipulated: >> >> Ar an triÃº lÃ¡ de mÃ Feabhra, scrÃobh Nix: >> >> > In fact, it seems easy enough to me to have a `defaults.el' package that >> > keeps track of these things, so that an expert user who doesn't want any >> > changing defaults to disturb him (like most of us) could say >> > >> > (defaults-as-at "2005-01-20") >> >> I think thatâs an excellent idea. > > OK, I'll have a hack. It shouldn't be hard; the only vaguely nonportable > bit is to set the `standard-value' property if it's already set, so that > customize doesn't think the value has been changed from its > default. Have a package, everyone. I'm not sure where it belongs; if we want both core *and* the packages to be able to use it (which is kind of the point), we're in a bit of a bind. Can core reasonably require new packages when you upgrade it, or are they completely decoupled? (I seem to recall a change to auto-mode-alist construction in core that required new packages...) If the core can force new packages, it should probably go in xemacs-base... packages certainly can't require a new core, so it can't go in core if we want the packages to be able to use it without testing. (This sounds rather backwards to me, given the sort of things core contains; i.e., standard XEmacs things that the packages can use without testing, but I understand why it's the case.) Anyway, wherever it goes, here it is for people to laugh at. (Adjust the (not) in the heading comments if you actually accept it.) It's a bit more elaborate than I originally anticipated, because it occurred to me that site admins might not want *their* customizations blown away, and that you might want to go back to later defaults. All these things are now automatically tracked by keeping track of the current values of variables when `defaults-changed-at' and `defaults-as-at' run. An example: (defvar foo "bang up to date" "A variable with a default value that's changed repeatedly.") (defaults-changed-at "2005-01-10" 'foo "foo bar baz") (defaults-changed-at "2005-01-01" 'foo "ye olde value") (defaults-changed-at "2004-01-01" 'foo nil) foo -> "bang up to date" (defaults-as-at "2004-05-10") ; roll back into the far past foo -> "ye olde value" (defaults-as-at "2005-01-10") ; roll forward to past the last value foo -> "bang up to date" (defaults-as-at "2005-01-09") ; roll back a bit foo -> "foo bar baz" (defaults-as-at "2003-01-01") ; further back foo -> nil (setq foo "womble") ; change value by hand (defaults-as-at "2004-05-10") ; roll back again foo -> "womble" ; rolling no longer affects it (setq foo "ye olde value") ; back to the default (defaults-as-at "now") ; all the way forward to the present day foo -> "bang up to date" ; it's affected again ;; defaults.el --- Record and revert changing XEmacs defaults across time. ;;; Copyright (C) 2005 Nix <nix(a)esperi.org.uk>. ;; Author: Nix <nix(a)esperi.org.uk> ;; Created: 2005-02-04 ;; Keywords: lisp ;; Version: 0.1 ;; This file is (not) part of XEmacs. ;; This library 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. ;; It 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 this library; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Commentary: ;; This package implements a time-based history scheme for XEmacs defaults, ;; allowing users to keep the defaults used by their copy of XEmacs the same ;; as they historically were, no matter how much the XEmacs maintainers may ;; change those defaults. ;; In brief, every modification to an XEmacs default is followed by a call ;; to the function `defaults-changed-at', stating the date on which the ;; modification was made, and what the previous value was, as in this ;; hypothetical case: ;; ;;;###autoload ;; (defcustom pending-delete-mode t ;; "Non-nil when Pending Delete mode is enabled. In Pending Delete mode, typed ;; text replaces the selected region. Normally, you shouldn't modify this ;; variable by hand, but use the function `pending-delete-mode' instead. However, ;; you can customize the default value from the options menu (auto delete ;; selection)." ;;:type 'boolean ;;:set (lambda (symbol value) ;; (pending-delete-mode (or value 0))) ;;:initialize 'custom-initialize-default ;;:require 'pending-del ;;:group 'keyboard) ;; (defaults-changed-at "2005-02-04" 'pending-delete-mode nil) ;; The site administrator or local user can then call `defaults-as-at' to reset ;; the XEmacs defaults back to their values as of the earlier date: this restores ;; all variables which had been changed *after* the stated date; so ;; (defaults-as-at "2005-02-04") would not revert the value of ;; `pending-delete-mode' above, but (defaults-as-at "2005-02-03") would do so. ;; (defaults-as-at "now") reverts to the latest defaults. ;; If the value is subsequently changed from that in force when ;; `defaults-changed-at' is called, except by a call to `defaults-as-at', ;; it is not changed again by future calls to `defaults-as-at'. Site-local ;; changes to defaults are thus preserved --- alas, as are changes made by ;; Lisp code in packages. ;;; Todo: ;; Handle default variables which are deleted or have come to depend on the ;; values of other variables. ;;; Requirements: (require 'cl) ;;; User-customizable variables: ;;; Internal variables: (defvar defaults-history nil "The history of all changed defaults. An alist of elements of the form (DATE VARIABLE VALUE). The list is sorted into chronological order, if necessary, whenever `defaults-as-at' is called. DATE may be the string \"now\", indicating the latest default value, or a date in the form YYYY-MM-DD. Maintained by `defaults-changed-at'.") (defvar defaults-history-presently-sorted t "nil if the `defaults-history' list requires resorting before use.") (defvar defaults-default-values (make-hash-table :test 'eq) "A mapping from symbol name to default value. Used by `defaults-changed-at' to determine if default values have been changed by any means outside of its control: if they have, it leaves them alone on the basis that their values are no longer the default in any version of XEmacs.") (defvar defaults-unbound-symbol (make-symbol "unbound") "Used in the `defaults-default-values' hash to indicate an unbound variable.") (defvar defaults-unbound-property (make-symbol "unbound-property") "Used in various parts of the `defaults' package to differentiate between nil and unbound values in hash tables and property lists.") ;;; Utility functions: (defmacro defaults-define-alist-element-predicate (name predicate) "Generate a predicate named NAME that tests an alist according to PREDICATE. The resulting predicate is passed the car of two elements, and is suitable for passing to `sort', `:test' fnuctions, and such things." `(defun ,＠(list name) (first second) ,＠(list (concat "Returns t if FIRST and SECOND are equal under " "`" (symbol-name (eval predicate)) "'.")) (funcall (symbol-function ,predicate) (first first) (first second)))) (defun defaults-string-greater-p (first second) "Returns t if the string FIRST is greater than SECOND." (string-lessp second first)) (defaults-define-alist-element-predicate defaults-string-alist-greater-p 'defaults-string-greater-p) (defun defaults-known-for (variable) "Return t if a default is known for the variable VARIABLE. Will be true once `defaults-changed-at' has been called for VARIABLE." (not (eq (gethash variable defaults-default-values defaults-unbound-property) defaults-unbound-property))) (defun defaults-memoize-current-value (variable &optional value) "Remember the current value of VARIABLE in the `defaults-default-values' hash. If the variable does not presently exist, the `defaults-unbound-symbol' is remembered instead. Also remember it in the `defaults-history' hash if we've never been called before, against a date of \"now\"." (condition-case nil (progn (unless (defaults-known-for variable) (setq defaults-history (nconc defaults-history (list (list "now" variable (or value (symbol-value variable))))))) (puthash variable (or value (symbol-value variable)) defaults-default-values)) (void-variable (unless (defaults-known-for variable) (setq defaults-history (nconc defaults-history (list (list "now" variable defaults-unbound-symbol))))) (puthash variable defaults-unbound-symbol defaults-default-values)))) (defun defaults-variable-is-unchanged (variable) "Return t if the VARIABLE is unchanged from its default." (or ;; Either it is unbound, and it originally was unbound... (and (not (boundp variable)) (equal (gethash variable defaults-default-values) defaults-unbound-symbol)) ;; or it is bound and has a value, and it originally had that value. (and (boundp variable) (equal (gethash variable defaults-default-values) (symbol-value variable))))) ;;; User-callable functions: ;;;###autoload (defun defaults-changed-at (date variable old-value) "Record an old default value for VARIABLE, as of DATE. DATE should be formatted in ISO standard notation, `YYYY-MM-DD'. A call to this function should be introduced whenever a change is made to the default value of a variable in an XEmacs package or the XEmacs Lisp core. This enables users to revert to the values of defaults as they were at a particular date via calls to the `defaults-as-at' function. Example: ;; (defaults-changed-at \"2005-02-04\" 'pending-delete-mode nil) ;; ;;;###autoload ;; (defcustom pending-delete-mode t ;; [...]" ;; Remember the old value. (setq defaults-history (nconc defaults-history (list (list date variable old-value)))) ;; Remember the current value of the variable. (defaults-memoize-current-value variable) ;; The defaults history is no longer sorted. (setq defaults-history-presently-sorted nil)) ;; Not exactly efficient; may change variables' values repeatedly. ;; This isn't important, as this function is hardly a hot spot. ;;;###autoload (defun defaults-as-at (date) "Return XEmacs defaults to their values as of DATE. A DATE of \"now\" reverts to the latest defaults. The old values are derived from calls to the `defaults-changed-at' function." ;; Sort the list into chronological order, if necessary. ;; This ensures that newer, but still relevant, variable values will take ;; precedence over older ones. (unless defaults-history-presently-sorted (setq defaults-history (sort defaults-history 'defaults-string-alist-greater-p)) (setq defaults-history-presently-sorted t)) (let ((history-left defaults-history)) ;; Check each element... (while history-left (let* ((history-element (first history-left)) (el-date (first history-element)) (el-variable (second history-element)) (el-value (third history-element))) (setq history-left (rest history-left)) ;; ... to see if it's for a date in the future of the requested date, ;; and the variable's current value is unchanged from the default, ;; or the value is `now' and we're looking for `now'. (when (or (defaults-string-greater-p el-date date) (and (string= el-date date) (string= el-date "now"))) (when (defaults-variable-is-unchanged el-variable) ;; Reset the variable and re-put the `standard-value', if present, ;; for customize. (Does customize require anything else to be set?) (set el-variable el-value) (if (not (eq (get el-variable 'standard-value defaults-unbound-property) defaults-unbound-property)) (put el-variable 'standard-value (list el-value)))) ;; Remember the new default value. (defaults-memoize-current-value el-variable el-value)))))) (provide 'defaults) -- `Blish is clearly in love with language. Unfortunately, language dislikes him intensely.' --- Russ Allbery

1 participants
0 comments

[COMMIT 21.5] lread.c build problem in latest CVS 19 years, 10 months

Vin Shelton

As reported by Fabrice Popineau (see http://list-archive.xemacs.org/xemacs-beta/200502/msg00072.html), it's not legal to declare variables inline in C without braces. YMMY, some compilers are pickier than others. src/ChangeLog addition: 2005-02-04 Vin Shelton <acs(a)xemacs.org> * lread.c (check_if_suppressed, check_if_suppressed): EXTERNAL_LIST_LOOP_2 declares variables and must be enclosed in braces. Thanks, Fabrice. 21.5 source patch: Diff command: cvs -q diff -u Files affected: src/lread.c Index: src/lread.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v retrieving revision 1.74 diff -a -u -u -r1.74 lread.c --- src/lread.c 2005/02/03 07:11:27 1.74 +++ src/lread.c 2005/02/04 11:51:59 ＠＠ -358,26 +358,28 ＠＠ else if (len >= 3 && !qxestrcmp_ascii (nonreloc + len - 3, ".el")) len -= 3; - EXTERNAL_LIST_LOOP_2 (acons, Vload_suppress_alist) - { - if (CONSP (acons) && STRINGP (XCAR (acons))) - { - Lisp_Object name = XCAR (acons); - if (XSTRING_LENGTH (name) == len && - !memcmp (XSTRING_DATA (name), nonreloc, len)) - { - struct gcpro gcpro1; - Lisp_Object val; + { + EXTERNAL_LIST_LOOP_2 (acons, Vload_suppress_alist) + { + if (CONSP (acons) && STRINGP (XCAR (acons))) + { + Lisp_Object name = XCAR (acons); + if (XSTRING_LENGTH (name) == len && + !memcmp (XSTRING_DATA (name), nonreloc, len)) + { + struct gcpro gcpro1; + Lisp_Object val; - GCPRO1 (reloc); - val = Feval (XCDR (acons)); - UNGCPRO; + GCPRO1 (reloc); + val = Feval (XCDR (acons)); + UNGCPRO; - if (!NILP (val)) - return 1; - } - } - } + if (!NILP (val)) + return 1; + } + } + } + } return 0; }

1 participants
0 comments

[PATCH] Update regexp-opt 19 years, 10 months

Ben Wing

Scop, is the reason that you dropped the NON-SHY argument in regexp-opt-group because FSF did the same? lisp/ChangeLog addition: 2005-02-03 Ben Wing <ben(a)xemacs.org> * regexp-opt.el: * regexp-opt.el (regexp-opt): * regexp-opt.el (regexp-opt-not-groupie*-re): New. * regexp-opt.el (regexp-opt-group): Update to latest version in package tree. behavior source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/regexp-opt.el Index: lisp/regexp-opt.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/regexp-opt.el,v retrieving revision 1.1 diff -u -p -r1.1 regexp-opt.el --- lisp/regexp-opt.el 2005/02/03 07:11:21 1.1 +++ lisp/regexp-opt.el 2005/02/03 07:23:44 ＠＠ -6,9 +6,6 ＠＠ ;; Maintainer: FSF ;; Keywords: strings, regexps, extensions -;; Modified by Karl M. Hegbloom Sep. 1997 to support the new regexp syntax -;; with shy groups. (benchmarks pending) - ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify ＠＠ -26,9 +23,15 ＠＠ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +;;; Synched up with: GNU Emacs 21.3 + paren-in-char-set fix from CVS +;;; revision 1.25. Some implementation differences in +;;; regexp-opt-group and regexp-opt-charset but the APIs +;;; are compatible and should return compatible (if not +;;; exactly the same) regexps. + ;;; Commentary: -;; The "opt" in "regexp-opt" stands for "optim\$al\\|i\\(se\\|ze\$\\)". +;; The "opt" in "regexp-opt" stands for "optim\$?:al\\|i\\(?:se\\|ze\$\\)". ;; ;; This package generates a regexp from a given list of strings (which matches ;; one of those strings) so that the regexp generated by: ＠＠ -47,19 +50,7 ＠＠ ;; "save-current-buffer" "save-match-data" ;; "catch" "throw" "unwind-protect" "condition-case"))) ;; (concat "(" (regexp-opt strings t) "\\>")) -;; -;; => "(\$?:c\\(?:atch\\|ond\\(?:ition-case\$?\\)\\|if\\|let\\*?\\|prog[12n]\\|save-\$?:current-buffer\\|excursion\\|match-data\\|restriction\\|window-excursion\$\\|throw\\|un\$?:less\\|wind-protect\$\\|wh\$?:en\\|ile\$\\)\\>" -;; -;; -;; (let ((strings '("cond" "if" "when" "unless" "while" -;; "let" "let*" "progn" "prog1" "prog2" -;; "save-restriction" "save-excursion" "save-window-excursion" -;; "save-current-buffer" "save-match-data" -;; "catch" "throw" "unwind-protect" "condition-case"))) -;; (concat "(" (regexp-opt strings t t) "\\>")) -;; ^ -;; => "(\$c\\(atch\\|ond\\(ition-case\$?\\)\\|if\\|let\\*?\\|prog[12n]\\|save-\$current-buffer\\|excursion\\|match-data\\|restriction\\|window-excursion\$\\|throw\\|un\$less\\|wind-protect\$\\|wh\$en\\|ile\$\\)\\>" -;; +;; => "(\$c\\(?:atch\\|ond\\(?:ition-case\$?\\)\\|if\\|let\\*?\\|prog[12n]\\|save-\$?:current-buffer\\|excursion\\|match-data\\|restriction\\|window-excursion\$\\|throw\\|un\$?:less\\|wind-protect\$\\|wh\$?:en\\|ile\$\\)\\>" ;; ;; Searching using the above example `regexp-opt' regexp takes approximately ;; two-thirds of the time taken using the equivalent `mapconcat' regexp. ＠＠ -88,30 +79,29 ＠＠ ;; your code for such changes to have effect in your code. ;; Originally written for font-lock.el, from an idea from Stig's hl319.el, with -;; thanks for ideas also to Michael Ernst, Bob Glickstein and Dan Nicolaescu. -;; Please don't tell me that it doesn't produce optimal regexps; I know that -;; already. For example, the above explanation for the meaning of "opt" would -;; be more efficient as "optim\$al\\|i[sz]e\$", but this requires complex -;; forward looking. But (ideas or) code to improve things (are) is welcome. +;; thanks for ideas also to Michael Ernst, Bob Glickstein, Dan Nicolaescu and +;; Stefan Monnier. +;; No doubt `regexp-opt' doesn't always produce optimal regexps, so code, ideas +;; or any other information to improve things are welcome. +;; +;; One possible improvement would be to compile '("aa" "ab" "ba" "bb") +;; into "[ab][ab]" rather than "a[ab]\\|b[ab]". I'm not sure it's worth +;; it but if someone knows how to do it without going through too many +;; contortions, I'm all ears. ;;; Code: ;;;###autoload -(defun regexp-opt (strings &optional paren non-shy) +(defun regexp-opt (strings &optional paren) "Return a regexp to match a string in STRINGS. Each string should be unique in STRINGS and should not contain any regexps, quoted or not. If optional PAREN is non-nil, ensure that the returned regexp -is enclosed by at least one regexp match grouping construct. If optional -NON-SHY is non nil, the inner groupings will use \"\\\$ \\\$\" grouping, -rather than the default \"\\\$?: \\\$\" 'shy', or non-match-capturing groups. +is enclosed by at least one regexp grouping construct. The returned regexp is typically more efficient than the equivalent regexp: - (let ((open-paren (if PAREN \"\\\$\" \"\")) (close-paren (if PAREN \"\\\$\" \"\"))) - (concat open-paren (mapconcat 'regexp-quote STRINGS \"\\\\|\") close-paren)) + (let ((open (if PAREN \"\\\$\" \"\")) (close (if PAREN \"\\\$\" \"\"))) + (concat open (mapconcat 'regexp-quote STRINGS \"\\\\|\") close)) -but typically contains more regexp grouping constructs. -Use `regexp-opt-depth' to count them. - If PAREN is `words', then the resulting regexp is additionally surrounded by \\=\\< and \\>." (save-match-data ＠＠ -119,56 +109,66 ＠＠ by \\=\\< and \\>." (let* ((max-lisp-eval-depth (* 1024 1024)) (completion-ignore-case nil) (words (eq paren 'words)) + (open (cond ((stringp paren) paren) (paren "\$"))) (sorted-strings (sort (copy-sequence strings) 'string-lessp)) - (re (regexp-opt-group sorted-strings paren nil non-shy))) + (re (regexp-opt-group sorted-strings open))) (if words (concat "\\<" re "\\>") re)))) +(defconst regexp-opt-not-groupie*-re + (let* ((harmless-ch "[^\\\\[]") + (esc-pair-not-lp "\\\\[^(]") + (class-harmless-ch "[^][]") + (class-lb-harmless "[^]:]") + (class-lb-colon-maybe-charclass ":\\([a-z]+:]\$?") + (class-lb (concat "\\[\$" class-lb-harmless + "\\|" class-lb-colon-maybe-charclass "\$")) + (class + (concat "\\[^?]?" + "\$" class-harmless-ch + "\\|" class-lb "\$*" + "\\[?]")) ; special handling for bare [ at end of re + (shy-lp "\\\$\\?:")) + (concat "\\(" harmless-ch "\\|" esc-pair-not-lp + "\\|" class "\\|" shy-lp "\$*")) + "Matches any part of a regular expression EXCEPT for non-shy \"\\\$\"s") + ;;;###autoload -(defun regexp-opt-depth (regexp &optional count-shy-groups-too) +(defun regexp-opt-depth (regexp) "Return the depth of REGEXP. -This means the number of regexp grouping constructs (parenthesised -expressions) in REGEXP, not counting the \"\\\\(?: \\\$\" -non-match-capturing groups unless COUNT-SHY-GROUPS-TOO is non-nil. -See `regexp-opt'." +This means the number of regexp grouping constructs (parenthesised expressions) +in REGEXP." (save-match-data ;; Hack to signal an error if REGEXP does not have balanced parentheses. (string-match regexp "") ;; Count the number of open parentheses in REGEXP. - (let ((max (1- (length regexp))) - (count 0) start) - (while (string-match "\\\$" regexp start) - (setq start (match-end 0)) - (when (or count-shy-groups-too - (not (string= (substring regexp start (min (+ start 2) max)) "?:"))) - (setq count (1+ count)))) + (let ((count 0) start) + (while + (progn + (string-match regexp-opt-not-groupie*-re regexp start) + (setq start ( + (match-end 0) 2)) ; +2 for "\\(" after match-end. + (<= start (length regexp))) + (setq count (1+ count))) count))) ;;; Workhorse functions. (eval-when-compile (require 'cl)) - -(unless (fboundp 'make-bool-vector) - (defalias 'make-bool-vector 'make-vector)) -(defun regexp-opt-group (strings &optional paren lax non-shy) +(defun regexp-opt-group (strings &optional paren lax) "Return a regexp to match a string in STRINGS. If PAREN non-nil, output regexp parentheses around returned regexp. If LAX non-nil, don't output parentheses if it doesn't require them. -If NON-SHY non-nil, don't use \\(?: \$ shy groups, use match capturing ones. Merges keywords to avoid backtracking in Emacs' regexp matcher. -The basic idea is to find the shortest common prefix, remove it +The basic idea is to find the shortest common prefix or suffix, remove it and recurse. If there is no prefix, we divide the list into two so that $at least) one half will have at least a one-character common prefix. Also we delay the addition of grouping parenthesis as long as possible until we're sure we need them, and try to remove one-character sequences so we can use character sets rather than grouping parenthesis." - (let* ((open-group (cond - ((and paren non-shy) "\\(") - (paren "\\(?:") - (t ""))) + (let* ((open-group (cond ((stringp paren) paren) (paren "\\(?:") (t ""))) (close-group (if paren "\$" "")) (open-charset (if lax "" open-group)) (close-charset (if lax "" close-group))) ＠＠ -187,7 +187,7 ＠＠ so we can use character sets rather than ;; If there is an empty string, remove it and recurse on the rest. ((= (length (car strings)) 0) (concat open-charset - (regexp-opt-group (cdr strings) t t non-shy) "?" + (regexp-opt-group (cdr strings) t t) "?" close-charset)) ;; ;; If all are one-character strings, just return a character set. ＠＠ -208,7 +208,7 ＠＠ so we can use character sets rather than (let* ((length (length prefix)) (suffixes (mapcar (lambda (s) (substring s length)) strings))) (concat open-group - (regexp-quote prefix) (regexp-opt-group suffixes t t non-shy) + (regexp-quote prefix) (regexp-opt-group suffixes t t) close-group))) ;; ;; If there are several one-character strings, remove them and recurse ＠＠ -217,7 +217,7 ＠＠ so we can use character sets rather than (let ((rest (let ((completion-regexp-list '("^..+$"))) (all-completions "" (mapcar 'list strings))))) (concat open-group - (regexp-opt-group rest nil nil non-shy) "\\|" (regexp-opt-charset letters) + (regexp-opt-group rest) "\\|" (regexp-opt-charset letters) close-group))) ;; ;; Otherwise, divide the list into those that start with a particular ＠＠ -227,7 +227,7 ＠＠ so we can use character sets rather than (half1 (all-completions char (mapcar 'list strings))) (half2 (nthcdr (length half1) strings))) (concat open-group - (regexp-opt-group half1 nil nil non-shy) "\\|" (regexp-opt-group half2 nil nil non-shy) + (regexp-opt-group half1) "\\|" (regexp-opt-group half2) close-group))))))))) (defun regexp-opt-charset (chars)

4 participants
3 comments

[COMMIT] fix older autoload interface 19 years, 10 months

Ben Wing

NOTE: This patch has been committed. lisp/ChangeLog addition: 2005-02-03 Ben Wing <ben(a)xemacs.org> * autoload.el (batch-update-autoloads): Use correct parameters when invoking older interface. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: lisp/autoload.el Index: lisp/autoload.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/autoload.el,v retrieving revision 1.21 diff -u -p -r1.21 autoload.el --- lisp/autoload.el 2005/02/03 07:11:20 1.21 +++ lisp/autoload.el 2005/02/04 03:56:57 ＠＠ -1154,7 +1154,7 ＠＠ The directory to which the auto-autoload on the command line." (unless noninteractive (error "batch-update-autoloads is to be used only with -batch")) - (update-autoload-files command-line-args-left generated-autoload-file) + (update-autoload-files command-line-args-left autoload-feature-prefix nil t) (kill-emacs 0)) ;; Declare obsolescence

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches February 2005