# HG changeset patch # User ben # Date 1016275159 0 # Node ID 2923009caf474804b1588540e7a1ce806ef0d10f # Parent e65d9cf16707b388e902e11cc436cbb0b0bd782c [xemacs-hg @ 2002-03-16 10:38:59 by ben] cm.c, file-coding.c: fix warnings. .cvsignore: Those pesky *.tmp files. mule\arabic.el, mule\canna-leim.el, mule\china-util.el, mule\chinese.el, mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\devanagari.el, mule\english.el, mule\ethio-util.el, mule\ethiopic.el, mule\european.el, mule\greek.el, mule\hebrew.el, mule\indian.el, mule\japan-util.el, mule\japanese.el, mule\korea-util.el, mule\korean.el, mule\lao-util.el, mule\lao.el, mule\misc-lang.el, mule\mule-charset.el, mule\mule-cmds.el, mule\thai-util.el, mule\thai.el, mule\tibet-util.el, mule\tibetan.el, mule\viet-util.el, mule\vietnamese.el, unicode.el: Fix lots of warnings. Sync up some files to FSF 21.1. Copy over all charset definitions from FSF 21.1, convert them to our format, and stick them in the relevant files. Eventually we will actually be able to dump these files (though they may not quite work). autoload.el: Support defun*, defmacro*. mule/mule-composite.el, mule/mule-composite-stub.el: New file, stubs for nonexistent composition funs/vars. mule/viet-chars.el, dumped-lisp.el: Account for these changes. font.el, mouse.el, msw-font-menu.el, printer.el, startup.el: fix warnings. diff -r e65d9cf16707 -r 2923009caf47 lib-src/ChangeLog --- a/lib-src/ChangeLog Fri Mar 15 11:00:56 2002 +0000 +++ b/lib-src/ChangeLog Sat Mar 16 10:39:19 2002 +0000 @@ -1,3 +1,10 @@ +2002-03-14 Jonathan Harris + + * make-mswin-unicode.pl: Pick up location of include files from + MSVCDIR environment variable. + Add --includedir command-line option. + Remove 'dir' command. + 2002-03-15 Ben Wing * Makefile.in.in (blessmail): diff -r e65d9cf16707 -r 2923009caf47 lib-src/make-mswin-unicode.pl --- a/lib-src/make-mswin-unicode.pl Fri Mar 15 11:00:56 2002 +0000 +++ b/lib-src/make-mswin-unicode.pl Sat Mar 16 10:39:19 2002 +0000 @@ -56,7 +56,6 @@ occur in a single file. Processed lines begin with a command word, followed by one or more args (no quotes are necessary for spaces): -dir sets the directory for include files. file specifies a file to start reading from. yes indicates a function to be automatically Unicode-encapsulated. (All parameters either need no special processing or are LPTSTR or @@ -88,6 +87,7 @@ \%options, 'c-output=s', 'h-output=s', + 'includedir=s', 'help', ); @@ -96,7 +96,15 @@ my $in_script; my $slurp; -my ($cout, $hout) = ($options{"c-output"}, $options{"h-output"}); +my ($cout, $hout, $dir) = ($options{"c-output"}, + $options{"h-output"}, + $options{"includedir"}); +if (!$dir) + { + $dir=$ENV{"MSVCDIR"} or die "Environment variable MSVCDIR undefined - run vcvars32.bat from your MSVC installation"; + $dir.='/include'; + } +die "Can't find MSVC include files in \"$dir\"" unless (-f $dir.'/WINDOWS.H'); open (COUT, ">$cout") or die "Can't open C output file $cout: $!"; open (HOUT, ">$hout") or die "Can't open C output file $hout: $!"; @@ -144,14 +152,10 @@ { next if (m!^//!); next if (/^[ \t]*$/); - if (/(dir|file|yes|soon|no|skip|split|begin-bracket|end-bracket)(?: (.*))?/) + if (/(file|yes|soon|no|skip|split|begin-bracket|end-bracket)(?: (.*))?/) { my ($command, $parms) = ($1, $2); - if ($command eq "dir") - { - chdir $parms or die "Can't chdir to $parms: $!"; - } - elsif ($command eq "file") + if ($command eq "file") { $current_file = $parms; } @@ -400,7 +404,7 @@ sub FileContents { local $/ = undef; - open (FILE, "< $_[0]") or die "$_[0]: $!"; + open (FILE, "< $dir/$_[0]") or die "$dir/$_[0]: $!"; my $retval = scalar ; # must hack away CRLF junk. $retval =~ s/\r\n/\n/g; diff -r e65d9cf16707 -r 2923009caf47 lisp/ChangeLog --- a/lisp/ChangeLog Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/ChangeLog Sat Mar 16 10:39:19 2002 +0000 @@ -1,3 +1,90 @@ +2002-03-16 Ben Wing + + * mule\arabic.el: + * mule\arabic.el (arabic-1-column): + * mule\arabic.el (arabic-2-column): + * mule\canna-leim.el: + * mule\canna-leim.el (canna:*japanese-mode*): + * mule\canna-leim.el (canna-inactivate): + * mule\china-util.el: + * mule\chinese.el: + * mule\chinese.el (chinese-sisheng): + * mule\cyril-util.el: + * mule\cyril-util.el (cyrillic-encode-koi8-r-char): + * mule\cyril-util.el (cyrillic-encode-alternativnyj-char): + * mule\cyrillic.el: + * mule\devan-util.el: + * mule\devanagari.el: + * mule\english.el: + * mule\ethio-util.el: + * mule\ethio-util.el (ethio-modify-vowel): + * mule\ethiopic.el: + * mule\european.el: + * mule\greek.el: + * mule\hebrew.el: + * mule\indian.el: + * mule\japan-util.el: + * mule\japan-util.el (japanese-symbol-table): + * mule\japan-util.el (japanese-hankaku): + * mule\japan-util.el (japanese-hankaku-region): + * mule\japanese.el: + * mule\korea-util.el: + * mule\korean.el: + * mule\lao-util.el: + * mule\lao.el: + * mule\lao.el (lao): + * mule\misc-lang.el: + * mule\mule-charset.el: + * mule\mule-cmds.el (set-locale-for-language-environment): + * mule\mule-cmds.el (set-language-environment-coding-systems): + * mule\mule-cmds.el (init-locale-at-early-startup): + * mule\thai-util.el: + * mule\thai.el: + * mule\tibet-util.el: + * mule\tibetan.el: + * mule\tibetan.el (tibetan-1-column): + * mule\tibetan.el (tibetan): + * mule\viet-util.el: + * mule\viet-util.el (viet-encode-viscii-char): + * mule\vietnamese.el: + * mule\vietnamese.el (?v): New. + * mule\vietnamese.el (viet-viscii-decode-table): + * unicode.el: + Fix lots of warnings. Sync up some files to FSF 21.1. Copy over + all charset definitions from FSF 21.1, convert them to our format, + and stick them in the relevant files. Eventually we will actually + be able to dump these files (though they may not quite work). + +2002-03-16 Ben Wing + + * autoload.el: + * autoload.el (make-autoload): + * autoload.el (generate-autoload-cookie): + * autoload.el (defun*): + Support defun*, defmacro*. + + * mule/mule-composite.el: New file, from FSF. + * mule/mule-composite-stub.el: New file, stubs for nonexistent + composition funs/vars. + * mule/viet-chars.el: Deleted, moved into vietnamese.el. + * dumped-lisp.el (preloaded-file-list): + Account for these changes. + + * font.el (mswindows-font-create-object): + * mouse.el (mouse-begin-drag-n-drop): + * msw-font-menu.el (mswindows-font-regexp): + * printer.el: + * printer.el (generic-page-setup): + * printer.el (generic-print-region): + * startup.el (early-error-handler): + fix warnings. + +2002-03-16 IKEYAMA Tomonori + + * unicode.el (load-unicode-tables): Make table for latin-jisx0201. + * mule/mule-msw-init.el: Character sets to codepage mapping + change. Add japanese-jisx0212, delete japanese-jisx0208-1978. + 2002-03-15 Ben Wing * mule\mule-charset.el: diff -r e65d9cf16707 -r 2923009caf47 lisp/autoload.el --- a/lisp/autoload.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/autoload.el Sat Mar 16 10:39:19 2002 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. -;; Copyright (C) 1996, 2000 Ben Wing. +;; Copyright (C) 1996, 2000, 2002 Ben Wing. ;; Author: Roland McGrath ;; Keywords: maint @@ -43,8 +43,9 @@ "Turn FORM, a defun or defmacro, into an autoload for source file FILE. Returns nil if FORM is not a defun, define-skeleton or defmacro." (let ((car (car-safe form))) - (if (memq car '(defun define-skeleton defmacro define-derived-mode)) - (let ((macrop (eq car 'defmacro)) + (if (memq car '(defun defun* define-skeleton defmacro defmacro* + define-derived-mode)) + (let ((macrop (memq car '(defmacro defmacro*))) name doc) (setq form (cdr form) name (car form) @@ -66,8 +67,6 @@ (if macrop (list 'quote 'macro) nil))) nil))) -(put 'define-skeleton 'doc-string-elt 3) - (defvar generate-autoload-cookie ";;;###autoload" "Magic comment indicating the following form should be autoloaded. Used by `update-file-autoloads'. This string should be @@ -113,9 +112,12 @@ (put 'autoload 'doc-string-elt 3) (put 'defun 'doc-string-elt 3) +(put 'defun* 'doc-string-elt 3) (put 'defvar 'doc-string-elt 3) (put 'defconst 'doc-string-elt 3) (put 'defmacro 'doc-string-elt 3) +(put 'defmacro* 'doc-string-elt 3) +(put 'define-skeleton 'doc-string-elt 3) (defun autoload-trim-file-name (file) "Returns a relative pathname of FILE including the last directory." diff -r e65d9cf16707 -r 2923009caf47 lisp/dumped-lisp.el --- a/lisp/dumped-lisp.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/dumped-lisp.el Sat Mar 16 10:39:19 2002 +0000 @@ -123,6 +123,8 @@ (when-feature mule "mule-charset") (when-feature mule "mule-cmds") ; to sync with Emacs 20.1 (when-feature mule "mule-coding") + (when-feature mule "mule-composite-stub") + (when-feature mule "mule-composite") ;; may initialize coding systems (when-feature (and mule x) "mule-x-init") (when-feature (and mule tty) "mule-tty-init") @@ -163,7 +165,6 @@ (when-feature mule "misc-lang") (when-feature mule "thai-xtis-chars") (when-feature mule "mule/thai-xtis") ; overloaded in leim/quail - (when-feature mule "viet-chars") (when-feature mule "vietnamese") ;; Specialized language support diff -r e65d9cf16707 -r 2923009caf47 lisp/font.el --- a/lisp/font.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/font.el Sat Mar 16 10:39:19 2002 +0000 @@ -838,7 +838,7 @@ (defun mswindows-font-create-object (fontname &optional device) "Return a font descriptor object for FONTNAME, appropriate for MS Windows devices." (let ((case-fold-search t) - (font (mswindows-font-canonicalize-name fontname))) + (font (declare-fboundp (mswindows-font-canonicalize-name fontname)))) (if (or (not (stringp font)) (not (string-match font-mswindows-font-regexp font))) (make-font) diff -r e65d9cf16707 -r 2923009caf47 lisp/mouse.el --- a/lisp/mouse.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mouse.el Sat Mar 16 10:39:19 2002 +0000 @@ -222,16 +222,18 @@ ;; #### barely implemented. (when (click-inside-selection-p event) (cond ((featurep 'offix) - (offix-start-drag-region - event - (extent-start-position zmacs-region-extent) - (extent-end-position zmacs-region-extent)) + (declare-fboundp + (offix-start-drag-region + event + (extent-start-position zmacs-region-extent) + (extent-end-position zmacs-region-extent))) t) ((featurep 'cde) ;; should also work with CDE - (cde-start-drag-region event - (extent-start-position zmacs-region-extent) - (extent-end-position zmacs-region-extent)) + (declare-fboundp + (cde-start-drag-region event + (extent-start-position zmacs-region-extent) + (extent-end-position zmacs-region-extent))) t)))) (defun mouse-eval-sexp (click force-window) diff -r e65d9cf16707 -r 2923009caf47 lisp/msw-font-menu.el --- a/lisp/msw-font-menu.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/msw-font-menu.el Sat Mar 16 10:39:19 2002 +0000 @@ -38,6 +38,7 @@ ;;; "*If non-nil, then the font menu will only show fixed-width fonts.") (require 'font-menu) +(globally-declare-boundp 'mswindows-font-regexp) (defvar mswindows-font-menu-registry-encoding nil "Registry and encoding to use with font menu fonts.") diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/arabic.el --- a/lisp/mule/arabic.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/arabic.el Sat Mar 16 10:39:19 2002 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 1992,93,94,95 Free Software Foundation, Inc. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. +;; Copyright (C) 2002 Ben Wing. ;; This file is part of XEmacs. @@ -23,36 +24,65 @@ ;;; Commentary: -;; Synched up with: Mule 2.3. +;; Synched up with: Mule 2.3, FSF 21.1. ;;; Code: -;; Three character sets for Arabic -(make-charset 'arabic-digit "Arabic digits" - '(registry "MuleArabic-0" - dimension 1 +; (make-charset 'arabic-iso8859-6 +; "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" +; '(dimension +; 1 +; registry "ISO8859-6" +; chars 96 +; columns 1 +; direction r2l +; final ?G +; graphic 1 +; short-name "RHP of ISO8859/6" +; long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127" +; )) + +;; For Arabic, we need three different types of character sets. +;; Digits are of direction left-to-right and of width 1-column. +;; Others are of direction right-to-left and of width 1-column or +;; 2-column. +(make-charset 'arabic-digit "Arabic digit" + '(dimension + 1 + registry "MuleArabic-0" chars 94 + columns 1 + direction l2r final ?2 graphic 0 - direction l2r + short-name "Arabic digit" + long-name "Arabic digit" )) (make-charset 'arabic-1-column "Arabic 1-column" - '(registry "MuleArabic-1" - dimension 1 + '(dimension + 1 + registry "MuleArabic-1" chars 94 + columns 1 + direction r2l final ?3 graphic 0 - direction r2l + short-name "Arabic 1-col" + long-name "Arabic 1-column" )) (make-charset 'arabic-2-column "Arabic 2-column" - '(registry "MuleArabic-2" - dimension 1 + '(dimension + 1 + registry "MuleArabic-2" chars 94 + columns 2 + direction r2l final ?4 graphic 0 - direction r2l + short-name "Arabic 2-col" + long-name "Arabic 2-column" )) (make-coding-system 'iso-8859-6 'iso2022 diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/canna-leim.el --- a/lisp/mule/canna-leim.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/canna-leim.el Sat Mar 16 10:39:19 2002 +0000 @@ -32,6 +32,9 @@ ;; ;; Add pointers to Canna documentation in LEIM format +(globally-declare-boundp 'canna:*japanese-mode*) +(globally-declare-fboundp '(canna canna-toggle-japanese-mode)) + (defun canna-activate (&optional name) (if (featurep 'CANNA) (require 'canna) @@ -43,7 +46,7 @@ (canna-toggle-japanese-mode)) (defun canna-inactivate () - (cond (canna:*japanese-mode* (canna-toggle-japanese-mode))) ) + (cond (canna:*japanese-mode* (canna-toggle-japanese-mode)))) (register-input-method 'japanese-canna "Japanese" diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/china-util.el --- a/lisp/mule/china-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/china-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -22,7 +22,9 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/china-util.el). +;;; Synched up with: Emacs 21.1 (language/china-util.el). + +;;; Commentary: ;;; Code: diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/chinese.el --- a/lisp/mule/chinese.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/chinese.el Sat Mar 16 10:39:19 2002 +0000 @@ -34,6 +34,76 @@ (eval-when-compile (require 'china-util)) +; (make-charset 'chinese-gb2312 +; "GB2312 Chinese simplified: ISO-IR-58" +; '(dimension +; 2 +; registry "GB2312.1980" +; chars 94 +; columns 2 +; direction l2r +; final ?A +; graphic 0 +; short-name "GB2312" +; long-name "GB2312: ISO-IR-58" +; )) + +; (make-charset 'chinese-cns11643-1 +; "CNS11643 Plane 1 Chinese traditional: ISO-IR-171" +; '(dimension +; 2 +; registry "CNS11643.1992-1" +; chars 94 +; columns 2 +; direction l2r +; final ?G +; graphic 0 +; short-name "CNS11643-1" +; long-name "CNS11643-1 (Chinese traditional): ISO-IR-171" +; )) + +; (make-charset 'chinese-cns11643-2 +; "CNS11643 Plane 2 Chinese traditional: ISO-IR-172" +; '(dimension +; 2 +; registry "CNS11643.1992-2" +; chars 94 +; columns 2 +; direction l2r +; final ?H +; graphic 0 +; short-name "CNS11643-2" +; long-name "CNS11643-2 (Chinese traditional): ISO-IR-172" +; )) + +; (make-charset 'chinese-big5-1 +; "Frequently used part (A141-C67F) of Big5 (Chinese traditional)" +; '(dimension +; 2 +; registry "Big5" +; chars 94 +; columns 2 +; direction l2r +; final ?0 +; graphic 0 +; short-name "Big5 (Level-1)" +; long-name "Big5 (Level-1) A141-C67F" +; )) + +; (make-charset 'chinese-big5-2 +; "Less frequently used part (C940-FEFE) of Big5 (Chinese traditional)" +; '(dimension +; 2 +; registry "Big5" +; chars 94 +; columns 2 +; direction l2r +; final ?1 +; graphic 0 +; short-name "Big5 (Level-2)" +; long-name "Big5 (Level-2) C940-FEFE" +; )) + ;; Syntax of Chinese characters. (modify-syntax-entry 'chinese-gb2312 "w") (loop for row in '(33 34 41) @@ -48,6 +118,23 @@ (modify-syntax-entry 'chinese-big5-1 "w") (modify-syntax-entry 'chinese-big5-2 "w") +; ;; Chinese CNS11643 Plane3 thru Plane7. Although these are official +; ;; character sets, the use is rare and don't have to be treated +; ;; space-efficiently in the buffer. +; (make-charset 'chinese-cns11643-3 +; "CNS11643 Plane 3 Chinese Traditional: ISO-IR-183" +; '(dimension +; 2 +; registry "CNS11643.1992-3" +; chars 94 +; columns 2 +; direction l2r +; final ?I +; graphic 0 +; short-name "CNS11643-3" +; long-name "CNS11643-3 (Chinese traditional): ISO-IR-183" +; )) + ;; CNS11643 Plane3 thru Plane7 ;; These represent more and more obscure Chinese characters. ;; By the time you get to Plane 7, we're talking about characters @@ -64,7 +151,10 @@ dimension 2 chars 94 final ,final - graphic 0)) + graphic 0 + short-name ,(concat "CNS11643-" plane) + long-name ,(format "CNS11643-%s (Chinese traditional): ISO-IR-183" + plane))) (modify-syntax-entry name "w") (modify-category-entry name ?t) )) @@ -78,22 +168,31 @@ ;; ISO-IR-165 (CCITT Extended GB) ;; It is based on CCITT Recommendation T.101, includes GB 2312-80 + ;; GB 8565-88 table A4 + 293 characters. -(make-charset +(make-charset ;; not in FSF 21.1 'chinese-isoir165 "ISO-IR-165 (CCITT Extended GB; Chinese simplified)" `(registry "isoir165" dimension 2 chars 94 final ?E - graphic 0)) + graphic 0 + short-name "ISO-IR-165" + long-name "ISO-IR-165 (CCITT Extended GB; Chinese simplified)")) ;; PinYin-ZhuYin -(make-charset 'sisheng "PinYin-ZhuYin" - '(registry "sisheng_cwnn\\|OMRON_UDC_ZH" - dimension 1 +(make-charset 'chinese-sisheng + "SiSheng characters for PinYin/ZhuYin" + '(dimension + 1 + ;; XEmacs addition: second half of registry spec + registry "sisheng_cwnn\\|OMRON_UDC_ZH" chars 94 + columns 1 + direction l2r final ?0 graphic 0 + short-name "SiSheng" + long-name "SiSheng (PinYin/ZhuYin)" )) ;; If you prefer QUAIL to EGG, please modify below as you wish. @@ -154,7 +253,7 @@ "Chinese EUC" '(charset-g0 ascii charset-g1 chinese-gb2312 - charset-g2 sisheng + charset-g2 chinese-sisheng charset-g3 t mnemonic "Zh-GB/EUC" documentation @@ -221,7 +320,7 @@ (set-language-info-alist "Chinese-GB" '((setup-function . setup-chinese-gb-environment-internal) - (charset chinese-gb2312 sisheng) + (charset chinese-gb2312 chinese-sisheng) (coding-system cn-gb-2312 iso-2022-7bit hz-gb-2312) (coding-priority cn-gb-2312 big5 iso-2022-7bit) (cygwin-locale "zh") diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/cyril-util.el --- a/lisp/mule/cyril-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/cyril-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -21,22 +21,21 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/cyril-util.el). +;;; Synched up with: Emacs 21.1 (language/cyril-util.el). + +;;; Commentary: ;;; Code: ;;;###autoload (defun cyrillic-encode-koi8-r-char (char) "Return KOI8-R external character code of CHAR if appropriate." - (aref (char-table-extra-slot cyrillic-koi8-r-nonascii-translation-table 0) - char)) + (get-char-table char cyrillic-koi8-r-nonascii-translation-table)) ;;;###autoload (defun cyrillic-encode-alternativnyj-char (char) "Return ALTERNATIVNYJ external character code of CHAR if appropriate." - (aref (char-table-extra-slot - cyrillic-alternativnyj-nonascii-translation-table 0) - char)) + (get-char-table char cyrillic-alternativnyj-nonascii-translation-table)) ;; Display @@ -191,8 +190,8 @@ ;; (provide 'cyril-util) -;;; cyril-util.el ends here - ;; Local Variables: ;; coding: iso-2022-7bit ;; End: + +;;; cyril-util.el ends here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/cyrillic.el --- a/lisp/mule/cyrillic.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/cyrillic.el Sat Mar 16 10:39:19 2002 +0000 @@ -45,6 +45,20 @@ ;; ISO-8859-5 +; (make-charset 'cyrillic-iso8859-5 +; "Right-Hand Part of Latin/Cyrillic Alphabet (ISO/IEC 8859-5): ISO-IR-144" +; '(dimension +; 1 +; registry "ISO8859-5" +; chars 96 +; columns 1 +; direction l2r +; final ?L +; graphic 1 +; short-name "RHP of ISO8859/5" +; long-name "RHP of Cyrillic (ISO 8859-5): ISO-IR-144" +; )) + (make-coding-system 'iso-8859-5 'iso2022 "ISO-8859-5 (Cyrillic)" diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/devan-util.el --- a/lisp/mule/devan-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/devan-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,4 +1,4 @@ -;;; devan-util.el --- Support for Devanagari Script Composition -*- coding: iso-2022-7bit; -*- +;;; devan-util.el --- support for Devanagari Script Composition -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1996, 2001 Free Software Foundation, Inc. @@ -23,7 +23,7 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/devan-util.el). +;;; Synched up with: Emacs 21.1 (language/devan-util.el). ;;; Commentary: @@ -1283,8 +1283,8 @@ ;; (provide 'devan-util) -;;; devan-util.el end here - ;; Local Variables: ;; coding: iso-2022-7bit ;; End: + +;;; devan-util.el end here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/devanagari.el --- a/lisp/mule/devanagari.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/devanagari.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,4 +1,4 @@ -;;; devanagari.el --- Support for Devanagari -*- coding: iso-2022-7bit; -*- +;;; devanagari.el --- support for Devanagari -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1996 Free Software Foundation, Inc. @@ -23,13 +23,14 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/devanagari.el). +;;; Synched up with: Emacs 21.1 (language/devanagari.el). ;;; Commentary: ;; History: ;; 1996.10.18 written by KAWABATA, Taichi ;; 1997.1.20 fixed some bugs. + ;;; Code: ; (make-coding-system diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/english.el --- a/lisp/mule/english.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/english.el Sat Mar 16 10:39:19 2002 +0000 @@ -31,6 +31,21 @@ ;;; Code +;; ASCII with right-to-left direction. +; (make-charset 'ascii-right-to-left +; "ASCII (left half of ISO 8859-1) with right-to-left direction" +; '(dimension +; 1 +; registry "ISO8859-1" +; chars 94 +; columns 1 +; direction r2l +; final ?B +; graphic 0 +; short-name "rev ASCII" +; long-name "ASCII with right-to-left direction" +; )) + (set-language-info-alist "English" '((tutorial . "TUTORIAL") (locale "en" "C") diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/ethio-util.el --- a/lisp/mule/ethio-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/ethio-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -22,10 +22,12 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/ethio-util.el). +;;; Synched up with: Emacs 21.1 (language/ethio-util.el). ;; Author: TAKAHASHI Naoto +;;; Commentary: + ;;; Code: ;; Information for exiting Ethiopic environment. @@ -1298,7 +1300,7 @@ composite t)) ;; neither gemination nor fidel ((not (eq (char-charset ch) 'ethiopic)) - (error "Not a valid character."))) + (error "Not a valid character"))) ;; set frequently referred character features (setq ch (ethio-char-to-ethiocode ch) @@ -1308,7 +1310,7 @@ (if (or (and (>= ch 344) (<= ch 380)) ;; mYa - `10000 (and (>= ch 448) (<= ch 452)) ;; \~X - \~A (>= ch 458)) ;; private punctuations - (error "Not a valid character.")) + (error "Not a valid character")) (setq newch diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/ethiopic.el --- a/lisp/mule/ethiopic.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/ethiopic.el Sat Mar 16 10:39:19 2002 +0000 @@ -28,13 +28,18 @@ ;;; Code: -;; Ethiopic -(make-charset 'ethiopic "Ethiopic" - '(registry "Ethio" - dimension 2 +;; Ethiopic characters (Amahric and Tigrigna). +(make-charset 'ethiopic "Ethiopic characters" + '(dimension + 2 + registry "Ethiopic-Unicode" chars 94 + columns 2 + direction l2r final ?3 graphic 0 + short-name "Ethiopic" + long-name "Ethiopic characters" )) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/european.el --- a/lisp/mule/european.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/european.el Sat Mar 16 10:39:19 2002 +0000 @@ -32,6 +32,104 @@ ;; #### latin.el would be a better name for this file. ;;; Code: +; (make-charset 'latin-iso8859-1 +; "Right-Hand Part of Latin Alphabet 1 (ISO/IEC 8859-1): ISO-IR-100" +; '(dimension +; 1 +; registry "ISO8859-1" +; chars 96 +; columns 1 +; direction l2r +; final ?A +; graphic 1 +; short-name "RHP of Latin-1" +; long-name "RHP of Latin-1 (ISO 8859-1): ISO-IR-100" +; )) + +; (make-charset 'latin-iso8859-2 +; "Right-Hand Part of Latin Alphabet 2 (ISO/IEC 8859-2): ISO-IR-101" +; '(dimension +; 1 +; registry "ISO8859-2" +; chars 96 +; columns 1 +; direction l2r +; final ?B +; graphic 1 +; short-name "RHP of Latin-2" +; long-name "RHP of Latin-2 (ISO 8859-2): ISO-IR-101" +; )) + +; (make-charset 'latin-iso8859-3 +; "Right-Hand Part of Latin Alphabet 3 (ISO/IEC 8859-3): ISO-IR-109" +; '(dimension +; 1 +; registry "ISO8859-3" +; chars 96 +; columns 1 +; direction l2r +; final ?C +; graphic 1 +; short-name "RHP of Latin-3" +; long-name "RHP of Latin-3 (ISO 8859-3): ISO-IR-109" +; )) + +; (make-charset 'latin-iso8859-4 +; "Right-Hand Part of Latin Alphabet 4 (ISO/IEC 8859-4): ISO-IR-110" +; '(dimension +; 1 +; registry "ISO8859-4" +; chars 96 +; columns 1 +; direction l2r +; final ?D +; graphic 1 +; short-name "RHP of Latin-4" +; long-name "RHP of Latin-4 (ISO 8859-4): ISO-IR-110" +; )) + +; (make-charset 'latin-iso8859-9 +; "Right-Hand Part of Latin Alphabet 5 (ISO/IEC 8859-9): ISO-IR-148" +; '(dimension +; 1 +; registry "ISO8859-9" +; chars 96 +; columns 1 +; direction l2r +; final ?M +; graphic 1 +; short-name "RHP of Latin-5" +; long-name "RHP of Latin-5 (ISO 8859-9): ISO-IR-148" +; )) + +; (make-charset 'latin-iso8859-15 +; "Right-Hand Part of Latin Alphabet 9 (ISO/IEC 8859-15): ISO-IR-203" +; '(dimension +; 1 +; registry "ISO8859-15" +; chars 96 +; columns 1 +; direction l2r +; final ?b +; graphic 1 +; short-name "RHP of Latin-9" +; long-name "RHP of Latin-9 (ISO 8859-15): ISO-IR-203" +; )) + +(make-charset 'latin-iso8859-14 + "Right-Hand Part of Latin Alphabet 8 (ISO/IEC 8859-14)" + '(dimension + 1 + registry "ISO8859-14" + chars 96 + columns 1 + direction l2r + final ?_ + graphic 1 + short-name "RHP of Latin-8" + long-name "RHP of Latin-8 (ISO 8859-14)" + )) + ;; For syntax of Latin-1 characters. (loop for c from 64 to 127 ; from ',A@(B' to ',A(B' @@ -170,8 +268,9 @@ (provide 'romanian) ;; Czech support originally from czech.el -;; Author: Milan Zamazal -;; Maintainer(for XEmacs): David Sauer +;; Author: Milan Zamazal +;; Maintainer (FSF): Pavel Jan,Am(Bk +;; Maintainer (for XEmacs): David Sauer (provide 'czech) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/greek.el --- a/lisp/mule/greek.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/greek.el Sat Mar 16 10:39:19 2002 +0000 @@ -29,6 +29,20 @@ ;;; Code: +; (make-charset 'greek-iso8859-7 +; "Right-Hand Part of Latin/Greek Alphabet (ISO/IEC 8859-7): ISO-IR-126" +; '(dimension +; 1 +; registry "ISO8859-7" +; chars 96 +; columns 1 +; direction l2r +; final ?F +; graphic 1 +; short-name "RHP of ISO8859/7" +; long-name "RHP of Greek (ISO 8859-7): ISO-IR-126" +; )) + ;; For syntax of Greek (loop for c from 54 to 126 do (modify-syntax-entry (make-char 'greek-iso8859-7 c) "w")) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/hebrew.el --- a/lisp/mule/hebrew.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/hebrew.el Sat Mar 16 10:39:19 2002 +0000 @@ -28,6 +28,20 @@ ;;; Code: +; (make-charset 'hebrew-iso8859-8 +; "Right-Hand Part of Latin/Hebrew Alphabet (ISO/IEC 8859-8): ISO-IR-138" +; '(dimension +; 1 +; registry "ISO8859-8" +; chars 96 +; columns 1 +; direction r2l +; final ?H +; graphic 1 +; short-name "RHP of ISO8859/8" +; long-name "RHP of Hebrew (ISO 8859-8): ISO-IR-138" +; )) + ;; Syntax of Hebrew characters (loop for c from 96 to 122 do (modify-syntax-entry (make-char 'hebrew-iso8859-8 c) "w")) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/indian.el --- a/lisp/mule/indian.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/indian.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,4 +1,4 @@ -;;; indian.el --- Support for Indian Languages -*- coding: iso-2022-7bit; -*- +;;; indian.el --- support for Indian Languages -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Free Software Foundation, Inc. @@ -23,7 +23,7 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/indian.el). +;;; Synched up with: Emacs 21.1 (language/indian.el). ;;; Commentary: @@ -91,6 +91,54 @@ ;; electronically. Here is the table to convert between ITRANS code and ;; IS 13194 code. +;; Indian scripts. Symbolic charset for data exchange. Glyphs are +;; not assigned. They are automatically converted to each Indian +;; script which IS-13194 supports. + +(make-charset 'indian-is13194 + "Generic Indian charset for data exchange with IS 13194" + '(dimension + 1 + registry "IS13194-Devanagari" + chars 94 + columns 2 + direction l2r + final ?5 + graphic 1 + short-name "IS 13194" + long-name "Indian IS 13194" + )) + +;; Actual Glyph for 1-column width. +(make-charset 'indian-1-column + "Indian charset for 2-column width glyphs" + '(dimension + 2 + registry "MuleIndian-1" + chars 94 + columns 1 + direction l2r + final ?6 + graphic 0 + short-name "Indian 1-col" + long-name "Indian 1 Column" + )) + +;; Actual Glyph for 2-column width. +(make-charset 'indian-2-column + "Indian charset for 2-column width glyphs" + '(dimension + 2 + registry "MuleIndian-2" + chars 94 + columns 2 + direction l2r + final ?5 + graphic 0 + short-name "Indian 2-col" + long-name "Indian 2 Column" + )) + (defvar indian-itrans-consonant-alist '( ("k" . "(53(B") diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/japan-util.el --- a/lisp/mule/japan-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/japan-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,8 +1,9 @@ -;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- +;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. +;; Copyright (C) 2001 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Japanese @@ -23,7 +24,9 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/japan-util.el). +;;; Synched up with: Emacs 21.1 (language/japan-util.el). + +;;; Commentary: ;;; Code: @@ -104,7 +107,7 @@ (defconst japanese-symbol-table '((?\$B!!(B ?\ ) (?$B!$(B ?, ?(I$(B) (?$B!%(B ?. ?(I!(B) (?$B!"(B ?, ?(I$(B) (?$B!#(B ?. ?(I!(B) (?$B!&(B nil ?(I%(B) (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B) - (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?-) (?$B!=(B ?-) (?$B!>(B ?-) + (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") (?\$B!J(B ?$) (?\$B!K(B ?$) (?\$B!N(B ?[) (?\$B!O(B ?]) (?\$B!P(B ?{) (?\$B!Q(B ?}) (?$B!R(B ?<) (?$B!S(B ?>) (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) @@ -202,9 +205,9 @@ Optional argument ASCII-ONLY non-nil means to return only ASCII character." (if (stringp obj) (japanese-string-conversion obj 'japanese-hankaku-region ascii-only) - (or (get-char-code-property obj 'ascii) - (and (not ascii-only) + (or (and (not ascii-only) (get-char-code-property obj 'jisx0201)) + (get-char-code-property obj 'ascii) obj))) ;;;###autoload @@ -283,9 +286,9 @@ (goto-char (point-min)) (while (re-search-forward "\\cj" nil t) (let* ((zenkaku (preceding-char)) - (hankaku (or (get-char-code-property zenkaku 'ascii) - (and (not ascii-only) - (get-char-code-property zenkaku 'jisx0201))))) + (hankaku (or (and (not ascii-only) + (get-char-code-property zenkaku 'jisx0201)) + (get-char-code-property zenkaku 'ascii)))) (if hankaku (japanese-replace-region (match-beginning 0) (match-end 0) hankaku))))))) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/japanese.el --- a/lisp/mule/japanese.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/japanese.el Sat Mar 16 10:39:19 2002 +0000 @@ -33,6 +33,103 @@ ;;; Code: +; (make-charset 'katakana-jisx0201 +; "Katakana Part of JISX0201.1976" +; '(dimension +; 1 +; registry "JISX0201" +; chars 94 +; columns 1 +; direction l2r +; final ?I +; graphic 1 +; short-name "JISX0201 Katakana" +; long-name "Japanese Katakana (JISX0201.1976)" +; )) + +; (make-charset 'latin-jisx0201 +; "Roman Part of JISX0201.1976" +; '(dimension +; 1 +; registry "JISX0201" +; chars 94 +; columns 1 +; direction l2r +; final ?J +; graphic 0 +; short-name "JISX0201 Roman" +; long-name "Japanese Roman (JISX0201.1976)" +; )) + +; (make-charset 'japanese-jisx0208-1978 +; "JISX0208.1978 Japanese Kanji (so called \"old JIS\"): ISO-IR-42" +; '(dimension +; 2 +; registry "JISX0208.1990" +; registry "JISX0208.1978" +; chars 94 +; columns 2 +; direction l2r +; final ?@ +; graphic 0 +; short-name "JISX0208.1978" +; long-name "JISX0208.1978 (Japanese): ISO-IR-42" +; )) + +; (make-charset 'japanese-jisx0208 +; "JISX0208.1983/1990 Japanese Kanji: ISO-IR-87" +; '(dimension +; 2 +; chars 94 +; columns 2 +; direction l2r +; final ?B +; graphic 0 +; short-name "JISX0208" +; long-name "JISX0208.1983/1990 (Japanese): ISO-IR-87" +; )) + +; (make-charset 'japanese-jisx0212 +; "JISX0212 Japanese supplement: ISO-IR-159" +; '(dimension +; 2 +; registry "JISX0212" +; chars 94 +; columns 2 +; direction l2r +; final ?D +; graphic 0 +; short-name "JISX0212" +; long-name "JISX0212 (Japanese): ISO-IR-159" +; )) + +(make-charset 'japanese-jisx0213-1 "JISX0213 Plane 1 (Japanese)" + '(dimension + 2 + registry "JISX0213.2000-1" + chars 94 + columns 2 + direction l2r + final ?O + graphic 0 + short-name "JISX0213-1" + long-name "JISX0213-1" + )) + +;; JISX0213 Plane 2 +(make-charset 'japanese-jisx0213-2 "JISX0213 Plane 2 (Japanese)" + '(dimension + 2 + registry "JISX0213.2000-2" + chars 94 + columns 2 + direction l2r + final ?P + graphic 0 + short-name "JISX0213-2" + long-name "JISX0213-2" + )) + ;;; Syntax of Japanese characters. (modify-syntax-entry 'katakana-jisx0201 "w") (modify-syntax-entry 'japanese-jisx0212 "w") diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/korea-util.el --- a/lisp/mule/korea-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/korea-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -21,7 +21,9 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/korea-util.el). +;;; Synched up with: Emacs 21.1 (language/korea-util.el). + +;;; Commentary: ;;; Code: @@ -135,4 +137,4 @@ ;; (provide 'korea-util) -;;; korean-util.el ends here +;;; korea-util.el ends here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/korean.el --- a/lisp/mule/korean.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/korean.el Sat Mar 16 10:39:19 2002 +0000 @@ -29,6 +29,20 @@ ;;; Code: +; (make-charset 'korean-ksc5601 +; "KSC5601 Korean Hangul and Hanja: ISO-IR-149" +; '(dimension +; 2 +; registry "KSC5601.1989" +; chars 94 +; columns 2 +; direction l2r +; final ?C +; graphic 0 +; short-name "KSC5601" +; long-name "KSC5601 (Korean): ISO-IR-149" +; )) + ;; Syntax of Korean characters. (loop for row from 33 to 34 do (modify-syntax-entry `[korean-ksc5601 ,row] ".")) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/lao-util.el --- a/lisp/mule/lao-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/lao-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -22,7 +22,9 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/lao-util.el). +;;; Synched up with: Emacs 21.1 (language/lao-util.el). + +;;; Commentary: ;;; Code: diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/lao.el --- a/lisp/mule/lao.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/lao.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,4 +1,4 @@ -;;; lao.el --- Support for Lao -*- coding: iso-2022-7bit; -*- +;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. @@ -22,10 +22,27 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/lao.el). +;;; Synched up with: Emacs 21.1 (language/lao.el). + +;;; Commentary: ;;; Code: +;; Lao script. +;; ISO10646's 0x0E80..0x0EDF are mapped to 0x20..0x7F. +(make-charset 'lao "Lao characters (ISO10646 0E80..0EDF)" + '(dimension + 1 + registry "MuleLao-1" + chars 94 + columns 1 + direction l2r + final ?1 + graphic 0 + short-name "Lao" + long-name "Lao" + )) + ; (make-coding-system ; 'lao 2 ?L ; "8-bit encoding for ASCII (MSB=0) and LAO (MSB=1)" @@ -58,9 +75,10 @@ (aset ignore-relative-composition ?(1$B t) ;; Register a function to compose Lao characters. -(aset composition-function-table (make-char 'lao) - '(("\\c0\\c9?\\(\\(\\c2\\|\\c3\$\\c4?\\|\\c4\\)?" - . lao-composition-function))) +(put-char-table 'lao + '(("\\c0\\c9?\$\\(\\c2\\|\\c3\$\\c4?\\|\\c4\\)?" + . lao-composition-function)) + composition-function-table) (provide 'lao) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/misc-lang.el --- a/lisp/mule/misc-lang.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/misc-lang.el Sat Mar 16 10:39:19 2002 +0000 @@ -30,13 +30,19 @@ ;;; IPA (International Phonetic Alphabet) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(make-charset 'ipa "International Phonetic Alphabet" - '(registry "MuleIPA" - dimension 1 +;; IPA characters for phonetic symbols. +(make-charset 'ipa "IPA (International Phonetic Association)" + '(dimension + 1 + registry "MuleIPA" chars 96 + columns 1 + direction l2r final ?0 graphic 1 - )) ; for XEmacs + short-name "IPA" + long-name "IPA" + )) (set-language-info-alist "IPA" '((charset . (ipa)) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/mule-charset.el --- a/lisp/mule/mule-charset.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/mule-charset.el Sat Mar 16 10:39:19 2002 +0000 @@ -165,4 +165,838 @@ (put-char-table (car l) t auto-fill-chars) (setq l (cdr l)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; charsets ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; Synched up with: FSF 21.1. + +;; All FSF charset definitions are in mule-conf.el. I copied the relevant +;; part of that file below, then converted all charset definitions using +;; the macro below, then globally replaced 'direction 0' with 'direction +;; l2r' and 'direction 1' with 'direction r2l', then commented everything +;; out. Copy the definitions as necessary to individual files. + +;; Kbd macro to convert from FSF-style define-charset to our make-charset. + +; (setq last-kbd-macro (read-kbd-macro +; " M-d make M-d TAB '[dimension DEL SPC RET TAB chars SPC RET TAB columns SPC RET TAB direction SPC RET TAB final SPC RET TAB graphic SPC RET TAB short- name SPC RET TAB long- name SPC RET TAB DEL TAB ] SPC 3*

RET ")) + +;; Kbd macro to take one registry entry from the list of registry entries, +;; find the appropriate make-charset call, and add the appropriate registry +;; property. + +; (setq last-kbd-macro (read-kbd-macro +; "3*

C-x x 1

C-x x 2 C-x r m foo RET M-x sear TAB for TAB RET C-x g 1 RET C-s dimen RET RET TAB 3* registry SPC C-x g 2 C-x r b RET ")) + +;; List from FSF international/fontset.el of registries for charsets. + +;; latin-iso8859-1 "ISO8859-1" +;; latin-iso8859-2 "ISO8859-2" +;; latin-iso8859-3 "ISO8859-3" +;; latin-iso8859-4 "ISO8859-4" +;; thai-tis620 "TIS620" +;; greek-iso8859-7 "ISO8859-7" +;; arabic-iso8859-6 "ISO8859-6" +;; hebrew-iso8859-8 "ISO8859-8" +;; katakana-jisx0201 "JISX0201" +;; latin-jisx0201 "JISX0201" +;; cyrillic-iso8859-5 "ISO8859-5" +;; latin-iso8859-9 "ISO8859-9" +;; japanese-jisx0208-1978 "JISX0208.1978" +;; chinese-gb2312 "GB2312.1980" +;; japanese-jisx0208 "JISX0208.1990" +;; korean-ksc5601 "KSC5601.1989" +;; japanese-jisx0212 "JISX0212" +;; chinese-cns11643-1 "CNS11643.1992-1" +;; chinese-cns11643-2 "CNS11643.1992-2" +;; chinese-cns11643-3 "CNS11643.1992-3" +;; chinese-cns11643-4 "CNS11643.1992-4" +;; chinese-cns11643-5 "CNS11643.1992-5" +;; chinese-cns11643-6 "CNS11643.1992-6" +;; chinese-cns11643-7 "CNS11643.1992-7" +;; chinese-big5-1 "Big5" +;; chinese-big5-2 "Big5" +;; chinese-sisheng "sisheng_cwnn" +;; vietnamese-viscii-lower "VISCII1.1" +;; vietnamese-viscii-upper "VISCII1.1" +;; arabic-digit "MuleArabic-0" +;; arabic-1-column "MuleArabic-1" +;; arabic-2-column "MuleArabic-2" +;; ipa "MuleIPA" +;; ethiopic "Ethiopic-Unicode" +;; ascii-right-to-left "ISO8859-1" +;; indian-is13194 "IS13194-Devanagari" +;; indian-2-column "MuleIndian-2" +;; indian-1-column "MuleIndian-1" +;; lao "MuleLao-1" +;; tibetan "MuleTibetan-2" +;; tibetan-1-column "MuleTibetan-1" +;; latin-iso8859-14 "ISO8859-14" +;; latin-iso8859-15 "ISO8859-15" +;; mule-unicode-0100-24ff "ISO10646-1" +;; mule-unicode-2500-33ff "ISO10646-1" +;; mule-unicode-e000-ffff "ISO10646-1" +;; japanese-jisx0213-1 "JISX0213.2000-1" +;; japanese-jisx0213-2 "JISX0213.2000-2" + +;;; Begin stuff from international/mule-conf.el. + +; ;;; Definitions of character sets. + +; ;; Basic (official) character sets. These character sets are treated +; ;; efficiently with respect to buffer memory. + +; ;; Syntax: +; ;; (define-charset CHARSET-ID CHARSET +; ;; [ DIMENSION CHARS WIDTH DIRECTION ISO-FINAL-CHAR ISO-GRAPHIC-PLANE +; ;; SHORT-NAME LONG-NAME DESCRIPTION ]) +; ;; ASCII charset is defined in src/charset.c as below. +; ;; (define-charset 0 ascii +; ;; [1 94 1 0 ?B 0 "ASCII" "ASCII" "ASCII (ISO646 IRV)"]) + +; ;; 1-byte charsets. Valid range of CHARSET-ID is 128..143. + +; ;; CHARSET-ID 128 is not used. + +; ; An extra level of commenting means an official (done in C) charset. +; ; (make-charset 'latin-iso8859-1 +; ; "Right-Hand Part of Latin Alphabet 1 (ISO/IEC 8859-1): ISO-IR-100" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-1" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?A +; ; graphic 1 +; ; short-name "RHP of Latin-1" +; ; long-name "RHP of Latin-1 (ISO 8859-1): ISO-IR-100" +; ; )) + +; ; (make-charset 'latin-iso8859-2 +; ; "Right-Hand Part of Latin Alphabet 2 (ISO/IEC 8859-2): ISO-IR-101" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-2" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?B +; ; graphic 1 +; ; short-name "RHP of Latin-2" +; ; long-name "RHP of Latin-2 (ISO 8859-2): ISO-IR-101" +; ; )) + +; ; (make-charset 'latin-iso8859-3 +; ; "Right-Hand Part of Latin Alphabet 3 (ISO/IEC 8859-3): ISO-IR-109" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-3" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?C +; ; graphic 1 +; ; short-name "RHP of Latin-3" +; ; long-name "RHP of Latin-3 (ISO 8859-3): ISO-IR-109" +; ; )) + +; ; (make-charset 'latin-iso8859-4 +; ; "Right-Hand Part of Latin Alphabet 4 (ISO/IEC 8859-4): ISO-IR-110" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-4" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?D +; ; graphic 1 +; ; short-name "RHP of Latin-4" +; ; long-name "RHP of Latin-4 (ISO 8859-4): ISO-IR-110" +; ; )) + +; ; (make-charset 'thai-tis620 +; ; "Right-Hand Part of TIS620.2533 (Thai): ISO-IR-166" +; ; '(dimension +; ; 1 +; ; registry "TIS620" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?T +; ; graphic 1 +; ; short-name "RHP of TIS620" +; ; long-name "RHP of Thai (TIS620): ISO-IR-166" +; ; )) + +; ; (make-charset 'greek-iso8859-7 +; ; "Right-Hand Part of Latin/Greek Alphabet (ISO/IEC 8859-7): ISO-IR-126" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-7" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?F +; ; graphic 1 +; ; short-name "RHP of ISO8859/7" +; ; long-name "RHP of Greek (ISO 8859-7): ISO-IR-126" +; ; )) + +; ; (make-charset 'arabic-iso8859-6 +; ; "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-6" +; ; chars 96 +; ; columns 1 +; ; direction r2l +; ; final ?G +; ; graphic 1 +; ; short-name "RHP of ISO8859/6" +; ; long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127" +; ; )) + +; ; (make-charset 'hebrew-iso8859-8 +; ; "Right-Hand Part of Latin/Hebrew Alphabet (ISO/IEC 8859-8): ISO-IR-138" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-8" +; ; chars 96 +; ; columns 1 +; ; direction r2l +; ; final ?H +; ; graphic 1 +; ; short-name "RHP of ISO8859/8" +; ; long-name "RHP of Hebrew (ISO 8859-8): ISO-IR-138" +; ; )) + +; ; (make-charset 'katakana-jisx0201 +; ; "Katakana Part of JISX0201.1976" +; ; '(dimension +; ; 1 +; ; registry "JISX0201" +; ; chars 94 +; ; columns 1 +; ; direction l2r +; ; final ?I +; ; graphic 1 +; ; short-name "JISX0201 Katakana" +; ; long-name "Japanese Katakana (JISX0201.1976)" +; ; )) + +; ; (make-charset 'latin-jisx0201 +; ; "Roman Part of JISX0201.1976" +; ; '(dimension +; ; 1 +; ; registry "JISX0201" +; ; chars 94 +; ; columns 1 +; ; direction l2r +; ; final ?J +; ; graphic 0 +; ; short-name "JISX0201 Roman" +; ; long-name "Japanese Roman (JISX0201.1976)" +; ; )) + + +; ;; CHARSET-ID is not used 139. + +; ; (make-charset 'cyrillic-iso8859-5 +; ; "Right-Hand Part of Latin/Cyrillic Alphabet (ISO/IEC 8859-5): ISO-IR-144" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-5" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?L +; ; graphic 1 +; ; short-name "RHP of ISO8859/5" +; ; long-name "RHP of Cyrillic (ISO 8859-5): ISO-IR-144" +; ; )) + +; ; (make-charset 'latin-iso8859-9 +; ; "Right-Hand Part of Latin Alphabet 5 (ISO/IEC 8859-9): ISO-IR-148" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-9" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?M +; ; graphic 1 +; ; short-name "RHP of Latin-5" +; ; long-name "RHP of Latin-5 (ISO 8859-9): ISO-IR-148" +; ; )) + +; ; (make-charset 'latin-iso8859-15 +; ; "Right-Hand Part of Latin Alphabet 9 (ISO/IEC 8859-15): ISO-IR-203" +; ; '(dimension +; ; 1 +; ; registry "ISO8859-15" +; ; chars 96 +; ; columns 1 +; ; direction l2r +; ; final ?b +; ; graphic 1 +; ; short-name "RHP of Latin-9" +; ; long-name "RHP of Latin-9 (ISO 8859-15): ISO-IR-203" +; ; )) + +; (make-charset 'latin-iso8859-14 +; "Right-Hand Part of Latin Alphabet 8 (ISO/IEC 8859-14)" +; '(dimension +; 1 +; registry "ISO8859-14" +; chars 96 +; columns 1 +; direction l2r +; final ?_ +; graphic 1 +; short-name "RHP of Latin-8" +; long-name "RHP of Latin-8 (ISO 8859-14)" +; )) + + +; ;; 2-byte charsets. Valid range of CHARSET-ID is 144..153. + +; ; (make-charset 'japanese-jisx0208-1978 +; ; "JISX0208.1978 Japanese Kanji (so called \"old JIS\"): ISO-IR-42" +; ; '(dimension +; ; 2 +; ; registry "JISX0208.1990" +; ; registry "JISX0208.1978" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?@ +; ; graphic 0 +; ; short-name "JISX0208.1978" +; ; long-name "JISX0208.1978 (Japanese): ISO-IR-42" +; ; )) + +; ; (make-charset 'chinese-gb2312 +; ; "GB2312 Chinese simplified: ISO-IR-58" +; ; '(dimension +; ; 2 +; ; registry "GB2312.1980" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?A +; ; graphic 0 +; ; short-name "GB2312" +; ; long-name "GB2312: ISO-IR-58" +; ; )) + +; ; (make-charset 'japanese-jisx0208 +; ; "JISX0208.1983/1990 Japanese Kanji: ISO-IR-87" +; ; '(dimension +; ; 2 +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?B +; ; graphic 0 +; ; short-name "JISX0208" +; ; long-name "JISX0208.1983/1990 (Japanese): ISO-IR-87" +; ; )) + +; ; (make-charset 'korean-ksc5601 +; ; "KSC5601 Korean Hangul and Hanja: ISO-IR-149" +; ; '(dimension +; ; 2 +; ; registry "KSC5601.1989" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?C +; ; graphic 0 +; ; short-name "KSC5601" +; ; long-name "KSC5601 (Korean): ISO-IR-149" +; ; )) + +; ; (make-charset 'japanese-jisx0212 +; ; "JISX0212 Japanese supplement: ISO-IR-159" +; ; '(dimension +; ; 2 +; ; registry "JISX0212" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?D +; ; graphic 0 +; ; short-name "JISX0212" +; ; long-name "JISX0212 (Japanese): ISO-IR-159" +; ; )) + +; ; (make-charset 'chinese-cns11643-1 +; ; "CNS11643 Plane 1 Chinese traditional: ISO-IR-171" +; ; '(dimension +; ; 2 +; ; registry "CNS11643.1992-1" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?G +; ; graphic 0 +; ; short-name "CNS11643-1" +; ; long-name "CNS11643-1 (Chinese traditional): ISO-IR-171" +; ; )) + +; ; (make-charset 'chinese-cns11643-2 +; ; "CNS11643 Plane 2 Chinese traditional: ISO-IR-172" +; ; '(dimension +; ; 2 +; ; registry "CNS11643.1992-2" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?H +; ; graphic 0 +; ; short-name "CNS11643-2" +; ; long-name "CNS11643-2 (Chinese traditional): ISO-IR-172" +; ; )) + +; (make-charset 'japanese-jisx0213-1 "JISX0213 Plane 1 (Japanese)" +; '(dimension +; 2 +; registry "JISX0213.2000-1" +; chars 94 +; columns 2 +; direction l2r +; final ?O +; graphic 0 +; short-name "JISX0213-1" +; long-name "JISX0213-1" +; )) + +; ; (make-charset 'chinese-big5-1 +; ; "Frequently used part (A141-C67F) of Big5 (Chinese traditional)" +; ; '(dimension +; ; 2 +; ; registry "Big5" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?0 +; ; graphic 0 +; ; short-name "Big5 (Level-1)" +; ; long-name "Big5 (Level-1) A141-C67F" +; ; )) + +; ; (make-charset 'chinese-big5-2 +; ; "Less frequently used part (C940-FEFE) of Big5 (Chinese traditional)" +; ; '(dimension +; ; 2 +; ; registry "Big5" +; ; chars 94 +; ; columns 2 +; ; direction l2r +; ; final ?1 +; ; graphic 0 +; ; short-name "Big5 (Level-2)" +; ; long-name "Big5 (Level-2) C940-FEFE" +; ; )) + + +; ;; Additional (private) character sets. These character sets are +; ;; treated less space-efficiently in the buffer. + +; ;; Syntax: +; ;; (define-charset CHARSET-ID CHARSET +; ;; [ DIMENSION CHARS WIDTH DIRECTION ISO-FINAL-CHAR ISO-GRAPHIC-PLANE +; ;; SHORT-NAME LONG-NAME DESCRIPTION ]) + +; ;; ISO-2022 allows a use of character sets not registered in ISO with +; ;; final characters `0' (0x30) through `?' (0x3F). Among them, Emacs +; ;; reserves `0' through `9' to support several private character sets. +; ;; The remaining final characters `:' through `?' are for users. + +; ;; 1-byte 1-column charsets. Valid range of CHARSET-ID is 160..223. + +; (make-charset 'chinese-sisheng +; "SiSheng characters for PinYin/ZhuYin" +; '(dimension +; 1 +; registry "sisheng_cwnn" +; chars 94 +; columns 1 +; direction l2r +; final ?0 +; graphic 0 +; short-name "SiSheng" +; long-name "SiSheng (PinYin/ZhuYin)" +; )) + + +; ;; IPA characters for phonetic symbols. +; (make-charset 'ipa "IPA (International Phonetic Association)" +; '(dimension +; 1 +; registry "MuleIPA" +; chars 96 +; columns 1 +; direction l2r +; final ?0 +; graphic 1 +; short-name "IPA" +; long-name "IPA" +; )) + + +; ;; Vietnamese VISCII. VISCII is 1-byte character set which contains +; ;; more than 96 characters. Since Emacs can't handle it as one +; ;; character set, it is divided into two: lower case letters and upper +; ;; case letters. +; (make-charset 'vietnamese-viscii-lower "VISCII1.1 lower-case" +; '(dimension +; 1 +; registry "VISCII1.1" +; chars 96 +; columns 1 +; direction l2r +; final ?1 +; graphic 1 +; short-name "VISCII lower" +; long-name "VISCII lower-case" +; )) + +; (make-charset 'vietnamese-viscii-upper "VISCII1.1 upper-case" +; '(dimension +; 1 +; registry "VISCII1.1" +; chars 96 +; columns 1 +; direction l2r +; final ?2 +; graphic 1 +; short-name "VISCII upper" +; long-name "VISCII upper-case" +; )) + + +; ;; For Arabic, we need three different types of character sets. +; ;; Digits are of direction left-to-right and of width 1-column. +; ;; Others are of direction right-to-left and of width 1-column or +; ;; 2-column. +; (make-charset 'arabic-digit "Arabic digit" +; '(dimension +; 1 +; registry "MuleArabic-0" +; chars 94 +; columns 1 +; direction l2r +; final ?2 +; graphic 0 +; short-name "Arabic digit" +; long-name "Arabic digit" +; )) + +; (make-charset 'arabic-1-column "Arabic 1-column" +; '(dimension +; 1 +; registry "MuleArabic-1" +; chars 94 +; columns 1 +; direction r2l +; final ?3 +; graphic 0 +; short-name "Arabic 1-col" +; long-name "Arabic 1-column" +; )) + + +; ;; ASCII with right-to-left direction. +; (make-charset 'ascii-right-to-left +; "ASCII (left half of ISO 8859-1) with right-to-left direction" +; '(dimension +; 1 +; registry "ISO8859-1" +; chars 94 +; columns 1 +; direction r2l +; final ?B +; graphic 0 +; short-name "rev ASCII" +; long-name "ASCII with right-to-left direction" +; )) + + +; ;; Lao script. +; ;; ISO10646's 0x0E80..0x0EDF are mapped to 0x20..0x7F. +; (make-charset 'lao "Lao characters (ISO10646 0E80..0EDF)" +; '(dimension +; 1 +; registry "MuleLao-1" +; chars 94 +; columns 1 +; direction l2r +; final ?1 +; graphic 0 +; short-name "Lao" +; long-name "Lao" +; )) + + +; ;; CHARSET-IDs 168..223 are not used. + +; ;; 1-byte 2-column charsets. Valid range of CHARSET-ID is 224..239. + +; (make-charset 'arabic-2-column "Arabic 2-column" +; '(dimension +; 1 +; registry "MuleArabic-2" +; chars 94 +; columns 2 +; direction r2l +; final ?4 +; graphic 0 +; short-name "Arabic 2-col" +; long-name "Arabic 2-column" +; )) + + +; ;; Indian scripts. Symbolic charset for data exchange. Glyphs are +; ;; not assigned. They are automatically converted to each Indian +; ;; script which IS-13194 supports. + +; (make-charset 'indian-is13194 +; "Generic Indian charset for data exchange with IS 13194" +; '(dimension +; 1 +; registry "IS13194-Devanagari" +; chars 94 +; columns 2 +; direction l2r +; final ?5 +; graphic 1 +; short-name "IS 13194" +; long-name "Indian IS 13194" +; )) + + +; ;; CHARSET-IDs 226..239 are not used. + +; ;; 2-byte 1-column charsets. Valid range of CHARSET-ID is 240..244. + +; ;; Actual Glyph for 1-column width. +; (make-charset 'indian-1-column +; "Indian charset for 2-column width glyphs" +; '(dimension +; 2 +; registry "MuleIndian-1" +; chars 94 +; columns 1 +; direction l2r +; final ?6 +; graphic 0 +; short-name "Indian 1-col" +; long-name "Indian 1 Column" +; )) + + +; (make-charset 'tibetan-1-column "Tibetan 1 column glyph" +; '(dimension +; 2 +; registry "MuleTibetan-1" +; chars 94 +; columns 1 +; direction l2r +; final ?8 +; graphic 0 +; short-name "Tibetan 1-col" +; long-name "Tibetan 1 column" +; )) + + +; ;; Subsets of Unicode. + +; (make-charset 'mule-unicode-2500-33ff +; "Unicode characters of the range U+2500..U+33FF." +; '(dimension +; 2 +; registry "ISO10646-1" +; chars 96 +; columns 1 +; direction l2r +; final ?2 +; graphic 0 +; short-name "Unicode subset 2" +; long-name "Unicode subset (U+2500..U+33FF)" +; )) + + +; (make-charset 'mule-unicode-e000-ffff +; "Unicode characters of the range U+E000..U+FFFF." +; '(dimension +; 2 +; registry "ISO10646-1" +; chars 96 +; columns 1 +; direction l2r +; final ?3 +; graphic 0 +; short-name "Unicode subset 3" +; long-name "Unicode subset (U+E000+FFFF)" +; )) + + +; (make-charset 'mule-unicode-0100-24ff +; "Unicode characters of the range U+0100..U+24FF." +; '(dimension +; 2 +; registry "ISO10646-1" +; chars 96 +; columns 1 +; direction l2r +; final ?1 +; graphic 0 +; short-name "Unicode subset" +; long-name "Unicode subset (U+0100..U+24FF)" +; )) + + +; ;; 2-byte 2-column charsets. Valid range of CHARSET-ID is 245..254. + +; ;; Ethiopic characters (Amahric and Tigrigna). +; (make-charset 'ethiopic "Ethiopic characters" +; '(dimension +; 2 +; registry "Ethiopic-Unicode" +; chars 94 +; columns 2 +; direction l2r +; final ?3 +; graphic 0 +; short-name "Ethiopic" +; long-name "Ethiopic characters" +; )) + + +; ;; Chinese CNS11643 Plane3 thru Plane7. Although these are official +; ;; character sets, the use is rare and don't have to be treated +; ;; space-efficiently in the buffer. +; (make-charset 'chinese-cns11643-3 +; "CNS11643 Plane 3 Chinese Traditional: ISO-IR-183" +; '(dimension +; 2 +; registry "CNS11643.1992-3" +; chars 94 +; columns 2 +; direction l2r +; final ?I +; graphic 0 +; short-name "CNS11643-3" +; long-name "CNS11643-3 (Chinese traditional): ISO-IR-183" +; )) + +; (make-charset 'chinese-cns11643-4 +; "CNS11643 Plane 4 Chinese Traditional: ISO-IR-184" +; '(dimension +; 2 +; registry "CNS11643.1992-4" +; chars 94 +; columns 2 +; direction l2r +; final ?J +; graphic 0 +; short-name "CNS11643-4" +; long-name "CNS11643-4 (Chinese traditional): ISO-IR-184" +; )) + +; (make-charset 'chinese-cns11643-5 +; "CNS11643 Plane 5 Chinese Traditional: ISO-IR-185" +; '(dimension +; 2 +; registry "CNS11643.1992-5" +; chars 94 +; columns 2 +; direction l2r +; final ?K +; graphic 0 +; short-name "CNS11643-5" +; long-name "CNS11643-5 (Chinese traditional): ISO-IR-185" +; )) + +; (make-charset 'chinese-cns11643-6 +; "CNS11643 Plane 6 Chinese Traditional: ISO-IR-186" +; '(dimension +; 2 +; registry "CNS11643.1992-6" +; chars 94 +; columns 2 +; direction l2r +; final ?L +; graphic 0 +; short-name "CNS11643-6" +; long-name "CNS11643-6 (Chinese traditional): ISO-IR-186" +; )) + +; (make-charset 'chinese-cns11643-7 +; "CNS11643 Plane 7 Chinese Traditional: ISO-IR-187" +; '(dimension +; 2 +; registry "CNS11643.1992-7" +; chars 94 +; columns 2 +; direction l2r +; final ?M +; graphic 0 +; short-name "CNS11643-7" +; long-name "CNS11643-7 (Chinese traditional): ISO-IR-187" +; )) + + +; ;; Actual Glyph for 2-column width. +; (make-charset 'indian-2-column +; "Indian charset for 2-column width glyphs" +; '(dimension +; 2 +; registry "MuleIndian-2" +; chars 94 +; columns 2 +; direction l2r +; final ?5 +; graphic 0 +; short-name "Indian 2-col" +; long-name "Indian 2 Column" +; )) + + +; ;; Tibetan script. +; (make-charset 'tibetan "Tibetan characters" +; '(dimension +; 2 +; registry "MuleTibetan-2" +; chars 94 +; columns 2 +; direction l2r +; final ?7 +; graphic 0 +; short-name "Tibetan 2-col" +; long-name "Tibetan 2 column" +; )) + + +; ;; CHARSET-ID 253 is not used. + +; ;; JISX0213 Plane 2 +; (make-charset 'japanese-jisx0213-2 "JISX0213 Plane 2 (Japanese)" +; '(dimension +; 2 +; registry "JISX0213.2000-2" +; chars 94 +; columns 2 +; direction l2r +; final ?P +; graphic 0 +; short-name "JISX0213-2" +; long-name "JISX0213-2" +; )) + ;;; mule-charset.el ends here + diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/mule-cmds.el --- a/lisp/mule/mule-cmds.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/mule-cmds.el Sat Mar 16 10:39:19 2002 +0000 @@ -1110,7 +1110,8 @@ (let ((ms-locale (gethash langenv mswindows-langenv-to-locale-table))) (if ms-locale (progn - (mswindows-set-current-locale ms-locale) + (declare-fboundp (mswindows-set-current-locale + ms-locale)) ms-locale) ;; ... if not, see if the langenv specifies any locale(s). ;; if not, construct one from the langenv name. @@ -1129,7 +1130,8 @@ (or (consp msloc) (setq msloc (cons msloc "DEFAULT"))) (when (condition-case nil (progn - (mswindows-set-current-locale msloc) + (declare-fboundp (mswindows-set-current-locale + msloc)) t) (error nil)) (return msloc)))))))) @@ -1198,7 +1200,7 @@ of buffer-file-coding-system set by this function." ;; The following appeared as the third paragraph of the doc string for this -;; function, but it's not in FSF 21.0.103, and it's not true, since we call +;; function, but it's not in FSF 21.1, and it's not true, since we call ;; reset-coding-categories-to-default before calling this function. #### ;; Should we rethink this? @@ -1287,8 +1289,8 @@ (let (langenv) ;; under ms windows (any): (if (memq system-type '(windows-nt cygwin32)) - (let ((userdef (mswindows-user-default-locale)) - (sysdef (mswindows-system-default-locale))) + (let ((userdef (declare-fboundp (mswindows-user-default-locale))) + (sysdef (declare-fboundp (mswindows-system-default-locale)))) ;; (1) current langenv comes from user-default locale. (setq langenv (mswindows-get-language-environment-from-locale userdef)) @@ -1310,7 +1312,7 @@ ;; user-default locale even if the langenv doesn't correspond; ;; we might not be able to find a langenv for the user-default ;; locale but we should still use the right code page, etc. - (mswindows-set-current-locale userdef)) + (declare-fboundp (mswindows-set-current-locale userdef))) ;; Unix: (let ((locstring (set-current-locale ""))) ;; assume C lib locale and LANG env var are set correctly. use diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/mule-composite-stub.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/mule/mule-composite-stub.el Sat Mar 16 10:39:19 2002 +0000 @@ -0,0 +1,98 @@ +;;; mule-composite-stub.el --- Stubs of composition support -*- coding: iso-2022-7bit; -*- + +;; Copyright (C) 2002 Ben Wing. + +;; Keywords: multibyte character, composition + +;; 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. + +;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c). + +;;; Commentary: + +;;; Code: + +(defvar use-default-ascent (make-char-table 'generic) + "UNIMPLEMENTED. +Char table of characters whose ascent values should be ignored. +If an entry for a character is non-nil, the ascent value of the glyph +is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font. + +This affects how a composite character which contains +such a character is displayed on screen.") + +(defvar ignore-relative-composition (make-char-table 'generic) + "UNIMPLEMENTED. +Char table of characters which is not composed relatively. +If an entry for a character is non-nil, a composition sequence +which contains that character is displayed so that +the glyph of that character is put without considering +an ascent and descent value of a previous character.") + +(defvar compose-chars-after-function 'compose-chars-after + "UNIMPLEMENTED. +Function to adjust composition of buffer text. + +The function is called with three arguments FROM, TO, and OBJECT. +FROM and TO specify the range of text of which composition should be +adjusted. OBJECT, if non-nil, is a string that contains the text. + +This function is called after a text with `composition' property is +inserted or deleted to keep `composition' property of buffer text +valid. + +The default value is the function `compose-chars-after'.") + +(defvar composition-function-table (make-char-table 'generic) + "UNIMPLEMENTED. +Char table of patterns and functions to make a composition. + +Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs +are regular expressions and FUNCs are functions. FUNC is responsible +for composing text matching the corresponding PATTERN. FUNC is called +with three arguments FROM, TO, and PATTERN. See the function +`compose-chars-after' for more detail. + +This table is looked up by the first character of a composition when +the composition gets invalid after a change in a buffer.") + +(defun compose-region-internal (start end &optional components mod-func) + "UNIMPLEMENTED. +Internal use only. + +Compose text in the region between START and END. +Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC +for the composition. See `compose-region' for more detial." + nil) + +(defun compose-string-internal (string start end &optional components mod-func) + "UNIMPLEMENTED. +Internal use only. + +Compose text between indices START and END of STRING. +Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC +for the composition. See `compose-string' for more detial." + nil) + +(defun find-composition-internal (pos limit string detail-p) + "UNIMPLEMENTED. +Internal use only. + +Return information about composition at or nearest to position POS. +See `find-composition' for more detail." + nil) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/mule-composite.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/mule/mule-composite.el Sat Mar 16 10:39:19 2002 +0000 @@ -0,0 +1,398 @@ +;;; mule-composite.el --- support character composition + +;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. +;; Licensed to the Free Software Foundation. + +;; Keywords: mule, multilingual, character composition + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + +;;; Synched up with: Emacs 21.1 (lisp/composite.el). + +;;; Commentary: + +;;; Code: + +;;;###autoload +(defconst reference-point-alist + '((tl . 0) (tc . 1) (tr . 2) + (Bl . 3) (Bc . 4) (Br . 5) + (bl . 6) (bc . 7) (br . 8) + (cl . 9) (cc . 10) (cr . 11) + (top-left . 0) (top-center . 1) (top-right . 2) + (base-left . 3) (base-center . 4) (base-right . 5) + (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) + (center-left . 9) (center-center . 10) (center-right . 11) + ;; For backward compatibility... + (ml . 3) (mc . 10) (mr . 5) + (mid-left . 3) (mid-center . 10) (mid-right . 5)) + "UNIMPLEMENTED. +Alist of symbols vs integer codes of glyph reference points. +A glyph reference point symbol is to be used to specify a composition +rule in COMPONENTS argument to such functions as `compose-region' and +`make-composition'. + +Meanings of glyph reference point codes are as follows: + + 0----1----2 <---- ascent 0:tl or top-left + | | 1:tc or top-center + | | 2:tr or top-right + | | 3:Bl or base-left 9:cl or center-left + 9 10 11 <---- center 4:Bc or base-center 10:cc or center-center + | | 5:Br or base-right 11:cr or center-right + --3----4----5-- <-- baseline 6:bl or bottom-left + | | 7:bc or bottom-center + 6----7----8 <---- descent 8:br or bottom-right + +Glyph reference point symbols are to be used to specify composition +rule of the form \(GLOBAL-REF-POINT . NEW-REF-POINT), where +GLOBAL-REF-POINT is a reference point in the overall glyphs already +composed, and NEW-REF-POINT is a reference point in the new glyph to +be added. + +For instance, if GLOBAL-REF-POINT is `br' (bottom-right) and +NEW-REF-POINT is `tc' (top-center), the overall glyph is updated as +follows (the point `*' corresponds to both reference points): + + +-------+--+ <--- new ascent + | | | + | global| | + | glyph | | + -- | | |-- <--- baseline \(doesn't change) + +----+--*--+ + | | new | + | |glyph| + +----+-----+ <--- new descent +") + +;; Encode composition rule RULE into an integer value. RULE is a cons +;; of global and new reference point symbols. +;; This must be compatible with C macro COMPOSITION_ENCODE_RULE +;; defined in mule-composite.h. + +(defun encode-composition-rule (rule) + (if (and (integerp rule) (< rule 144)) + ;; Already encoded. + rule + (or (consp rule) + (error "Invalid composition rule: %S" rule)) + (let ((gref (car rule)) + (nref (cdr rule))) + (or (integerp gref) + (setq gref (cdr (assq gref reference-point-alist)))) + (or (integerp nref) + (setq nref (cdr (assq nref reference-point-alist)))) + (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) + (error "Invalid composition rule: %S" rule)) + (+ (* gref 12) nref)))) + +;; Decode encoded composition rule RULE-CODE. The value is a cons of +;; global and new reference point symbols. +;; This must be compatible with C macro COMPOSITION_DECODE_RULE +;; defined in mule-composite.h. + +(defun decode-composition-rule (rule-code) + (or (and (natnump rule-code) (< rule-code 144)) + (error "Invalid encoded composition rule: %S" rule-code)) + (let ((gref (car (rassq (/ rule-code 12) reference-point-alist))) + (nref (car (rassq (% rule-code 12) reference-point-alist)))) + (or (and gref (symbolp gref) nref (symbolp nref)) + (error "Invalid composition rule code: %S" rule-code)) + (cons gref nref))) + +;; Encode composition rules in composition components COMPONENTS. The +;; value is a copy of COMPONENTS, where composition rules (cons of +;; global and new glyph reference point symbols) are replaced with +;; encoded composition rules. Optional 2nd argument NOCOPY non-nil +;; means don't make a copy but modify COMPONENTS directly. + +(defun encode-composition-components (components &optional nocopy) + (or nocopy + (setq components (copy-sequence components))) + (if (vectorp components) + (let ((len (length components)) + (i 1)) + (while (< i len) + (aset components i + (encode-composition-rule (aref components i))) + (setq i (+ i 2)))) + (let ((tail (cdr components))) + (while tail + (setcar tail + (encode-composition-rule (car tail))) + (setq tail (nthcdr 2 tail))))) + components) + +;; Decode composition rule codes in composition components COMPONENTS. +;; The value is a copy of COMPONENTS, where composition rule codes are +;; replaced with composition rules (cons of global and new glyph +;; reference point symbols). Optional 2nd argument NOCOPY non-nil +;; means don't make a copy but modify COMPONENTS directly. +;; It is assumed that COMPONENTS is a vector and is for rule-base +;; composition, thus (2N+1)th elements are rule codes. + +(defun decode-composition-components (components &optional nocopy) + (or nocopy + (setq components (copy-sequence components))) + (let ((len (length components)) + (i 1)) + (while (< i len) + (aset components i + (decode-composition-rule (aref components i))) + (setq i (+ i 2)))) + components) + +;;;###autoload +(defun compose-region (start end &optional components modification-func) + "UNIMPLEMENTED. +Compose characters in the current region. + +When called from a program, expects these four arguments. + +First two arguments START and END are positions (integers or markers) +specifying the region. + +Optional 3rd argument COMPONENTS, if non-nil, is a character or a +sequence (vector, list, or string) of integers. + +If it is a character, it is an alternate character to display instead +of the text in the region. + +If it is a string, the elements are alternate characters. + +If it is a vector or list, it is a sequence of alternate characters and +composition rules, where (2N)th elements are characters and (2N+1)th +elements are composition rules to specify how to compose (2N+2)th +elements with previously composed N glyphs. + +A composition rule is a cons of global and new glyph reference point +symbols. See the documentation of `reference-point-alist' for more +detail. + +Optional 4th argument MODIFICATION-FUNC is a function to call to +adjust the composition when it gets invalid because of a change of +text in the composition." + (interactive "r") + (let ((modified-p (buffer-modified-p)) + (buffer-read-only nil)) + (if (or (vectorp components) (listp components)) + (setq components (encode-composition-components components))) + (compose-region-internal start end components modification-func) + (set-buffer-modified-p modified-p))) + +;;;###autoload +(defun decompose-region (start end) + "UNIMPLEMENTED. +Decompose text in the current region. + +When called from a program, expects two arguments, +positions (integers or markers) specifying the region." + (interactive "r") + (let ((modified-p (buffer-modified-p)) + (buffer-read-only nil)) + (remove-text-properties start end '(composition nil)) + (set-buffer-modified-p modified-p))) + +;;;###autoload +(defun compose-string (string &optional start end components modification-func) + "UNIMPLEMENTED. +Compose characters in string STRING. + +The return value is STRING where `composition' property is put on all +the characters in it. + +Optional 2nd and 3rd arguments START and END specify the range of +STRING to be composed. They defaults to the beginning and the end of +STRING respectively. + +Optional 4th argument COMPONENTS, if non-nil, is a character or a +sequence (vector, list, or string) of integers. See the function +`compose-region' for more detail. + +Optional 5th argument MODIFICATION-FUNC is a function to call to +adjust the composition when it gets invalid because of a change of +text in the composition." + (if (or (vectorp components) (listp components)) + (setq components (encode-composition-components components))) + (or start (setq start 0)) + (or end (setq end (length string))) + (compose-string-internal string start end components modification-func) + string) + +;;;###autoload +(defun decompose-string (string) + "UNIMPLEMENTED. +Return STRING where `composition' property is removed." + (remove-text-properties 0 (length string) '(composition nil) string) + string) + +;;;###autoload +(defun compose-chars (&rest args) + "UNIMPLEMENTED. +Return a string from arguments in which all characters are composed. +For relative composition, arguments are characters. +For rule-based composition, Mth \(where M is odd) arguments are +characters, and Nth \(where N is even) arguments are composition rules. +A composition rule is a cons of glyph reference points of the form +\(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of +`reference-point-alist' for more detail." + (let (str components) + (if (consp (car (cdr args))) + ;; Rule-base composition. + (let (;(len (length args)) + (tail (encode-composition-components args 'nocopy))) + + (while tail + (setq str (cons (car tail) str)) + (setq tail (nthcdr 2 tail))) + (setq str (concat (nreverse str)) + components args)) + ;; Relative composition. + (setq str (concat args))) + (compose-string-internal str 0 (length str) components))) + +;;;###autoload +(defun find-composition (pos &optional limit string detail-p) + "UNIMPLEMENTED. +Return information about a composition at or nearest to buffer position POS. + +If the character at POS has `composition' property, the value is a list +of FROM, TO, and VALID-P. + +FROM and TO specify the range of text that has the same `composition' +property, VALID-P is non-nil if and only if this composition is valid. + +If there's no composition at POS, and the optional 2nd argument LIMIT +is non-nil, search for a composition toward LIMIT. + +If no composition is found, return nil. + +Optional 3rd argument STRING, if non-nil, is a string to look for a +composition in; nil means the current buffer. + +If a valid composition is found and the optional 4th argument DETAIL-P +is non-nil, the return value is a list of FROM, TO, COMPONENTS, +RELATIVE-P, MOD-FUNC, and WIDTH. + +COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. + +RELATIVE-P is t if the composition method is relative, else nil. + +If RELATIVE-P is t, COMPONENTS is a vector of characters to be +composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters +and composition rules as described in `compose-region'. + +MOD-FUNC is a modification function of the composition. + +WIDTH is a number of columns the composition occupies on the screen." + (let ((result (find-composition-internal pos limit string detail-p))) + (if (and detail-p result (nth 2 result) (not (nth 3 result))) + ;; This is a valid rule-base composition. + (decode-composition-components (nth 2 result) 'nocopy)) + result)) + + +;;;###autoload +(defun compose-chars-after (pos &optional limit object) + "UNIMPLEMENTED. +Compose characters in current buffer after position POS. + +It looks up the char-table `composition-function-table' (which see) by +a character after POS. If non-nil value is found, the format of the +value should be an alist of PATTERNs vs FUNCs, where PATTERNs are +regular expressions and FUNCs are functions. If the text after POS +matches one of PATTERNs, call the corresponding FUNC with three +arguments POS, TO, and PATTERN, where TO is the end position of text +matching PATTERN, and return what FUNC returns. Otherwise, return +nil. + +FUNC is responsible for composing the text properly. The return value +is: + nil -- if no characters were composed. + CHARS (integer) -- if CHARS characters were composed. + +Optional 2nd arg LIMIT, if non-nil, limits the matching of text. + +Optional 3rd arg OBJECT, if non-nil, is a string that contains the +text to compose. In that case, POS and LIMIT index to the string. + +This function is the default value of `compose-chars-after-function'." + (let ((tail (get-char-table (char-after pos) composition-function-table)) + pattern func result) + (when tail + (save-match-data + (save-excursion + (while (and tail (not func)) + (setq pattern (car (car tail)) + func (cdr (car tail))) + (goto-char pos) + (if (if limit + (and (re-search-forward pattern limit t) + (= (match-beginning 0) pos)) + (looking-at pattern)) + (setq result (funcall func pos (match-end 0) pattern nil)) + (setq func nil tail (cdr tail))))))) + result)) + +;;;###autoload +(defun compose-last-chars (args) + "UNIMPLEMENTED. +Compose last characters. +The argument is a parameterized event of the form + \(compose-last-chars N COMPONENTS), +where N is the number of characters before point to compose, +COMPONENTS, if non-nil, is the same as the argument to `compose-region' +\(which see). If it is nil, `compose-chars-after' is called, +and that function find a proper rule to compose the target characters. +This function is intended to be used from input methods. +The global keymap binds special event `compose-last-chars' to this +function. Input method may generate an event (compose-last-chars N COMPONENTS) +after a sequence character events." + (interactive "e") + (let ((chars (nth 1 args))) + (if (and (numberp chars) + (>= (- (point) (point-min)) chars)) + (if (nth 2 args) + (compose-region (- (point) chars) (point) (nth 2 args)) + (compose-chars-after (- (point) chars) (point)))))) + +;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars) + + +;;; The following codes are only for backward compatibility with Emacs +;;; 20.4 and the earlier. + +;;;###autoload +(defun decompose-composite-char (char &optional type with-composition-rule) + "UNIMPLEMENTED. +Convert CHAR to string. +This is only for backward compatibility with Emacs 20.4 and the earlier. + +If optional 2nd arg TYPE is non-nil, it is `string', `list', or +`vector'. In this case, CHAR is converted string, list of CHAR, or +vector of CHAR respectively." + (cond ((or (null type) (eq type 'string)) (char-to-string char)) + ((eq type 'list) (list char)) + (t (vector char)))) + +(make-obsolete 'decompose-composite-char 'char-to-string + ;;"21.1" + ) + + +;;; mule-composite.el ends here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/mule-msw-init.el --- a/lisp/mule/mule-msw-init.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/mule-msw-init.el Sat Mar 16 10:39:19 2002 +0000 @@ -37,9 +37,9 @@ ;; (thai-tis620 . 874) (latin-jisx0201 . 932) (katakana-jisx0201 . 932) - (japanese-jisx0208-1978 . 932) + ;; (japanese-jisx0208-1978 . 932) (japanese-jisx0208 . 932) - ;; (japanese-jisx0212 . 932) + (japanese-jisx0212 . 932) (chinese-gb2312 . 936) (korean-ksc5601 . 949) (chinese-big5-1 . 950) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/thai-util.el --- a/lisp/mule/thai-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/thai-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -22,7 +22,9 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/thai-util.el). +;;; Synched up with: Emacs 21.1 (language/thai-util.el). + +;;; Commentary: ;;; Code: diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/thai.el --- a/lisp/mule/thai.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/thai.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,4 +1,4 @@ -;;; thai.el --- Support for Thai -*- coding: iso-2022-7bit; -*- +;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. @@ -22,7 +22,7 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/thai.el). +;;; Synched up with: Emacs 21.1 (language/thai.el). ;;; Commentary: @@ -33,6 +33,20 @@ ;;; Code: +; (make-charset 'thai-tis620 +; "Right-Hand Part of TIS620.2533 (Thai): ISO-IR-166" +; '(dimension +; 1 +; registry "TIS620" +; chars 96 +; columns 1 +; direction l2r +; final ?T +; graphic 1 +; short-name "RHP of TIS620" +; long-name "RHP of Thai (TIS620): ISO-IR-166" +; )) + ; ; (make-coding-system ; ; 'thai-tis620 2 ?T ; ; "8-bit encoding for ASCII (MSB=0) and Thai TIS620 (MSB=1)" @@ -69,9 +83,11 @@ ; (documentation . t))) -; ;; Register a function to compose Thai characters. -; (aset composition-function-table (make-char 'thai-tis620) -; '(("\\c0\\c4\\|\\c0\$\\c2\\|\\c3\$\\c4?" . thai-composition-function))) +;; Register a function to compose Thai characters. +; (put-char-table 'thai-tis620 +; '(("\\c0\\c4\\|\\c0\$\\c2\\|\\c3\$\\c4?" . +; thai-composition-function)) +; composition-function-table) (provide 'thai) diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/tibet-util.el --- a/lisp/mule/tibet-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/tibet-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -22,17 +22,19 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/tibet-util.el). +;;; Synched up with: Emacs 21.1 (language/tibet-util.el). ;; Author: Toru TOMABECHI, ;; Created: Feb. 17. 1997 -;; History: +;;; History: ;; 1997.03.13 Modification in treatment of text properties; ;; Support for some special signs and punctuations. ;; 1999.10.25 Modification for a new composition way by K.Handa. +;;; Commentary: + ;;; Code: ;;;###autoload @@ -352,4 +354,4 @@ (provide 'tibet-util) -;;; language/tibet-util.el ends here. +;;; tibet-util.el ends here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/tibetan.el --- a/lisp/mule/tibetan.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/tibetan.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,6 +1,7 @@ -;;; tibetan.el --- Support for Tibetan language -*- coding: iso-2022-7bit; -*- +;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN. +;; Copyright (C) 2002 Ben Wing. ;; Licensed to the Free Software Foundation. ;; Keywords: multilingual, Tibetan @@ -22,7 +23,7 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/tibetan.el). +;;; Synched up with: Emacs 21.1 (language/tibetan.el). ;; Author: Toru TOMABECHI, @@ -31,6 +32,8 @@ ;; History: ;; 1997.03.13 Modification for special signs and punctuations. +;;; Commentary: + ;;; Code: ;;; Tibetan Character set. @@ -81,6 +84,32 @@ ;;;2570 $(7%p(B $(7%q(B $(7%r(B $(7%s(B $(7%t(B $(7%u(B $(7%v(B $(7%w(B $(7%x(B $(7%y(B $(7%z(B $(7%{(B $(7%|(B $(7%}(B $(7%~(B // ; ;;; +(make-charset 'tibetan-1-column "Tibetan 1 column glyph" + '(dimension + 2 + registry "MuleTibetan-1" + chars 94 + columns 1 + direction l2r + final ?8 + graphic 0 + short-name "Tibetan 1-col" + long-name "Tibetan 1 column" + )) + +;; Tibetan script. +(make-charset 'tibetan "Tibetan characters" + '(dimension + 2 + registry "MuleTibetan-2" + chars 94 + columns 2 + direction l2r + final ?7 + graphic 0 + short-name "Tibetan 2-col" + long-name "Tibetan 2 column" + )) ; (make-coding-system ; 'tibetan-iso-8bit 2 ?Q @@ -129,8 +158,10 @@ "Regexp matching a composable sequence of Tibetan characters.") ;; Register a function to compose Tibetan characters. -(aset composition-function-table (make-char 'tibetan) - (list (cons tibetan-composable-pattern 'tibetan-composition-function))) +(put-char-table 'tibetan + (list (cons tibetan-composable-pattern + 'tibetan-composition-function)) + composition-function-table) ;;; ;;; Definitions of conversion data. @@ -637,4 +668,4 @@ (provide 'tibetan) -;;; language/tibetan.el ends here +;;; tibetan.el ends here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/viet-chars.el --- a/lisp/mule/viet-chars.el Fri Mar 15 11:00:56 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -;;; vietnamese-chars.el --- pre-loaded support for Vietnamese, part 1. -*- coding: iso-2022-7bit; -*- - -;; Copyright (C) 1992,93,94,95 Free Software Foundation, Inc. -;; Copyright (C) 1995 Amdahl Corporation. -;; Copyright (C) 1995 Sun Microsystems. - -;; 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. - -;;; Synched up with: Mule 2.3. - -;; We have to split up the Vietnamese stuff into two files because -;; we are registering new charsets and then immediately using characters -;; from those sets. We cannot reliably expect this to work if they -;; are in the same file because of the buffering that happens while -;; reading -- the place where we use the newly-defined sets may be -;; read in before the code that creates those sets is evaluated. - -;; Vietnamese VISCII with two tables. -(make-charset 'vietnamese-viscii-lower "VISCII lower (Vietnamese)" - '(registry "VISCII1.1" - dimension 1 - chars 96 - final ?1 - graphic 1 - )) - -(make-charset 'vietnamese-viscii-upper "VISCII upper (Vietnamese)" - '(registry "VISCII1.1" - dimension 1 - chars 96 - final ?2 - graphic 1 - )) - -(modify-syntax-entry 'vietnamese-viscii-lower "w") -(modify-syntax-entry 'vietnamese-viscii-upper "w") - -(define-category ?v "Vietnamese character.") -(modify-category-entry 'vietnamese-viscii-lower ?v) -(modify-category-entry 'vietnamese-viscii-upper ?v) - -;;; vietnamese-chars.el ends here diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/viet-util.el --- a/lisp/mule/viet-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/viet-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,4 +1,4 @@ -;;; viet-util.el --- utilities for Vietnamese -*- coding: iso-2022-7bit; -*- +;;; viet-util.el --- utilities for Vietnamese -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. @@ -22,7 +22,7 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/viet-util.el). +;;; Synched up with: Emacs 21.1 (language/viet-util.el). ;;; Commentary: @@ -40,8 +40,7 @@ ;;;###autoload (defun viet-encode-viscii-char (char) "Return VISCII character code of CHAR if appropriate." - (aref (char-table-extra-slot viet-viscii-nonascii-translation-table 0) - char)) + (get-char-table char viet-viscii-nonascii-translation-table)) ;; VIQR is a menmonic encoding specification for Vietnamese. ;; It represents diacritical marks by ASCII characters as follows: diff -r e65d9cf16707 -r 2923009caf47 lisp/mule/vietnamese.el --- a/lisp/mule/vietnamese.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/vietnamese.el Sat Mar 16 10:39:19 2002 +0000 @@ -29,6 +29,43 @@ ;;; Code: +;; Vietnamese VISCII. VISCII is 1-byte character set which contains +;; more than 96 characters. Since Emacs can't handle it as one +;; character set, it is divided into two: lower case letters and upper +;; case letters. +(make-charset 'vietnamese-viscii-lower "VISCII1.1 lower-case" + '(dimension + 1 + registry "VISCII1.1" + chars 96 + columns 1 + direction l2r + final ?1 + graphic 1 + short-name "VISCII lower" + long-name "VISCII lower-case" + )) + +(make-charset 'vietnamese-viscii-upper "VISCII1.1 upper-case" + '(dimension + 1 + registry "VISCII1.1" + chars 96 + columns 1 + direction l2r + final ?2 + graphic 1 + short-name "VISCII upper" + long-name "VISCII upper-case" + )) + +(modify-syntax-entry 'vietnamese-viscii-lower "w") +(modify-syntax-entry 'vietnamese-viscii-upper "w") + +(define-category ?v "Vietnamese character.") +(modify-category-entry 'vietnamese-viscii-lower ?v) +(modify-category-entry 'vietnamese-viscii-upper ?v) + (eval-and-compile (defvar viet-viscii-decode-table diff -r e65d9cf16707 -r 2923009caf47 lisp/printer.el --- a/lisp/printer.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/printer.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,6 +1,6 @@ ;;; printer.el --- support for hard-copy printing in XEmacs -;; Copyright (C) 2000 Ben Wing. +;; Copyright (C) 2000, 2002 Ben Wing. ;; Copyright (C) 2000 Kirill Katsnelson. ;; Maintainer: XEmacs Development Team @@ -227,13 +227,16 @@ (props (condition-case err (make-dialog-box 'page-setup :device d - :properties default-msprinter-frame-plist) + :properties (declare-boundp + default-msprinter-frame-plist)) (error (Printer-clear-device) (signal (car err) (cdr err)))))) (while props - (setq default-msprinter-frame-plist - (plist-put default-msprinter-frame-plist (car props) (cadr props))) + (with-boundp 'default-msprinter-frame-plist + (setq default-msprinter-frame-plist + (plist-put default-msprinter-frame-plist (car props) + (cadr props)))) (setq props (cddr props))))) (defun generic-print-buffer (&optional buffer display-print-dialog) @@ -350,7 +353,9 @@ :printer-name (or (plist-get props 'name) printer-name - (mswindows-get-default-printer)))) + (declare-fboundp + (mswindows-get-default-printer) + )))) header-window footer-window) diff -r e65d9cf16707 -r 2923009caf47 lisp/startup.el --- a/lisp/startup.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/startup.el Sat Mar 16 10:39:19 2002 +0000 @@ -487,7 +487,7 @@ (princ "\n\n" stream))) (when (not suppress-early-error-handler-backtrace) (backtrace stream t))) - (if (fboundp 'mswindows-message-box) + (if-fboundp 'mswindows-message-box (mswindows-message-box "Initialization error")) (kill-emacs -1)) diff -r e65d9cf16707 -r 2923009caf47 lisp/unicode.el --- a/lisp/unicode.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/unicode.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,6 +1,6 @@ ;;; unicode.el --- Unicode support -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001 Ben Wing. +;; Copyright (C) 2001, 2002 Ben Wing. ;; Keywords: multilingual, Unicode @@ -29,6 +29,53 @@ ;;; Code: +; ;; Subsets of Unicode. + +; (make-charset 'mule-unicode-2500-33ff +; "Unicode characters of the range U+2500..U+33FF." +; '(dimension +; 2 +; registry "ISO10646-1" +; chars 96 +; columns 1 +; direction l2r +; final ?2 +; graphic 0 +; short-name "Unicode subset 2" +; long-name "Unicode subset (U+2500..U+33FF)" +; )) + + +; (make-charset 'mule-unicode-e000-ffff +; "Unicode characters of the range U+E000..U+FFFF." +; '(dimension +; 2 +; registry "ISO10646-1" +; chars 96 +; columns 1 +; direction l2r +; final ?3 +; graphic 0 +; short-name "Unicode subset 3" +; long-name "Unicode subset (U+E000+FFFF)" +; )) + + +; (make-charset 'mule-unicode-0100-24ff +; "Unicode characters of the range U+0100..U+24FF." +; '(dimension +; 2 +; registry "ISO10646-1" +; chars 96 +; columns 1 +; direction l2r +; final ?1 +; graphic 0 +; short-name "Unicode subset" +; long-name "Unicode subset (U+0100..U+24FF)" +; )) + + ;; NOTE: This takes only a fraction of a second on my Pentium III ;; 700Mhz even with a totally optimization-disabled XEmacs. (defun load-unicode-tables () @@ -70,6 +117,7 @@ ;; "GB12345.TXT" ("GB2312.TXT" chinese-gb2312) ;; "HANGUL.TXT" + ("JIS0201.TXT" latin-jisx0201 #x21 #x80) ("JIS0201.TXT" katakana-jisx0201 #xA0 #xFF #x-80) ("JIS0208.TXT" japanese-jisx0208 nil nil nil ignore-first-column) ("JIS0212.TXT" japanese-jisx0212) diff -r e65d9cf16707 -r 2923009caf47 man/ChangeLog --- a/man/ChangeLog Fri Mar 15 11:00:56 2002 +0000 +++ b/man/ChangeLog Sat Mar 16 10:39:19 2002 +0000 @@ -1,3 +1,8 @@ +2002-03-14 Jonathan Harris + + * cl.texi (Sequence Basics): Avoid splitting link over two lines, + which makes cygwin texinfo 4.0 unhappy. + 2002-03-15 Ben Wing * Makefile (new-users-guide-srcs): diff -r e65d9cf16707 -r 2923009caf47 man/cl.texi --- a/man/cl.texi Fri Mar 15 11:00:56 2002 +0000 +++ b/man/cl.texi Sat Mar 16 10:39:19 2002 +0000 @@ -3755,10 +3755,9 @@ @node Sequence Basics, Mapping over Sequences, Sequences, Sequences @section Sequence Basics -@noindent -Many of the sequence functions take keyword arguments; @pxref{Argument -Lists}. All keyword arguments are optional and, if specified, -may appear in any order. +@noindent Many of the sequence functions take keyword arguments; +@pxref{Argument Lists}. All keyword arguments are optional and, if +specified, may appear in any order. The @code{:key} argument should be passed either @code{nil}, or a function of one argument. This key function is used as a filter diff -r e65d9cf16707 -r 2923009caf47 nt/.cvsignore --- a/nt/.cvsignore Fri Mar 15 11:00:56 2002 +0000 +++ b/nt/.cvsignore Sat Mar 16 10:39:19 2002 +0000 @@ -4,4 +4,5 @@ xemacs.plg obj make-docfile.out +*.tmp diff -r e65d9cf16707 -r 2923009caf47 nt/ChangeLog --- a/nt/ChangeLog Fri Mar 15 11:00:56 2002 +0000 +++ b/nt/ChangeLog Sat Mar 16 10:39:19 2002 +0000 @@ -1,3 +1,8 @@ +2002-03-16 Ben Wing + + * .cvsignore: + Those pesky *.tmp files. + 2002-03-15 Ben Wing * xemacs.mak: diff -r e65d9cf16707 -r 2923009caf47 src/ChangeLog --- a/src/ChangeLog Fri Mar 15 11:00:56 2002 +0000 +++ b/src/ChangeLog Sat Mar 16 10:39:19 2002 +0000 @@ -1,3 +1,68 @@ +2002-03-16 Ben Wing + + * cm.c (cmgoto): + * file-coding.c: + * file-coding.c (detection_result_symbol_to_number): + fix warnings. + +2002-03-16 IKEYAMA Tomonori + + * unicode.c (add_charsets_to_precedence_list): Fix passing wrong + argument to XCHARSET_LEADING_BYTE. + +2002-03-15 Jonathan Harris + + * intl-encap-win32.c (copy_shfileinfoa_to_shfileinfow): + Take size parameter and assert it's big enough. + * intl-encap-win32.c (qxeSHGetFileInfo): + Deal with the case where no fileinfo structure is passed in. + +2002-03-14 Jonathan Harris + + * intl-encap-win32.c: Remove EncryptFile, DecryptFile & + mciGetDeviceIDFromElementID - APIs are not available on Win98 + * intl-auto-encap-win32.c: ditto + * intl-auto-encap-win32.h: ditto + * intl-encap-win32.c: Remove 'dir' command. + +2002-03-13 William M. Perry + + * ui-gtk.c (__allocate_object_storage): Make static to avoid + warnings. + (type_to_marshaller_type): Ditto. + + * symsinit.h: Added some missing *_gtk_* functions to avoid + warnings. + + * select-gtk.c: Add extern definitions of lisp_to_time and + time_to_lisp to avoid warnings. + + * redisplay-gtk.c (gtk_flash): reorder select/poll stuff to avoid + warning about 'poll' being implicitly defined. Mirrors change + made to redisplay-x.c some time ago. + (gtk_bevel_area): Fix unused variable warning. + + * gtk-xemacs.c (smash_face_fallbacks): ifdef this out to avoid + warnings. + + * glyphs-gtk.c (write_lisp_string_to_temp_file): Fix 'grpro3' + typo. + (gtk_locate_pixmap_file): Use split_external_path instead of + decode_path. + + * gccache-gtk.c (gc_cache_hash): Fix signed/unsigned warning. + + * event-gtk.c: event-mods.h no longer needed. event-gtk.h is. + + * emacs-marshals.c (our_string_hash): Make this function static to + avoid warnings. + + * device-gtk.c (gtk_event_name): Fix signed/unsigned warning. + + * event-gtk.h: New header file to hold declarations from + event-gtk.c that are used in other files. The quest to remove + compilation warnings from GTK files begins. + 2002-03-15 Ben Wing * config.h.in: diff -r e65d9cf16707 -r 2923009caf47 src/cm.c --- a/src/cm.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/cm.c Sat Mar 16 10:39:19 2002 +0000 @@ -255,7 +255,7 @@ #define USELL 2 #define USECR 3 -#if OLD_CURSOR_MOTION_SHIT +#ifdef OLD_CURSOR_MOTION_SHIT void cmgoto (struct frame *f, int row, int col) { diff -r e65d9cf16707 -r 2923009caf47 src/console-gtk.h --- a/src/console-gtk.h Fri Mar 15 11:00:56 2002 +0000 +++ b/src/console-gtk.h Sat Mar 16 10:39:19 2002 +0000 @@ -235,5 +235,20 @@ extern Lisp_Object Vgtk_initial_argv_list; /* #### ugh! */ const char *gtk_event_name (GdkEventType event_type); + +void reinit_console_type_create_gtk (void); + +void emacs_gtk_selection_handle (GtkWidget *, + GtkSelectionData *selection_data, + guint info, + guint time_stamp, + gpointer data); +void emacs_gtk_selection_clear_event_handle (GtkWidget *widget, + GdkEventSelection *event, + gpointer data); +void emacs_gtk_selection_received (GtkWidget *widget, + GtkSelectionData *selection_data, + gpointer user_data); + #endif /* HAVE_GTK */ #endif /* _XEMACS_DEVICE_X_H_ */ diff -r e65d9cf16707 -r 2923009caf47 src/depend --- a/src/depend Fri Mar 15 11:00:56 2002 +0000 +++ b/src/depend Sat Mar 16 10:39:19 2002 +0000 @@ -9,7 +9,7 @@ #if defined(HAVE_MS_WINDOWS) console-msw.o: $(LISP_H) conslots.h console-msw.h console.h events.h intl-auto-encap-win32.h opaque.h systime.h syswindows.h device-msw.o: $(LISP_H) charset.h conslots.h console-msw.h console-stream.h console.h device.h devslots.h events.h faces.h frame.h frameslots.h glyphs.h gui.h intl-auto-encap-win32.h objects-msw.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h systime.h syswindows.h toolbar.h window.h winslots.h -dialog-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-msw.h console.h device.h devslots.h frame.h frameslots.h glyphs.h gui.h intl-auto-encap-win32.h opaque.h redisplay.h scrollbar.h specifier.h syswindows.h toolbar.h window.h winslots.h +dialog-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-msw.h console.h device.h devslots.h frame.h frameslots.h glyphs.h gui.h intl-auto-encap-win32.h opaque.h redisplay.h scrollbar.h specifier.h sysfile.h syswindows.h toolbar.h window.h winslots.h dired-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h intl-auto-encap-win32.h ndir.h regex.h sysdir.h sysfile.h sysfloat.h sysproc.h syspwd.h systime.h syswindows.h event-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-msw.h console-tty.h console.h device.h devslots.h dragdrop.h events.h faces.h frame.h frameslots.h glyphs.h gui.h intl-auto-encap-win32.h lstream.h menubar-msw.h menubar.h objects-msw.h objects.h process.h redisplay.h scrollbar-msw.h scrollbar.h specifier.h sysdep.h sysfile.h sysproc.h syssignal.h systime.h systty.h syswait.h syswindows.h toolbar.h window.h winslots.h frame-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-msw.h console.h device.h devslots.h elhash.h events.h faces.h frame.h frameslots.h glyphs-msw.h glyphs.h gui.h intl-auto-encap-win32.h redisplay.h scrollbar.h specifier.h systime.h syswindows.h toolbar.h window.h winslots.h @@ -36,7 +36,7 @@ redisplay-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h EmacsFrameP.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-x.h console.h debug.h device.h devslots.h faces.h file-coding.h frame.h frameslots.h glyphs-x.h glyphs.h gui.h gutter.h mule-ccl.h objects-x.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h sysproc.h systime.h toolbar.h window.h winslots.h xgccache.h xintrinsic.h xintrinsicp.h xmprimitivep.h scrollbar-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h conslots.h console-x.h console.h device.h devslots.h frame.h frameslots.h glyphs-x.h glyphs.h gui-x.h gui.h redisplay.h scrollbar-x.h scrollbar.h specifier.h toolbar.h window.h winslots.h xintrinsic.h select-x.o: $(LISP_H) charset.h conslots.h console-x.h console.h device.h devslots.h frame.h frameslots.h glyphs.h gui.h objects-x.h objects.h opaque.h redisplay.h scrollbar.h select-common.h select.h specifier.h systime.h toolbar.h window.h winslots.h xintrinsic.h -toolbar-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h EmacsFrameP.h charset.h conslots.h console-x.h console.h device.h devslots.h faces.h frame.h frameslots.h glyphs-x.h glyphs.h gui.h objects-x.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h xintrinsic.h xintrinsicp.h xmprimitivep.h +toolbar-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h EmacsFrameP.h charset.h conslots.h console-x.h console.h device.h devslots.h faces.h frame.h frameslots.h glyphs-x.h glyphs.h gui.h objects-x.h objects.h redisplay.h scrollbar.h specifier.h toolbar-common.h toolbar.h window.h winslots.h xintrinsic.h xintrinsicp.h xmprimitivep.h #endif #if defined(HAVE_TTY) console-tty.o: $(LISP_H) charset.h conslots.h console-stream.h console-tty.h console.h device.h devslots.h faces.h file-coding.h frame.h frameslots.h glyphs.h gui.h lstream.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h syssignal.h systty.h toolbar.h window.h winslots.h @@ -50,7 +50,7 @@ console-gtk.o: $(LISP_H) conslots.h console-gtk.h console.h process.h redisplay.h device-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h device.h devslots.h elhash.h events.h faces.h frame.h frameslots.h gccache-gtk.h glyphs-gtk.h glyphs.h gtk-xemacs.h gui.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systime.h toolbar.h window.h winslots.h dialog-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-gtk.h console.h device.h devslots.h events.h frame.h frameslots.h glyphs.h gui-gtk.h gui.h opaque.h redisplay.h scrollbar.h specifier.h systime.h toolbar.h window.h winslots.h -event-gtk.o: $(LISP_H) blocktype.h buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-gtk.h console-tty.h console.h device.h devslots.h dragdrop.h elhash.h events-mod.h events.h file-coding.h frame.h frameslots.h glyphs.h gtk-xemacs.h gui.h lstream.h objects-gtk.h objects.h offix-types.h offix.h process.h redisplay.h scrollbar.h specifier.h sysproc.h syssignal.h systime.h systty.h toolbar.h window.h winslots.h xintrinsic.h +event-gtk.o: $(LISP_H) blocktype.h buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-gtk.h console-tty.h console.h device.h devslots.h dragdrop.h elhash.h event-gtk.h events.h file-coding.h frame.h frameslots.h glyphs.h gtk-xemacs.h gui.h lstream.h objects-gtk.h objects.h offix-types.h offix.h process.h redisplay.h scrollbar.h specifier.h sysproc.h syssignal.h systime.h systty.h toolbar.h window.h winslots.h xintrinsic.h frame-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h device.h devslots.h dragdrop.h events.h extents.h faces.h frame.h frameslots.h glyphs-gtk.h glyphs.h gtk-xemacs.h gui.h objects-gtk.h objects.h redisplay.h scrollbar-gtk.h scrollbar.h specifier.h sysdll.h systime.h toolbar.h ui-gtk.h window.h winslots.h gccache-gtk.o: $(LISP_H) gccache-gtk.h hash.h glyphs-gtk.o: $(LISP_H) bitmaps.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h device.h devslots.h faces.h file-coding.h frame.h frameslots.h glyphs-gtk.h glyphs.h gui-gtk.h gui.h imgproc.h insdel.h lstream.h objects-gtk.h objects.h opaque.h redisplay.h scrollbar.h specifier.h sysdll.h sysfile.h toolbar.h ui-gtk.h window.h winslots.h @@ -60,8 +60,8 @@ redisplay-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h debug.h device.h devslots.h faces.h file-coding.h frame.h frameslots.h gccache-gtk.h glyphs-gtk.h glyphs.h gui.h gutter.h mule-ccl.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h sysproc.h systime.h toolbar.h window.h winslots.h scrollbar-gtk.o: $(LISP_H) conslots.h console-gtk.h console.h device.h devslots.h frame.h frameslots.h glyphs-gtk.h glyphs.h gui-gtk.h gui.h redisplay.h scrollbar-gtk.h scrollbar.h specifier.h toolbar.h window.h winslots.h select-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h device.h devslots.h events.h frame.h frameslots.h glyphs.h gui.h opaque.h redisplay.h scrollbar.h select-common.h select.h specifier.h systime.h toolbar.h window.h winslots.h -toolbar-gtk.o: $(LISP_H) charset.h conslots.h console-gtk.h console.h device.h devslots.h faces.h frame.h frameslots.h gccache-gtk.h glyphs-gtk.h glyphs.h gtk-xemacs.h gui.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h -ui-gtk.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h device.h devslots.h elhash.h emacs-marshals.c emacs-widget-accessors.c events.h faces.h glade.c glyphs-gtk.h glyphs.h gtk-glue.c gui-gtk.h gui.h hash.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h sysdll.h systime.h ui-byhand.c ui-gtk.h window.h winslots.h +toolbar-gtk.o: $(LISP_H) conslots.h console-gtk.h console.h device.h devslots.h frame.h frameslots.h glyphs.h gui.h redisplay.h scrollbar.h specifier.h toolbar-common.h toolbar.h window.h winslots.h +ui-gtk.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h conslots.h console-gtk.h console.h device.h devslots.h elhash.h emacs-marshals.c emacs-widget-accessors.c event-gtk.h events.h faces.h glade.c glyphs-gtk.h glyphs.h gtk-glue.c gui-gtk.h gui.h hash.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h sysdll.h systime.h ui-byhand.c ui-gtk.h window.h winslots.h #endif #if defined(HAVE_DATABASE) database.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h database.h sysfile.h @@ -148,7 +148,7 @@ gmalloc.o: $(LISP_H) getpagesize.h sysdep.h gpmevent.o: $(LISP_H) commands.h conslots.h console-tty.h console.h device.h devslots.h events.h gpmevent.h lstream.h process.h sysdep.h sysproc.h syssignal.h systime.h systty.h gtk-glue.o: -gtk-xemacs.o: $(LISP_H) charset.h conslots.h console-gtk.h console.h device.h devslots.h faces.h frame.h frameslots.h glyphs.h gtk-xemacs.h gui.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h +gtk-xemacs.o: $(LISP_H) charset.h conslots.h console-gtk.h console.h device.h devslots.h event-gtk.h faces.h frame.h frameslots.h glyphs.h gtk-xemacs.h gui.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h gui.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h elhash.h gui.h gutter.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console.h device.h devslots.h faces.h frame.h frameslots.h glyphs.h gui.h gutter.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h hash.o: $(LISP_H) hash.h @@ -221,6 +221,7 @@ terminfo.o: config.h tests.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h elhash.h lstream.h opaque.h text.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h file-coding.h lstream.h +toolbar-common.o: $(LISP_H) charset.h conslots.h console-gtk.h console-x.h console.h device.h devslots.h faces.h frame.h frameslots.h glyphs.h gui.h redisplay.h scrollbar.h specifier.h toolbar-common.h toolbar.h window.h winslots.h xintrinsic.h toolbar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console.h device.h devslots.h frame.h frameslots.h glyphs.h gui.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h tooltalk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h elhash.h process.h syssignal.h tooltalk.h tparam.o: $(LISP_H) diff -r e65d9cf16707 -r 2923009caf47 src/device-gtk.c --- a/src/device-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/device-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -121,18 +121,6 @@ extern void gdk_imlib_init(void); #endif -extern void emacs_gtk_selection_handle (GtkWidget *, - GtkSelectionData *selection_data, - guint info, - guint time_stamp, - gpointer data); -extern void emacs_gtk_selection_clear_event_handle (GtkWidget *widget, - GdkEventSelection *event, - gpointer data); -extern void emacs_gtk_selection_received (GtkWidget *widget, - GtkSelectionData *selection_data, - gpointer user_data); - #ifdef HAVE_BONOBO static CORBA_ORB orb; #endif @@ -399,7 +387,7 @@ { GtkEnumValue *vals = gtk_type_enum_get_values (GTK_TYPE_GDK_EVENT_TYPE); - while (vals && (vals->value != event_type)) vals++; + while (vals && ((GdkEventType)(vals->value) != event_type)) vals++; if (vals) return (vals->value_nick); diff -r e65d9cf16707 -r 2923009caf47 src/emacs-marshals.c --- a/src/emacs-marshals.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/emacs-marshals.c Sat Mar 16 10:39:19 2002 +0000 @@ -1467,7 +1467,7 @@ return !strcmp ( (const char *) st1, (const char *) st2); } -unsigned long +static unsigned long our_string_hash (const void *xv) { unsigned int h = 0; diff -r e65d9cf16707 -r 2923009caf47 src/event-gtk.c --- a/src/event-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/event-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -60,9 +60,9 @@ #include "offix.h" #endif -#include "events-mod.h" +#include -#include +#include "event-gtk.h" static struct event_stream *gtk_event_stream; diff -r e65d9cf16707 -r 2923009caf47 src/event-gtk.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/event-gtk.h Sat Mar 16 10:39:19 2002 +0000 @@ -0,0 +1,37 @@ +/* Header file for miscellaneous event functions for GTK. + Copyright (C) 2002 William Perry. + +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. */ + +#ifndef __EVENT_GTK_H__ +#define __EVENT_GTK_H__ + +int gtk_event_to_emacs_event (struct frame *frame, + GdkEvent *gdk_event, + struct Lisp_Event *emacs_event); + +gint emacs_gtk_key_event_handler(GtkWidget *widget, GdkEventKey *event); +gint emacs_gtk_button_event_handler(GtkWidget *widget, GdkEventButton *event); +gint emacs_gtk_motion_event_handler (GtkWidget *widget, GdkEventMotion *event); + +gboolean emacs_shell_event_handler (GtkWidget *wid /* unused */, + GdkEvent *event, + gpointer closure); +void reinit_vars_of_event_gtk (void); + +#endif /* __EVENT-GTK_H__ */ diff -r e65d9cf16707 -r 2923009caf47 src/file-coding.c --- a/src/file-coding.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/file-coding.c Sat Mar 16 10:39:19 2002 +0000 @@ -3429,6 +3429,7 @@ return Qnil; /* (usually) not reached */ } +#if 0 /* not used */ static enum detection_result detection_result_symbol_to_number (Lisp_Object symbol) { @@ -3445,6 +3446,7 @@ invalid_constant ("Unrecognized detection result", symbol); return ((enum detection_result) 0); /* not reached */ } +#endif /* 0 */ /* Set all detection results for a given detector to a specified value. */ void diff -r e65d9cf16707 -r 2923009caf47 src/gccache-gtk.c --- a/src/gccache-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/gccache-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -97,7 +97,7 @@ const struct gcv_and_mask *gcvm = (const struct gcv_and_mask *) arg; unsigned long *longs = (unsigned long *) &gcvm->gcv; unsigned long hash = gcvm->mask; - int i; + unsigned int i; /* This could look at the mask and only use the used slots in the hash code. That would win in that we wouldn't have to initialize every slot of the gcv when calling gc_cache_lookup. But we need diff -r e65d9cf16707 -r 2923009caf47 src/glyphs-gtk.c --- a/src/glyphs-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/glyphs-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -574,7 +574,7 @@ if (NILP (Vgtk_bitmap_file_path)) { Vgtk_bitmap_file_path = nconc2 (Vgtk_bitmap_file_path, - (decode_path (BITMAPDIR))); + (split_external_path (BITMAPDIR))); } { @@ -1090,10 +1090,9 @@ static Extbyte_dynarr *conversion_out_dynarr; Bytecount bstart, bend; Lisp_Object tempfile; - struct gcpro gcpro1, gcpro2, grpro3; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; Lisp_Object conv_out_stream; Lstream *costr; - struct gcpro gcpro4; /* This function can GC */ if (!conversion_out_dynarr) diff -r e65d9cf16707 -r 2923009caf47 src/gtk-glue.c --- a/src/gtk-glue.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/gtk-glue.c Sat Mar 16 10:39:19 2002 +0000 @@ -225,8 +225,6 @@ return (style); } -extern int gtk_event_to_emacs_event (struct frame *, GdkEvent *, struct Lisp_Event *); - static Lisp_Object gdk_event_to_emacs_event(GdkEvent *ev) { diff -r e65d9cf16707 -r 2923009caf47 src/gtk-xemacs.c --- a/src/gtk-xemacs.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/gtk-xemacs.c Sat Mar 16 10:39:19 2002 +0000 @@ -15,6 +15,7 @@ #include "gtk-xemacs.h" #include "window.h" #include "faces.h" +#include "event-gtk.h" extern Lisp_Object Vmodeline_face; extern Lisp_Object Vscrollbar_on_left_p; @@ -58,10 +59,6 @@ static GtkWidgetClass *parent_class; -extern gint emacs_gtk_button_event_handler(GtkWidget *widget, GdkEventButton *event); -extern gint emacs_gtk_key_event_handler(GtkWidget *widget, GdkEventKey *event); -extern gint emacs_gtk_motion_event_handler(GtkWidget *widget, GdkEventMotion *event); - static void gtk_xemacs_class_init (GtkXEmacsClass *class) { @@ -135,6 +132,7 @@ #define convert_font(f) __get_gtk_font_truename (f, 0) +#ifdef SMASH_FACE_FALLBACKS static void smash_face_fallbacks (struct frame *f, GtkStyle *style) { @@ -176,6 +174,7 @@ #undef FROB #undef FROB_FACE } +#endif /* SMASH_FACE_FALLBACKS */ #ifdef HAVE_SCROLLBARS static void @@ -235,7 +234,7 @@ if (x->f) { __nuke_background_items (widget); -#if 0 +#ifdef SMASH_FACE_FALLBACKS smash_face_fallbacks (x->f, new_style); #endif #ifdef HAVE_SCROLLBARS diff -r e65d9cf16707 -r 2923009caf47 src/intl-auto-encap-win32.c --- a/src/intl-auto-encap-win32.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/intl-auto-encap-win32.c Sat Mar 16 10:39:19 2002 +0000 @@ -2485,14 +2485,7 @@ #if !defined (MINGW) -MCIDEVICEID -qxemciGetDeviceIDFromElementID (DWORD dwElementID, const Extbyte * lpstrType) -{ - if (XEUNICODE_P) - return mciGetDeviceIDFromElementIDW (dwElementID, (LPCWSTR) lpstrType); - else - return mciGetDeviceIDFromElementIDA (dwElementID, (LPCSTR) lpstrType); -} +/* Error if mciGetDeviceIDFromElementID used: missing from Win98se version of ADVAPI32.dll */ #endif /* !defined (MINGW) */ @@ -2575,27 +2568,13 @@ #if !defined (CYGWIN_HEADERS) -BOOL -qxeEncryptFile (const Extbyte * lpFileName) -{ - if (XEUNICODE_P) - return EncryptFileW ((LPCWSTR) lpFileName); - else - return EncryptFileA ((LPCSTR) lpFileName); -} +/* Error if EncryptFile used: Win2K+ only */ #endif /* !defined (CYGWIN_HEADERS) */ #if !defined (CYGWIN_HEADERS) -BOOL -qxeDecryptFile (const Extbyte * lpFileName, DWORD dwReserved) -{ - if (XEUNICODE_P) - return DecryptFileW ((LPCWSTR) lpFileName, dwReserved); - else - return DecryptFileA ((LPCSTR) lpFileName, dwReserved); -} +/* Error if DecryptFile used: Win2K+ only */ #endif /* !defined (CYGWIN_HEADERS) */ @@ -3789,11 +3768,11 @@ return SHGetPathFromIDListA (pidl, (LPSTR) pszPath); } -/* Skipping SHGetSpecialFolderPath because error in Cygwin prototype */ +/* Skipping SHGetSpecialFolderPath because error in Cygwin prototype, missing from Cygwin libraries */ /* Skipping SHBrowseForFolder because need to intercept callback for SendMessage */ -/* Skipping SHGetDataFromIDList because split-sized WIN32_FIND_DATA or split-simple NETRESOURCE */ +/* Skipping SHGetDataFromIDList because split-sized WIN32_FIND_DATA or split-simple NETRESOURCE, missing from Cygwin libraries */ /*----------------------------------------------------------------------*/ diff -r e65d9cf16707 -r 2923009caf47 src/intl-auto-encap-win32.h --- a/src/intl-auto-encap-win32.h Fri Mar 15 11:00:56 2002 +0000 +++ b/src/intl-auto-encap-win32.h Sat Mar 16 10:39:19 2002 +0000 @@ -654,7 +654,8 @@ MCIERROR qxemciSendString (const Extbyte * lpstrCommand, Extbyte * lpstrReturnString, UINT uReturnLength, HWND hwndCallback); MCIDEVICEID qxemciGetDeviceID (const Extbyte * pszDevice); #if !defined (MINGW) -MCIDEVICEID qxemciGetDeviceIDFromElementID (DWORD dwElementID, const Extbyte * lpstrType); +#undef mciGetDeviceIDFromElementID +#define mciGetDeviceIDFromElementID error missing from Win98se version of ADVAPI32.dll #endif /* !defined (MINGW) */ BOOL qxemciGetErrorString (MCIERROR mcierr, Extbyte * pszText, UINT cchText); @@ -668,10 +669,12 @@ DWORD qxeFormatMessage (DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dwLanguageId, Extbyte * lpBuffer, DWORD nSize, va_list * Arguments); HANDLE qxeCreateMailslot (const Extbyte * lpName, DWORD nMaxMessageSize, DWORD lReadTimeout, LPSECURITY_ATTRIBUTES lpSecurityAttributes); #if !defined (CYGWIN_HEADERS) -BOOL qxeEncryptFile (const Extbyte * lpFileName); +#undef EncryptFile +#define EncryptFile error Win2K+ only #endif /* !defined (CYGWIN_HEADERS) */ #if !defined (CYGWIN_HEADERS) -BOOL qxeDecryptFile (const Extbyte * lpFileName, DWORD dwReserved); +#undef DecryptFile +#define DecryptFile error Win2K+ only #endif /* !defined (CYGWIN_HEADERS) */ #undef OpenRaw #define OpenRaw error error "The procedure entry point OpenRawW could not be located in the dynamic link library ADVAPI32.dll." @@ -838,9 +841,9 @@ /* Processing file SHLOBJ.H */ BOOL qxeSHGetPathFromIDList (LPCITEMIDLIST pidl, Extbyte * pszPath); -/* Skipping SHGetSpecialFolderPath because error in Cygwin prototype */ +/* Skipping SHGetSpecialFolderPath because error in Cygwin prototype, missing from Cygwin libraries */ /* Skipping SHBrowseForFolder because need to intercept callback for SendMessage */ -/* Skipping SHGetDataFromIDList because split-sized WIN32_FIND_DATA or split-simple NETRESOURCE */ +/* Skipping SHGetDataFromIDList because split-sized WIN32_FIND_DATA or split-simple NETRESOURCE, missing from Cygwin libraries */ /* Processing file IME.H */ diff -r e65d9cf16707 -r 2923009caf47 src/intl-encap-win32.c --- a/src/intl-encap-win32.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/intl-encap-win32.c Sat Mar 16 10:39:19 2002 +0000 @@ -159,7 +159,6 @@ \(The following is copied from lib-src/make-mswin-unicode.pl.) -dir sets the directory for include files. file specifies a file to start reading from. yes indicates a function to be automatically Unicode-encapsulated. (All parameters either need no special processing or are LPTSTR or @@ -191,10 +190,6 @@ cd $(SRC) perl ../lib-src/make-mswin-unicode.pl --c-output intl-auto-encap-win32.c --h-output intl-auto-encap-win32.h intl-encap-win32.c -NOTE: If your copy of VC++ is not in the directory indicated below, you'll -have to change that directive (or create a symlink, provided you're using -Cygwin perl). #### There should be an option to the perl script to specify -this. */ /* @@ -215,8 +210,6 @@ begin-unicode-encapsulation-script -dir c:\Program Files\Microsoft Visual Studio\VC98\Include\ - file WINBASE.H yes GetBinaryType @@ -227,8 +220,8 @@ yes FormatMessage yes CreateMailslot begin-bracket !defined (CYGWIN_HEADERS) -yes EncryptFile -yes DecryptFile +no EncryptFile Win2K+ only +no DecryptFile Win2K+ only end-bracket no OpenRaw error "The procedure entry point OpenRawW could not be located in the dynamic link library ADVAPI32.dll." no QueryRecoveryAgents split-sized LPRECOVERY_AGENT_INFORMATION @@ -957,7 +950,7 @@ yes mciSendString yes mciGetDeviceID begin-bracket !defined (MINGW) -yes mciGetDeviceIDFromElementID +no mciGetDeviceIDFromElementID missing from Win98se version of ADVAPI32.dll end-bracket yes mciGetErrorString @@ -1409,7 +1402,7 @@ static void copy_shfileinfoa_to_shfileinfow (const SHFILEINFOA *pa, - SHFILEINFOW *pw) + SHFILEINFOW *pw, UINT sz) { /* the layout of SHFILEINFO is @@ -1418,6 +1411,7 @@ TCHAR szTypeName[...]; */ + assert (sz >= sizeof (SHFILEINFOW)); xzero (*pw); memcpy (pw, pa, offsetof (SHFILEINFOA, szDisplayName)); memcpy (pw->szDisplayName, pa->szDisplayName, sizeof (pa->szDisplayName)); @@ -1437,10 +1431,10 @@ BOOL retval; retval = SHGetFileInfoA ((LPCSTR) pszPath, dwFileAttributes, - (SHFILEINFOA FAR *) &ansidat, sizeof (ansidat), - uFlags); - if (retval) - copy_shfileinfoa_to_shfileinfow (&ansidat, psfi); + (SHFILEINFOA FAR *) &ansidat, + cbFileInfo ? sizeof (ansidat) : 0, uFlags); + if (retval && cbFileInfo) + copy_shfileinfoa_to_shfileinfow (&ansidat, psfi, cbFileInfo); return retval; } } diff -r e65d9cf16707 -r 2923009caf47 src/redisplay-gtk.c --- a/src/redisplay-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/redisplay-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -857,7 +857,7 @@ upos = dl->descent / 2; uthick = 1; - if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip) + if ((dl->ypos + upos) < (dl->ypos + dl->descent - dl->clip)) { if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip) uthick = dl->descent - dl->clip - upos; @@ -1785,9 +1785,6 @@ gdk_flush (); -#ifdef HAVE_POLL - poll (0, 0, 100); -#else /* !HAVE_POLL */ #ifdef HAVE_SELECT { int usecs = 100000; @@ -1798,9 +1795,12 @@ select (0, 0, 0, 0, &tv); } #else +#ifdef HAVE_POLL + poll (0, 0, 100); +#else bite me -#endif /* HAVE_POLL */ -#endif /* HAVE_SELECT */ +#endif +#endif gdk_draw_rectangle (GDK_DRAWABLE (GET_GTK_WIDGET_WINDOW (FRAME_GTK_SHELL_WIDGET (f))), gc, TRUE, w->pixel_left, w->pixel_top, @@ -1817,7 +1817,6 @@ int shadow_thickness, int edges, enum edge_style style) { struct frame *f = XFRAME (w->frame); - struct device *d = XDEVICE (f->device); gtk_output_shadows (f, x, y, width, height, shadow_thickness); } diff -r e65d9cf16707 -r 2923009caf47 src/select-gtk.c --- a/src/select-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/select-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -43,6 +43,9 @@ static gboolean waiting_for_selection; Lisp_Object Vgtk_sent_selection_hooks; +extern int lisp_to_time (Lisp_Object, time_t *); +extern Lisp_Object time_to_lisp (time_t); + static GdkAtom symbol_to_gtk_atom (struct device *d, Lisp_Object sym, int only_if_exists) { diff -r e65d9cf16707 -r 2923009caf47 src/symsinit.h --- a/src/symsinit.h Fri Mar 15 11:00:56 2002 +0000 +++ b/src/symsinit.h Sat Mar 16 10:39:19 2002 +0000 @@ -509,6 +509,8 @@ void syms_of_objects_gtk (void); void syms_of_select_gtk (void); void syms_of_ui_gtk (void); +void syms_of_widget_accessors (void); +void syms_of_ui_byhand (void); void console_type_create_gtk (void); void console_type_create_device_gtk (void); void console_type_create_frame_gtk (void); @@ -533,5 +535,6 @@ void vars_of_ui_gtk (void); void complex_vars_of_glyphs_gtk (void); void init_event_gtk_late (void); +void console_type_create_select_gtk (void); #endif /* INCLUDED_symsinit_h_ */ diff -r e65d9cf16707 -r 2923009caf47 src/ui-gtk.c --- a/src/ui-gtk.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/ui-gtk.c Sat Mar 16 10:39:19 2002 +0000 @@ -22,6 +22,7 @@ #include "hash.h" #include "events.h" #include "elhash.h" +#include "event-gtk.h" /* XEmacs specific GTK types */ #include "gtk-glue.c" @@ -36,7 +37,9 @@ Lisp_Object gtk_type_to_lisp (GtkArg *arg); int lisp_to_gtk_type (Lisp_Object obj, GtkArg *arg); +#if 0 void describe_gtk_arg (GtkArg *arg); +#endif guint symbol_to_enum (Lisp_Object obj, GtkType t); static guint lisp_to_flag (Lisp_Object obj, GtkType t); static Lisp_Object flags_to_list (guint value, GtkType t); @@ -367,7 +370,7 @@ if (freep) xfree(v); \ } while (0) -gpointer __allocate_object_storage (GtkType t) +static gpointer __allocate_object_storage (GtkType t) { size_t s = 0; void *rval = NULL; @@ -437,7 +440,7 @@ return (rval); } -Lisp_Object type_to_marshaller_type (GtkType t) +static Lisp_Object type_to_marshaller_type (GtkType t) { switch (GTK_FUNDAMENTAL_TYPE (t)) { @@ -1363,6 +1366,7 @@ /* Various utility functions */ +#if 0 void describe_gtk_arg (GtkArg *arg) { GtkArg a = *arg; @@ -1441,6 +1445,7 @@ abort(); } } +#endif Lisp_Object gtk_type_to_lisp (GtkArg *arg) { diff -r e65d9cf16707 -r 2923009caf47 src/ui-gtk.h --- a/src/ui-gtk.h Fri Mar 15 11:00:56 2002 +0000 +++ b/src/ui-gtk.h Sat Mar 16 10:39:19 2002 +0000 @@ -71,4 +71,6 @@ #define GTK_BOXEDP(x) RECORDP (x, emacs_gtk_boxed) #define CHECK_GTK_BOXED(x) CHECK_RECORD (x, emacs_gtk_boxed) +extern Lisp_Object build_gtk_boxed (void *obj, GtkType t); + #endif /* __UI_GTK_H__ */ diff -r e65d9cf16707 -r 2923009caf47 src/unicode.c --- a/src/unicode.c Fri Mar 15 11:00:56 2002 +0000 +++ b/src/unicode.c Sat Mar 16 10:39:19 2002 +0000 @@ -979,7 +979,7 @@ EXTERNAL_LIST_LOOP_2 (elt, list) { Lisp_Object charset = Fget_charset (elt); - int lb = XCHARSET_LEADING_BYTE (elt); + int lb = XCHARSET_LEADING_BYTE (charset); if (lbs[lb - MIN_LEADING_BYTE] == 0) { Dynarr_add (unicode_precedence_dynarr, charset);