# HG changeset patch # User Aidan Kehoe # Date 1264518991 0 # Node ID 1e9078742fa76495611106450c7bc1270e5b6455 # Parent 29fb3baea9398850d7f96a82b19b4758d2b9bd36# Parent 6772ce4d982b9c56834b3f9f63a956f9e053bfbf Merge. diff -r 6772ce4d982b -r 1e9078742fa7 etc/ChangeLog --- a/etc/ChangeLog Sun Jan 24 15:21:27 2010 +0000 +++ b/etc/ChangeLog Tue Jan 26 15:16:31 2010 +0000 @@ -1,3 +1,8 @@ +2010-01-26 Aidan Kehoe + + * HELLO: Encode the Arabic in arabic-iso8859-6 once more; delete + the old, experimentally-encoded Thai. + 2010-01-04 Jerry James * Emacs.ad: Change /usr/lib/X11 to /usr/share/X11. diff -r 6772ce4d982b -r 1e9078742fa7 etc/HELLO --- a/etc/HELLO Sun Jan 24 15:21:27 2010 +0000 +++ b/etc/HELLO Tue Jan 26 15:16:31 2010 +0000 @@ -5,7 +5,7 @@ --------------------------------------------------------- Amharic ($(3"c!(B -Arabic (%Gةّيبرعلا%@) %Gمكيلع%@ %Gمالّسلا%@ +Arabic ([2],GIqjHQYdG[0](B) [2],GecjdY[0](B [2],GeGdqSdG[0](B Croatian (Hrvatski) Bog (Bok), Dobar dan Czech (,Bh(Besky) Dobr,B}(B den Danish (Dansk) Hej, Goddag @@ -30,7 +30,6 @@ Spanish (Espa,Aq(Bol) ,A!(BHola! Swedish (Svenska) Hej, Goddag Tajik ,LAP[^\(B -Thai ($(?@0R0I0R0d070B0(B) $(?J0G8J04H$0C8:0(B, $(?J0G8J04H$2P0(B Tigrigna ($(3"8#r!N"^(B) $(3!Q!,!<"8(B Turkish (T,A|(Brk,Ag(Be) Merhaba diff -r 6772ce4d982b -r 1e9078742fa7 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jan 24 15:21:27 2010 +0000 +++ b/lisp/ChangeLog Tue Jan 26 15:16:31 2010 +0000 @@ -1,3 +1,10 @@ +2010-01-26 Aidan Kehoe + + * mule/vietnamese.el (viscii): Correct the mapping here, #xA6 is + actually *SMALL* LETTER A WITH CIRCUMFLEX AND HOOK ABOVE. + * mule/cyrillic.el (koi8-c): Correct the mapping here, #x8C is + actually ?\u04D9. Add a case mapping for it. + 2010-01-24 Aidan Kehoe Correct the semantics of #'member*, #'eql, #'assoc* in the diff -r 6772ce4d982b -r 1e9078742fa7 lisp/mule/cyrillic.el --- a/lisp/mule/cyrillic.el Sun Jan 24 15:21:27 2010 +0000 +++ b/lisp/mule/cyrillic.el Tue Jan 26 15:16:31 2010 +0000 @@ -1166,7 +1166,7 @@ do (put-case-table-pair upper lower case-table)) -;; Support fot the languages of the Caucasus. +;; Support for the languages of the Caucasus. Never widely used. (make-coding-system 'koi8-c 'fixed-width "KOI-8, Caucasus." '(unicode-map @@ -1182,7 +1182,7 @@ (#x89 ?\u04B9) ;; CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE (#x8A ?\u04BB) ;; CYRILLIC SMALL LETTER SHHA (#x8B ?\u2580) ;; UPPER HALF BLOCK - (#x8C ?\u049D) ;; CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE + (#x8C ?\u04D9) ;; CYRILLIC SMALL LETTER SCHWA (#x8D ?\u04E3) ;; CYRILLIC SMALL LETTER I WITH MACRON (#x8E ?\u04E9) ;; CYRILLIC SMALL LETTER BARRED O (#x8F ?\u04EF) ;; CYRILLIC SMALL LETTER U WITH MACRON @@ -1311,6 +1311,7 @@ (?\u04A3 ?\u04A2) ;; EN WITH DESCENDER (?\u049D ?\u049C) ;; KA WITH VERTICAL STROKE (?\u04BB ?\u04BA) ;; SHHA + (?\u04D9 ?\u04D8) ;; SCHWA (?\u04AF ?\u04AE) ;; STRAIGHT U (?\u04B1 ?\u04B0) ;; STRAIGHT U WITH STROKE (?\u0497 ?\u0496)) ;; ZHE WITH DESCENDER diff -r 6772ce4d982b -r 1e9078742fa7 lisp/mule/vietnamese.el --- a/lisp/mule/vietnamese.el Sun Jan 24 15:21:27 2010 +0000 +++ b/lisp/mule/vietnamese.el Tue Jan 26 15:16:31 2010 +0000 @@ -111,7 +111,7 @@ (#xA3 ?\u1EB7) ;; SMALL LETTER A WITH BREVE AND DOT BELOW (#xA4 ?\u1EA5) ;; SMALL LETTER A WITH CIRCUMFLEX AND ACUTE (#xA5 ?\u1EA7) ;; SMALL LETTER A WITH CIRCUMFLEX AND GRAVE - (#xA6 ?\u1EA8) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE + (#xA6 ?\u1EA9) ;; SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE (#xA7 ?\u1EAD) ;; SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW (#xA8 ?\u1EBD) ;; SMALL LETTER E WITH TILDE (#xA9 ?\u1EB9) ;; SMALL LETTER E WITH DOT BELOW diff -r 6772ce4d982b -r 1e9078742fa7 src/ChangeLog --- a/src/ChangeLog Sun Jan 24 15:21:27 2010 +0000 +++ b/src/ChangeLog Tue Jan 26 15:16:31 2010 +0000 @@ -1,3 +1,10 @@ +2010-01-24 Aidan Kehoe + + * number.c (Fnumerator, Fdenominator, Fcanonicalize_number): + Be more careful to return integers in their canonical forms here, + and to give the same answer all the time when treating a rational + that is itself is an integer as a ratio. + 2010-01-24 Aidan Kehoe Fix problems with #'eql, extended number types, and the hash table @@ -38,6 +45,7 @@ * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. +>>>>>>> other 2010-01-17 Vin Shelton * fileio.c (check_writable): Remove cast from 2010-01-14 diff -r 6772ce4d982b -r 1e9078742fa7 src/number.c --- a/src/number.c Sun Jan 24 15:21:27 2010 +0000 +++ b/src/number.c Tue Jan 26 15:16:31 2010 +0000 @@ -216,12 +216,13 @@ { CONCHECK_RATIONAL (rational); #ifdef HAVE_RATIO - return RATIOP (rational) - ? make_bignum_bg (XRATIO_NUMERATOR (rational)) - : rational; -#else + if (RATIOP (rational)) + { + return + Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (rational))); + } +#endif return rational; -#endif } DEFUN ("denominator", Fdenominator, 1, 1, 0, /* @@ -232,12 +233,13 @@ { CONCHECK_RATIONAL (rational); #ifdef HAVE_RATIO - return RATIOP (rational) - ? make_bignum_bg (XRATIO_DENOMINATOR (rational)) - : make_int (1); + if (RATIOP (rational)) + { + return Fcanonicalize_number (make_bignum_bg + (XRATIO_DENOMINATOR (rational))); + } #else return make_int (1); -#endif } @@ -419,7 +421,7 @@ if (RATIOP (number) && bignum_fits_long_p (XRATIO_DENOMINATOR (number)) && bignum_to_long (XRATIO_DENOMINATOR (number)) == 1L) - number = make_bignum_bg (XRATIO_NUMERATOR (number)); + number = Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (number))); #endif #ifdef HAVE_BIGNUM if (BIGNUMP (number) && bignum_fits_emacs_int_p (XBIGNUM_DATA (number))) diff -r 6772ce4d982b -r 1e9078742fa7 tests/ChangeLog --- a/tests/ChangeLog Sun Jan 24 15:21:27 2010 +0000 +++ b/tests/ChangeLog Tue Jan 26 15:16:31 2010 +0000 @@ -1,3 +1,9 @@ +2010-01-26 Aidan Kehoe + + * automated/mule-tests.el: + Only give the list of character sets in HELLO once; correct it to + reflect its current contents and the extant character sets. + 2010-01-14 Ben Wing * automated/mule-tests.el (featurep): diff -r 6772ce4d982b -r 1e9078742fa7 tests/automated/mule-tests.el --- a/tests/automated/mule-tests.el Sun Jan 24 15:21:27 2010 +0000 +++ b/tests/automated/mule-tests.el Tue Jan 26 15:16:31 2010 +0000 @@ -551,25 +551,23 @@ ;;--------------------------------------------------------------- (with-temp-buffer (insert-file-contents (locate-data-file "HELLO")) - (Assert-equal - ;; The sort is to make the algorithm of charsets-in-region - ;; irrelevant. - (sort (charsets-in-region (point-min) (point-max)) - #'string<) - '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5 - ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208 - japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201 - korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis - vietnamese-viscii-lower)) - (Assert-equal - (sort (charsets-in-string (buffer-substring (point-min) - (point-max))) - #'string<) - '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5 - ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208 - japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201 - korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis - vietnamese-viscii-lower))) + (let ((sorted-charsets-in-HELLO + '(arabic-iso8859-6 ascii chinese-big5-1 chinese-gb2312 + cyrillic-iso8859-5 ethiopic greek-iso8859-7 + hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212 + katakana-jisx0201 korean-ksc5601 latin-iso8859-1 + latin-iso8859-2 vietnamese-viscii-lower))) + (Assert-equal + ;; The sort is to make the algorithm of charsets-in-region + ;; irrelevant. + (sort (charsets-in-region (point-min) (point-max)) + #'string<) + sorted-charsets-in-HELLO) + (Assert-equal + (sort (charsets-in-string (buffer-substring (point-min) + (point-max))) + #'string<) + sorted-charsets-in-HELLO))) ;;--------------------------------------------------------------- ;; Language environments, and whether the specified values are sane.