October 2017 - XEmacs-Patches - XEmacs Mailing List Archives

commit: Revamp the Arabic support. Create greek-iso-8bit-with-esc, arabic-iso-8bit-with-esc. 7 years, 1 month

Aidan Kehoe

changeset: 4491:d402d7b18bd88bab41f37a186554f8c1f2f0eaae parent: 4488:6b0000935adc3f79cb189350d6014d4b4aff734e user: Aidan Kehoe <kehoea(a)parhasard.net> date: Tue Aug 05 08:37:17 2008 +0200 files: etc/ChangeLog etc/HELLO lisp/ChangeLog lisp/mule/arabic.el lisp/mule/iso-with-esc.el lisp/mule/mule-category.el lisp/mule/mule-msw-init-late.el lisp/mule/mule-win32-init.el lisp/unicode.el src/ChangeLog src/lisp.h src/mule-charset.c description: Revamp the Arabic support. Create greek-iso-8bit-with-esc, arabic-iso-8bit-with-esc. src/ChangeLog addition: 2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net> * mule-charset.c (complex_vars_of_mule_charset): Remove Vcharset_arabic_iso8859_7. * lisp.h: Remove Vcharset_arabic_iso8859_7. See commentary in lisp/mule/iso-with-esc.el for motivation. lisp/ChangeLog addition: 2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net> * mule/iso-with-esc.el (greek-iso-8bit-with-esc): (arabic-iso-8bit-with-esc): Add these two here. Move the implementation of the 'arabic-iso8859-6 character set here, with commentary on why that is reasonable. * mule/arabic.el (iso-8859-6): Add iso-8859-6, windows-1256 implementations using make-8-bit-coding-system. Remove our non-standard Mule character sets. * unicode.el (load-unicode-tables): Remove Arabic since it's no longer dumped. * mule/mule-msw-init-late.el: Remove Arabic. * mule/mule-category.el (predefined-category-list): Remove Arabic. etc/ChangeLog addition: 2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net> * HELLO: Encode the Arabic using UTF-8 sequences, not ISO-8859-6. diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae etc/ChangeLog --- a/etc/ChangeLog Sat Jul 26 13:50:27 2008 +0300 +++ b/etc/ChangeLog Tue Aug 05 08:37:17 2008 +0200 ＠＠ -1,3 +1,7 ＠＠ 2008-02-21 Stephen J. Turnbull <stephe +2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net> + + * HELLO: Encode the Arabic using UTF-8 sequences, not ISO-8859-6. + 2008-02-21 Stephen J. Turnbull <stephen(a)xemacs.org> * README: Add descriptions of Daniel Polansky's icons. diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae etc/HELLO --- a/etc/HELLO Sat Jul 26 13:50:27 2008 +0300 +++ b/etc/HELLO Tue Aug 05 08:37:17 2008 +0200 ＠＠ -3,7 +3,7 ＠＠ Please correct this incomplete list and --------------------------------------------------------- Amharic ($(3"c!<!N"^(B) $(3!A!,!>(B -Arabic [2](38R(47d(3T!JSa(4W(3W[0](B +Arabic (%Gةّيبرعلا%＠) %Gمكيلع%＠ %Gمالّسلا%＠ Croatian (Hrvatski) Bog (Bok), Dobar dan Czech (,Bh(Besky) Dobr,B}(B den Danish (Dansk) Hej, Goddag diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/ChangeLog --- a/lisp/ChangeLog Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/ChangeLog Tue Aug 05 08:37:17 2008 +0200 ＠＠ -1,3 +1,20 ＠＠ 2008-07-26 Aidan Kehoe <kehoea＠parhasa +2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net> + + * mule/iso-with-esc.el (greek-iso-8bit-with-esc): + (arabic-iso-8bit-with-esc): + Add these two here. Move the implementation of the + 'arabic-iso8859-6 character set here, with commentary on why that + is reasonable. + * mule/arabic.el (iso-8859-6): + Add iso-8859-6, windows-1256 implementations using + make-8-bit-coding-system. Remove our non-standard Mule character + sets. + * unicode.el (load-unicode-tables): Remove Arabic since it's no + longer dumped. + * mule/mule-msw-init-late.el: Remove Arabic. + * mule/mule-category.el (predefined-category-list): Remove + Arabic. + 2008-07-26 Aidan Kehoe <kehoea(a)parhasard.net> * x-init.el (x-initialize-compose): diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/mule/arabic.el --- a/lisp/mule/arabic.el Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/mule/arabic.el Tue Aug 05 08:37:17 2008 +0200 ＠＠ -28,79 +28,204 ＠＠ ;;; Code: -; (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 - registries ["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 - registries ["MuleArabic-1"] - chars 94 - columns 1 - direction r2l - final ?3 - graphic 0 - short-name "Arabic 1-col" - long-name "Arabic 1-column" - )) - -(make-charset 'arabic-2-column "Arabic 2-column" - '(dimension - 1 - registries ["MuleArabic-2"] - chars 94 - columns 2 - direction r2l - final ?4 - graphic 0 - short-name "Arabic 2-col" - long-name "Arabic 2-column" - )) - -(make-coding-system 'iso-8859-6 'iso2022 - "ISO-8859-6 (Arabic)" - '(charset-g0 ascii - charset-g1 arabic-iso8859-6 - charset-g2 t - charset-g3 t - no-iso6429 t - mnemonic "MIME/Arbc" - )) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; ARABIC -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; (define-language-environment 'arabic -;; "Arabic" -;; (lambda () -;; (require 'arabic))) +;; See iso-with-esc.el for commentary on the ISO standard Arabic character +;; set. + +(make-8-bit-coding-system + 'iso-8859-6 + '((#xA0 ?\u00A0) ;; NO-BREAK SPACE + (#xA4 ?\u00A4) ;; CURRENCY SIGN + (#xAC ?\u060C) ;; ARABIC COMMA + (#xAD ?\u00AD) ;; SOFT HYPHEN + (#xBB ?\u061B) ;; ARABIC SEMICOLON + (#xBF ?\u061F) ;; ARABIC QUESTION MARK + (#xC1 ?\u0621) ;; ARABIC LETTER HAMZA + (#xC2 ?\u0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE + (#xC3 ?\u0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE + (#xC4 ?\u0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE + (#xC5 ?\u0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW + (#xC6 ?\u0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE + (#xC7 ?\u0627) ;; ARABIC LETTER ALEF + (#xC8 ?\u0628) ;; ARABIC LETTER BEH + (#xC9 ?\u0629) ;; ARABIC LETTER TEH MARBUTA + (#xCA ?\u062A) ;; ARABIC LETTER TEH + (#xCB ?\u062B) ;; ARABIC LETTER THEH + (#xCC ?\u062C) ;; ARABIC LETTER JEEM + (#xCD ?\u062D) ;; ARABIC LETTER HAH + (#xCE ?\u062E) ;; ARABIC LETTER KHAH + (#xCF ?\u062F) ;; ARABIC LETTER DAL + (#xD0 ?\u0630) ;; ARABIC LETTER THAL + (#xD1 ?\u0631) ;; ARABIC LETTER REH + (#xD2 ?\u0632) ;; ARABIC LETTER ZAIN + (#xD3 ?\u0633) ;; ARABIC LETTER SEEN + (#xD4 ?\u0634) ;; ARABIC LETTER SHEEN + (#xD5 ?\u0635) ;; ARABIC LETTER SAD + (#xD6 ?\u0636) ;; ARABIC LETTER DAD + (#xD7 ?\u0637) ;; ARABIC LETTER TAH + (#xD8 ?\u0638) ;; ARABIC LETTER ZAH + (#xD9 ?\u0639) ;; ARABIC LETTER AIN + (#xDA ?\u063A) ;; ARABIC LETTER GHAIN + (#xE0 ?\u0640) ;; ARABIC TATWEEL + (#xE1 ?\u0641) ;; ARABIC LETTER FEH + (#xE2 ?\u0642) ;; ARABIC LETTER QAF + (#xE3 ?\u0643) ;; ARABIC LETTER KAF + (#xE4 ?\u0644) ;; ARABIC LETTER LAM + (#xE5 ?\u0645) ;; ARABIC LETTER MEEM + (#xE6 ?\u0646) ;; ARABIC LETTER NOON + (#xE7 ?\u0647) ;; ARABIC LETTER HEH + (#xE8 ?\u0648) ;; ARABIC LETTER WAW + (#xE9 ?\u0649) ;; ARABIC LETTER ALEF MAKSURA + (#xEA ?\u064A) ;; ARABIC LETTER YEH + (#xEB ?\u064B) ;; ARABIC FATHATAN + (#xEC ?\u064C) ;; ARABIC DAMMATAN + (#xED ?\u064D) ;; ARABIC KASRATAN + (#xEE ?\u064E) ;; ARABIC FATHA + (#xEF ?\u064F) ;; ARABIC DAMMA + (#xF0 ?\u0650) ;; ARABIC KASRA + (#xF1 ?\u0651) ;; ARABIC SHADDA + (#xF2 ?\u0652)) ;; ARABIC SUKUN + "ISO 8859-6 (Arabic)" +'(mnemonic "ArISO")) + +(make-8-bit-coding-system + 'windows-1256 + '((#x80 ?\u20AC) ;; EURO SIGN + (#x81 ?\u067E) ;; ARABIC LETTER PEH + (#x82 ?\u201A) ;; SINGLE LOW-9 QUOTATION MARK + (#x83 ?\u0192) ;; LATIN SMALL LETTER F WITH HOOK + (#x84 ?\u201E) ;; DOUBLE LOW-9 QUOTATION MARK + (#x85 ?\u2026) ;; HORIZONTAL ELLIPSIS + (#x86 ?\u2020) ;; DAGGER + (#x87 ?\u2021) ;; DOUBLE DAGGER + (#x88 ?\u02C6) ;; MODIFIER LETTER CIRCUMFLEX ACCENT + (#x89 ?\u2030) ;; PER MILLE SIGN + (#x8A ?\u0679) ;; ARABIC LETTER TTEH + (#x8B ?\u2039) ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK + (#x8C ?\u0152) ;; LATIN CAPITAL LIGATURE OE + (#x8D ?\u0686) ;; ARABIC LETTER TCHEH + (#x8E ?\u0698) ;; ARABIC LETTER JEH + (#x8F ?\u0688) ;; ARABIC LETTER DDAL + (#x90 ?\u06AF) ;; ARABIC LETTER GAF + (#x91 ?\u2018) ;; LEFT SINGLE QUOTATION MARK + (#x92 ?\u2019) ;; RIGHT SINGLE QUOTATION MARK + (#x93 ?\u201C) ;; LEFT DOUBLE QUOTATION MARK + (#x94 ?\u201D) ;; RIGHT DOUBLE QUOTATION MARK + (#x95 ?\u2022) ;; BULLET + (#x96 ?\u2013) ;; EN DASH + (#x97 ?\u2014) ;; EM DASH + (#x98 ?\u06A9) ;; ARABIC LETTER KEHEH + (#x99 ?\u2122) ;; TRADE MARK SIGN + (#x9A ?\u0691) ;; ARABIC LETTER RREH + (#x9B ?\u203A) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK + (#x9C ?\u0153) ;; LATIN SMALL LIGATURE OE + (#x9D ?\u200C) ;; ZERO WIDTH NON-JOINER + (#x9E ?\u200D) ;; ZERO WIDTH JOINER + (#x9F ?\u06BA) ;; ARABIC LETTER NOON GHUNNA + (#xA0 ?\u00A0) ;; NO-BREAK SPACE + (#xA1 ?\u060C) ;; ARABIC COMMA + (#xA2 ?\u00A2) ;; CENT SIGN + (#xA3 ?\u00A3) ;; POUND SIGN + (#xA4 ?\u00A4) ;; CURRENCY SIGN + (#xA5 ?\u00A5) ;; YEN SIGN + (#xA6 ?\u00A6) ;; BROKEN BAR + (#xA7 ?\u00A7) ;; SECTION SIGN + (#xA8 ?\u00A8) ;; DIAERESIS + (#xA9 ?\u00A9) ;; COPYRIGHT SIGN + (#xAA ?\u06BE) ;; ARABIC LETTER HEH DOACHASHMEE + (#xAB ?\u00AB) ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK + (#xAC ?\u00AC) ;; NOT SIGN + (#xAD ?\u00AD) ;; SOFT HYPHEN + (#xAE ?\u00AE) ;; REGISTERED SIGN + (#xAF ?\u00AF) ;; MACRON + (#xB0 ?\u00B0) ;; DEGREE SIGN + (#xB1 ?\u00B1) ;; PLUS-MINUS SIGN + (#xB2 ?\u00B2) ;; SUPERSCRIPT TWO + (#xB3 ?\u00B3) ;; SUPERSCRIPT THREE + (#xB4 ?\u00B4) ;; ACUTE ACCENT + (#xB5 ?\u00B5) ;; MICRO SIGN + (#xB6 ?\u00B6) ;; PILCROW SIGN + (#xB7 ?\u00B7) ;; MIDDLE DOT + (#xB8 ?\u00B8) ;; CEDILLA + (#xB9 ?\u00B9) ;; SUPERSCRIPT ONE + (#xBA ?\u061B) ;; ARABIC SEMICOLON + (#xBB ?\u00BB) ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + (#xBC ?\u00BC) ;; VULGAR FRACTION ONE QUARTER + (#xBD ?\u00BD) ;; VULGAR FRACTION ONE HALF + (#xBE ?\u00BE) ;; VULGAR FRACTION THREE QUARTERS + (#xBF ?\u061F) ;; ARABIC QUESTION MARK + (#xC0 ?\u06C1) ;; ARABIC LETTER HEH GOAL + (#xC1 ?\u0621) ;; ARABIC LETTER HAMZA + (#xC2 ?\u0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE + (#xC3 ?\u0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE + (#xC4 ?\u0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE + (#xC5 ?\u0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW + (#xC6 ?\u0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE + (#xC7 ?\u0627) ;; ARABIC LETTER ALEF + (#xC8 ?\u0628) ;; ARABIC LETTER BEH + (#xC9 ?\u0629) ;; ARABIC LETTER TEH MARBUTA + (#xCA ?\u062A) ;; ARABIC LETTER TEH + (#xCB ?\u062B) ;; ARABIC LETTER THEH + (#xCC ?\u062C) ;; ARABIC LETTER JEEM + (#xCD ?\u062D) ;; ARABIC LETTER HAH + (#xCE ?\u062E) ;; ARABIC LETTER KHAH + (#xCF ?\u062F) ;; ARABIC LETTER DAL + (#xD0 ?\u0630) ;; ARABIC LETTER THAL + (#xD1 ?\u0631) ;; ARABIC LETTER REH + (#xD2 ?\u0632) ;; ARABIC LETTER ZAIN + (#xD3 ?\u0633) ;; ARABIC LETTER SEEN + (#xD4 ?\u0634) ;; ARABIC LETTER SHEEN + (#xD5 ?\u0635) ;; ARABIC LETTER SAD + (#xD6 ?\u0636) ;; ARABIC LETTER DAD + (#xD7 ?\u00D7) ;; MULTIPLICATION SIGN + (#xD8 ?\u0637) ;; ARABIC LETTER TAH + (#xD9 ?\u0638) ;; ARABIC LETTER ZAH + (#xDA ?\u0639) ;; ARABIC LETTER AIN + (#xDB ?\u063A) ;; ARABIC LETTER GHAIN + (#xDC ?\u0640) ;; ARABIC TATWEEL + (#xDD ?\u0641) ;; ARABIC LETTER FEH + (#xDE ?\u0642) ;; ARABIC LETTER QAF + (#xDF ?\u0643) ;; ARABIC LETTER KAF + (#xE0 ?\u00E0) ;; LATIN SMALL LETTER A WITH GRAVE + (#xE1 ?\u0644) ;; ARABIC LETTER LAM + (#xE2 ?\u00E2) ;; LATIN SMALL LETTER A WITH CIRCUMFLEX + (#xE3 ?\u0645) ;; ARABIC LETTER MEEM + (#xE4 ?\u0646) ;; ARABIC LETTER NOON + (#xE5 ?\u0647) ;; ARABIC LETTER HEH + (#xE6 ?\u0648) ;; ARABIC LETTER WAW + (#xE7 ?\u00E7) ;; LATIN SMALL LETTER C WITH CEDILLA + (#xE8 ?\u00E8) ;; LATIN SMALL LETTER E WITH GRAVE + (#xE9 ?\u00E9) ;; LATIN SMALL LETTER E WITH ACUTE + (#xEA ?\u00EA) ;; LATIN SMALL LETTER E WITH CIRCUMFLEX + (#xEB ?\u00EB) ;; LATIN SMALL LETTER E WITH DIAERESIS + (#xEC ?\u0649) ;; ARABIC LETTER ALEF MAKSURA + (#xED ?\u064A) ;; ARABIC LETTER YEH + (#xEE ?\u00EE) ;; LATIN SMALL LETTER I WITH CIRCUMFLEX + (#xEF ?\u00EF) ;; LATIN SMALL LETTER I WITH DIAERESIS + (#xF0 ?\u064B) ;; ARABIC FATHATAN + (#xF1 ?\u064C) ;; ARABIC DAMMATAN + (#xF2 ?\u064D) ;; ARABIC KASRATAN + (#xF3 ?\u064E) ;; ARABIC FATHA + (#xF4 ?\u00F4) ;; LATIN SMALL LETTER O WITH CIRCUMFLEX + (#xF5 ?\u064F) ;; ARABIC DAMMA + (#xF6 ?\u0650) ;; ARABIC KASRA + (#xF7 ?\u00F7) ;; DIVISION SIGN + (#xF8 ?\u0651) ;; ARABIC SHADDA + (#xF9 ?\u00F9) ;; LATIN SMALL LETTER U WITH GRAVE + (#xFA ?\u0652) ;; ARABIC SUKUN + (#xFB ?\u00FB) ;; LATIN SMALL LETTER U WITH CIRCUMFLEX + (#xFC ?\u00FC) ;; LATIN SMALL LETTER U WITH DIAERESIS + (#xFD ?\u200E) ;; LEFT-TO-RIGHT MARK + (#xFE ?\u200F) ;; RIGHT-TO-LEFT MARK + (#xFF ?\u06D2));; ARABIC LETTER YEH BARREE + "Windows-1256 (Arabic)" + '(mnemonic "cp1256" + documentation + "This is the much Windows encoding for Arabic, much superior to the ISO +standard one." + aliases (cp1256))) + +;; The Mac Arabic coding systems don't have defined MIME names. + +;; #### Decide what to do about the syntax of the Arabic punctuation. ;;; arabic.el ends here diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/mule/iso-with-esc.el --- a/lisp/mule/iso-with-esc.el Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/mule/iso-with-esc.el Tue Aug 05 08:37:17 2008 +0200 ＠＠ -98,3 +98,108 ＠＠ charset-g3 t no-iso6429 t mnemonic "MIME/Hbrw")) + +;;;###autoload +(make-coding-system + 'greek-iso-8bit-with-esc 'iso2022 "MIME ISO-8859-7" + '(charset-g0 ascii + charset-g1 greek-iso8859-7 + charset-g2 t + charset-g3 t + mnemonic "Grk")) + +;; ISO 8859-6 is such a useless character set that it seems a waste of +;; codespace to dump it. Let me count the ways: +;; +;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite +;; plenty of unallocated code points. +;; +;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that +;; they are necessary, even for the Arabs, for basic things like +;; dictionary entries, children's books, and occasional disambiguation. +;; +;; 3. The Arabs don't use it, they use Windows-1256, which also supports +;; Persian, at least, as well as the French characters necessary in +;; Lebanon and North Africa. + +(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")) + +(loop + for (iso8859-6 unicode) + in '((#xA0 #x00A0) ;; NO-BREAK SPACE + (#xA4 #x00A4) ;; CURRENCY SIGN + (#xAC #x060C) ;; ARABIC COMMA + (#xAD #x00AD) ;; SOFT HYPHEN + (#xBB #x061B) ;; ARABIC SEMICOLON + (#xBF #x061F) ;; ARABIC QUESTION MARK + (#xC1 #x0621) ;; ARABIC LETTER HAMZA + (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE + (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE + (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE + (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW + (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE + (#xC7 #x0627) ;; ARABIC LETTER ALEF + (#xC8 #x0628) ;; ARABIC LETTER BEH + (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA + (#xCA #x062A) ;; ARABIC LETTER TEH + (#xCB #x062B) ;; ARABIC LETTER THEH + (#xCC #x062C) ;; ARABIC LETTER JEEM + (#xCD #x062D) ;; ARABIC LETTER HAH + (#xCE #x062E) ;; ARABIC LETTER KHAH + (#xCF #x062F) ;; ARABIC LETTER DAL + (#xD0 #x0630) ;; ARABIC LETTER THAL + (#xD1 #x0631) ;; ARABIC LETTER REH + (#xD2 #x0632) ;; ARABIC LETTER ZAIN + (#xD3 #x0633) ;; ARABIC LETTER SEEN + (#xD4 #x0634) ;; ARABIC LETTER SHEEN + (#xD5 #x0635) ;; ARABIC LETTER SAD + (#xD6 #x0636) ;; ARABIC LETTER DAD + (#xD7 #x0637) ;; ARABIC LETTER TAH + (#xD8 #x0638) ;; ARABIC LETTER ZAH + (#xD9 #x0639) ;; ARABIC LETTER AIN + (#xDA #x063A) ;; ARABIC LETTER GHAIN + (#xE0 #x0640) ;; ARABIC TATWEEL + (#xE1 #x0641) ;; ARABIC LETTER FEH + (#xE2 #x0642) ;; ARABIC LETTER QAF + (#xE3 #x0643) ;; ARABIC LETTER KAF + (#xE4 #x0644) ;; ARABIC LETTER LAM + (#xE5 #x0645) ;; ARABIC LETTER MEEM + (#xE6 #x0646) ;; ARABIC LETTER NOON + (#xE7 #x0647) ;; ARABIC LETTER HEH + (#xE8 #x0648) ;; ARABIC LETTER WAW + (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA + (#xEA #x064A) ;; ARABIC LETTER YEH + (#xEB #x064B) ;; ARABIC FATHATAN + (#xEC #x064C) ;; ARABIC DAMMATAN + (#xED #x064D) ;; ARABIC KASRATAN + (#xEE #x064E) ;; ARABIC FATHA + (#xEF #x064F) ;; ARABIC DAMMA + (#xF0 #x0650) ;; ARABIC KASRA + (#xF1 #x0651) ;; ARABIC SHADDA + (#xF2 #x0652));; ARABIC SUKUN + do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6) + unicode)) + +;;;###autoload +(make-coding-system + 'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is + ;; iso2022-compatible. + "ISO-8859-6 (Arabic)" + '(charset-g0 ascii + charset-g1 arabic-iso8859-6 + charset-g2 t + charset-g3 t + no-iso6429 t + mnemonic "MIME/Arbc")) + diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/mule/mule-category.el --- a/lisp/mule/mule-category.el Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/mule/mule-category.el Tue Aug 05 08:37:17 2008 +0200 ＠＠ -244,7 +244,6 ＠＠ The descriptions are inserted in a buffe (latin-iso8859-4 ?l) (latin-iso8859-9 ?l) (cyrillic-iso8859-5 ?y "Cyrillic character set") - (arabic-iso8859-6 ?b "Arabic character set") (greek-iso8859-7 ?g "Greek character set") (hebrew-iso8859-8 ?w "Hebrew character set") (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set") diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/mule/mule-msw-init-late.el --- a/lisp/mule/mule-msw-init-late.el Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/mule/mule-msw-init-late.el Tue Aug 05 08:37:17 2008 +0200 ＠＠ -37,7 +37,6 ＠＠ (greek-iso8859-7 . "Greek") (latin-iso8859-9 . "Turkish") (hebrew-iso8859-8 . "Hebrew") - (arabic-iso8859-6 . "Arabic") (latin-iso8859-4 . "Baltic") (vietnamese-viscii-lower . "Viet Nam") (vietnamese-viscii-upper . "Viet Nam") diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/mule/mule-win32-init.el --- a/lisp/mule/mule-win32-init.el Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/mule/mule-win32-init.el Tue Aug 05 08:37:17 2008 +0200 ＠＠ -162,7 +162,8 ＠＠ as returned by ; ("ANSI" 1253 no-conversion "Windows 3.1 Greek") ("ANSI" 1254 no-conversion "Windows 3.1 Turkish") ("ANSI" 1255 no-conversion "Hebrew") - ("ANSI" 1256 no-conversion "Arabic") + ;; We implement these ourselves. + ; ("ANSI" 1256 no-conversion "Arabic") ("ANSI" 1257 no-conversion "Baltic") ("ANSI" 1258 no-conversion "VietNam") ;; #### Is this category right? I don't have Lunde to hand, and the diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae lisp/unicode.el --- a/lisp/unicode.el Sat Jul 26 13:50:27 2008 +0300 +++ b/lisp/unicode.el Tue Aug 05 08:37:17 2008 +0200 ＠＠ -73,7 +73,6 ＠＠ Setting this at run-time does nothing.") ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80) ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80) ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80) - ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80) ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80) ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80) ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80) ＠＠ -154,12 +153,12 ＠＠ Setting this at run-time does nothing.") '(ascii control-1 latin-iso8859-1 latin-iso8859-2 latin-iso8859-15 greek-iso8859-7 hebrew-iso8859-8 ipa cyrillic-iso8859-5 latin-iso8859-16 latin-iso8859-3 latin-iso8859-4 latin-iso8859-9 - vietnamese-viscii-lower vietnamese-viscii-upper arabic-iso8859-6 + vietnamese-viscii-lower vietnamese-viscii-upper jit-ucs-charset-0 japanese-jisx0208 japanese-jisx0208-1978 japanese-jisx0212 japanese-jisx0213-1 japanese-jisx0213-2 chinese-gb2312 chinese-sisheng chinese-big5-1 chinese-big5-2 indian-is13194 korean-ksc5601 chinese-cns11643-1 chinese-cns11643-2 - chinese-isoir165 arabic-1-column arabic-2-column arabic-digit + chinese-isoir165 composite ethiopic indian-1-column indian-2-column jit-ucs-charset-0 katakana-jisx0201 lao thai-tis620 thai-xtis tibetan tibetan-1-column latin-jisx0201 chinese-cns11643-3 chinese-cns11643-4 diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae src/ChangeLog --- a/src/ChangeLog Sat Jul 26 13:50:27 2008 +0300 +++ b/src/ChangeLog Tue Aug 05 08:37:17 2008 +0200 ＠＠ -1,3 +1,10 ＠＠ 2008-07-20 John Paul Wallington <jpw＠p +2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net> + + * mule-charset.c (complex_vars_of_mule_charset): + Remove Vcharset_arabic_iso8859_7. + * lisp.h: Remove Vcharset_arabic_iso8859_7. + See commentary in lisp/mule/iso-with-esc.el for motivation. + 2008-07-20 John Paul Wallington <jpw(a)pobox.com> * nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name): diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae src/lisp.h --- a/src/lisp.h Sat Jul 26 13:50:27 2008 +0300 +++ b/src/lisp.h Tue Aug 05 08:37:17 2008 +0200 ＠＠ -5229,7 +5229,6 ＠＠ extern Lisp_Object Vcharset_latin_iso885 extern Lisp_Object Vcharset_latin_iso8859_4; extern Lisp_Object Vcharset_thai_tis620; extern Lisp_Object Vcharset_greek_iso8859_7; -extern Lisp_Object Vcharset_arabic_iso8859_6; extern Lisp_Object Vcharset_hebrew_iso8859_8; extern Lisp_Object Vcharset_katakana_jisx0201; extern Lisp_Object Vcharset_latin_jisx0201; diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r d402d7b18bd88bab41f37a186554f8c1f2f0eaae src/mule-charset.c --- a/src/mule-charset.c Sat Jul 26 13:50:27 2008 +0300 +++ b/src/mule-charset.c Tue Aug 05 08:37:17 2008 +0200 ＠＠ -47,7 +47,6 ＠＠ Lisp_Object Vcharset_latin_iso8859_4; Lisp_Object Vcharset_latin_iso8859_4; Lisp_Object Vcharset_thai_tis620; Lisp_Object Vcharset_greek_iso8859_7; -Lisp_Object Vcharset_arabic_iso8859_6; Lisp_Object Vcharset_hebrew_iso8859_8; Lisp_Object Vcharset_katakana_jisx0201; Lisp_Object Vcharset_latin_jisx0201; ＠＠ -94,7 +93,6 ＠＠ Lisp_Object Qlatin_iso8859_4, Qthai_tis620, Qgreek_iso8859_7, - Qarabic_iso8859_6, Qhebrew_iso8859_8, Qkatakana_jisx0201, Qlatin_jisx0201, ＠＠ -1112,7 +1110,6 ＠＠ syms_of_mule_charset (void) DEFSYMBOL (Qlatin_iso8859_4); DEFSYMBOL (Qthai_tis620); DEFSYMBOL (Qgreek_iso8859_7); - DEFSYMBOL (Qarabic_iso8859_6); DEFSYMBOL (Qhebrew_iso8859_8); DEFSYMBOL (Qkatakana_jisx0201); DEFSYMBOL (Qlatin_jisx0201); ＠＠ -1236,15 +1233,6 ＠＠ complex_vars_of_mule_charset (void) build_msg_string ("ISO8859-7 (Greek)"), build_msg_string ("ISO8859-7 (Greek)"), vector1(build_string("iso8859-7")), 0, 0); - staticpro (&Vcharset_arabic_iso8859_6); - Vcharset_arabic_iso8859_6 = - make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, - CHARSET_TYPE_96, 1, 1, 'G', - CHARSET_RIGHT_TO_LEFT, - build_string ("ISO8859-6"), - build_msg_string ("ISO8859-6 (Arabic)"), - build_msg_string ("ISO8859-6 (Arabic)"), - vector1(build_string ("iso8859-6")), 0, 0); staticpro (&Vcharset_hebrew_iso8859_8); Vcharset_hebrew_iso8859_8 = make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

1 participants
0 comments

#'cl-macroexpand-all; delay symbol macro shadowing until all args processed, let 7 years, 1 month

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1509285584 0 # Sun Oct 29 13:59:44 2017 +0000 # Node ID efa8f1377817cf7f529bbd39b58857c7675c59ad # Parent 450ec5be18d1431b8a6f8377d836a2bc86f59f59 #'cl-macro-expand-all; delay symbol macro shadowing until all args processed, let lisp/ChangeLog addition: 2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> * cl-extra.el (cl-macroexpand-all): When processing a let binding, and an existing symbol macro has the same symbol name as the let binding, delay shadowing until all bindings are processed. tests/ChangeLog addition: 2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> * automated/lisp-tests.el: Test the SHADOW argument to symbol-macrolet. diff -r 450ec5be18d1 -r efa8f1377817 lisp/ChangeLog --- a/lisp/ChangeLog Sun Oct 29 13:48:11 2017 +0000 +++ b/lisp/ChangeLog Sun Oct 29 13:59:44 2017 +0000 ＠＠ -1,3 +1,10 ＠＠ +2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * cl-extra.el (cl-macroexpand-all): + When processing a let binding, and an existing symbol macro has + the same symbol name as the let binding, delay shadowing until all + bindings are processed. + 2017-10-12 Aidan Kehoe <kehoea(a)parhasard.net> * frame.el (frame-utmost-window-2): Made into a label. diff -r 450ec5be18d1 -r efa8f1377817 lisp/cl-extra.el --- a/lisp/cl-extra.el Sun Oct 29 13:48:11 2017 +0000 +++ b/lisp/cl-extra.el Sun Oct 29 13:59:44 2017 +0000 ＠＠ -523,7 +523,7 ＠＠ (push `(,eq-hash . nil) env) ;; `let'; delay until all bindings ;; processed. - (push `(,eq-hash . nil) env)) + (push `(,eq-hash . nil) shadows)) ;; Don't shadow it. (setq symbol (car acons)) (unless (symbolp symbol) (setq letf t))) diff -r 450ec5be18d1 -r efa8f1377817 tests/ChangeLog --- a/tests/ChangeLog Sun Oct 29 13:48:11 2017 +0000 +++ b/tests/ChangeLog Sun Oct 29 13:59:44 2017 +0000 ＠＠ -1,3 +1,8 ＠＠ +2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * automated/lisp-tests.el: + Test the SHADOW argument to symbol-macrolet. + 2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> * automated/mule-tests.el: diff -r 450ec5be18d1 -r efa8f1377817 tests/automated/lisp-tests.el --- a/tests/automated/lisp-tests.el Sun Oct 29 13:48:11 2017 +0000 +++ b/tests/automated/lisp-tests.el Sun Oct 29 13:59:44 2017 +0000 ＠＠ -3034,6 +3034,21 ＠＠ (Assert (equal '([symbol expansion] [copy expansion] [third expansion]) (test-symbol-macrolet)))) +;; And test it with the SHADOW argument. + +(Assert (eql (let ((hello 20) (everyone 5)) + (symbol-macrolet ((hello everyone)) + (let ((hello (+ hello 5))) + hello))) + 10)) + +(Assert (eql (let ((hello 20) (everyone 5)) + (symbol-macrolet ((hello everyone t)) + (let ((hello (+ hello 5)) + (there (+ hello 10))) + (+ hello there)))) + 25)) + ;; Basic tests of #'apply-partially. (let* ((four 4) (times-four (apply-partially '* four)) -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Don't run #'test-chars on unicode-internal, mule-tests.el 7 years, 1 month

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1509284891 0 # Sun Oct 29 13:48:11 2017 +0000 # Node ID 450ec5be18d1431b8a6f8377d836a2bc86f59f59 # Parent 75c2debd5be652fa2c9959d9a7b01c66248d3712 Don't run #'test-chars on unicode-internal, mule-tests.el tests/ChangeLog addition: 2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> * automated/mule-tests.el: Don't run #'test-chars on unicode-internal, the time and memory demands for inserting #x40000000 characters, then comparing them to a string constructed separately make it impractical. diff -r 75c2debd5be6 -r 450ec5be18d1 tests/ChangeLog --- a/tests/ChangeLog Sat Oct 28 11:55:04 2017 +0100 +++ b/tests/ChangeLog Sun Oct 29 13:48:11 2017 +0000 ＠＠ -1,3 +1,10 ＠＠ +2017-10-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * automated/mule-tests.el: + Don't run #'test-chars on unicode-internal, the time and memory + demands for inserting #x40000000 characters, then comparing them + to a string constructed separately make it impractical. + 2017-09-30 Aidan Kehoe <kehoea(a)parhasard.net> * automated/extent-tests.el: diff -r 75c2debd5be6 -r 450ec5be18d1 tests/automated/mule-tests.el --- a/tests/automated/mule-tests.el Sat Oct 28 11:55:04 2017 +0100 +++ b/tests/automated/mule-tests.el Sun Oct 29 13:48:11 2017 +0000 ＠＠ -74,9 +74,14 ＠＠ (insert string) (assert (equal (buffer-string) string)))))) -;; Run #'test-chars in byte-compiled mode only. -(when (compiled-function-p (symbol-function 'test-chars)) - (test-chars t)) +(Skip-Test-Unless + ;; unicode-internal has a value of #x40000000, (expt 2 30), for + ;; char-code-limit and even re-writing the above to avoid allocating the list + ;; and the string means I run out of memory when I attempt to run this. + (<= char-code-limit #x200000) + "CHAR-CODE-LIMIT is impractically large" + ;; Run #'test-chars in byte-compiled mode only. + (and (compiled-function-p (symbol-function 'test-chars)) (test-chars t))) (defun unicode-code-point-to-utf-8-string (code-point) "Convert a Unicode code point to the equivalent UTF-8 string. -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Accept error octets on encoding, "multibyte" coding systems, file-coding.c 7 years, 1 month

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1509188104 -3600 # Sat Oct 28 11:55:04 2017 +0100 # Node ID 75c2debd5be652fa2c9959d9a7b01c66248d3712 # Parent 32aa4c87fa7f91e059717f5a88300469d7c3e9d7 Accept error octets on encoding, "multibyte" coding systems, file-coding.c src/ChangeLog addition: 2017-10-28 Aidan Kehoe <kehoea(a)parhasard.net> * file-coding.c (handle_possible_error_octet): Pass CONVERR_USE_PRIVATE to ichar_to_unicode(), allowing it to return an error octet, and allowing us to preserve error octets seen in external data. * mule-coding.c (multibyte_encode): Document a consideration about which error octets to pass through. diff -r 32aa4c87fa7f -r 75c2debd5be6 src/ChangeLog --- a/src/ChangeLog Thu Oct 26 09:34:51 2017 +0100 +++ b/src/ChangeLog Sat Oct 28 11:55:04 2017 +0100 ＠＠ -1,3 +1,12 ＠＠ +2017-10-28 Aidan Kehoe <kehoea(a)parhasard.net> + + * file-coding.c (handle_possible_error_octet): + Pass CONVERR_USE_PRIVATE to ichar_to_unicode(), allowing it to + return an error octet, and allowing us to preserve error octets + seen in external data. + * mule-coding.c (multibyte_encode): + Document a consideration about which error octets to pass through. + 2017-10-26 Aidan Kehoe <kehoea(a)parhasard.net> * mule-coding.c (iso2022_encode): diff -r 32aa4c87fa7f -r 75c2debd5be6 src/file-coding.c --- a/src/file-coding.c Thu Oct 26 09:34:51 2017 +0100 +++ b/src/file-coding.c Sat Oct 28 11:55:04 2017 +0100 ＠＠ -2989,7 +2989,7 ＠＠ struct coding_stream *str, const UExtbyte *src, unsigned_char_dynarr *dst, int *code_out) { - int code = ichar_to_unicode (ich, CONVERR_FAIL); + int code = ichar_to_unicode (ich, CONVERR_USE_PRIVATE); if (code >= 0) { if (code_out) diff -r 32aa4c87fa7f -r 75c2debd5be6 src/mule-coding.c --- a/src/mule-coding.c Thu Oct 26 09:34:51 2017 +0100 +++ b/src/mule-coding.c Sat Oct 28 11:55:04 2017 +0100 ＠＠ -297,6 +297,9 ＠＠ if (handle_possible_error_octet (ich, str, src, dst, NULL)) { + /* #### This should behave differently depending on whether this + error octet can be produced by multibyte_decode() with this + coding system, or not. */ ENCODING_ERROR_RETURN_OR_CONTINUE (str, src); } -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

commit/auctex: 2 new changesets 7 years, 1 month

Bitbucket

2 new commits in auctex: https://bitbucket.org/xemacs/auctex/commits/57b6e9cb7d88/ Changeset: 57b6e9cb7d88 User: matsl Date: 2014-06-28 01:12:14 Summary: Sync with upstream 11.84 (merge from branch) 2014-06-28 Mats Lidell <matsl(a)xemacs.org> * ChangeLog.auctex: Merged upstream Changelog to Changelog.auctex. * Sync with upstream 11.84 (i.e. merge with branch auctex-11_84-import.) Affected #: 260 files diff -r dba52387094241da43d5f91eee3ec2ba2a4e951a -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 .dummy --- a/.dummy +++ /dev/null ＠＠ -1,1 +0,0 ＠＠ -;; This file is just a dummy file in order to generate the var directory. diff -r dba52387094241da43d5f91eee3ec2ba2a4e951a -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 COPYING --- a/COPYING +++ b/COPYING ＠＠ -2,7 +2,7 ＠＠ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ＠＠ -305,7 +305,7 ＠＠ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff -r dba52387094241da43d5f91eee3ec2ba2a4e951a -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,10 ＠＠ +2014-06-28 Mats Lidell <matsl(a)xemacs.org> + + * ChangeLog.auctex: Merged upstream Changelog to Changelog.auctex. + + * Sync with upstream 11.84 (i.e. merge with branch + auctex-11_84-import.) + 2014-06-02 Jerry James <james(a)xemacs.org> * CHANGES: Remove generated file. See 2003-10-26 change. This diff is so big that we needed to truncate the remainder. https://bitbucket.org/xemacs/auctex/commits/40d87658aa7b/ Changeset: 40d87658aa7b User: matsl Date: 2014-06-28 01:36:12 Summary: Adjust for package build system 2014-06-28 Mats Lidell <matsl(a)xemacs.org> * preview/latex/preview.dtx: Expand CVS keywords manually. * preview/preview.el (preview-version, preview-release-date): Ditto. * Makefile: Update Makefile to build 11.84. Affected #: 4 files diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,5 +1,11 ＠＠ 2014-06-28 Mats Lidell <matsl(a)xemacs.org> + * preview/latex/preview.dtx: Expand CVS keywords manually. + * preview/preview.el (preview-version, preview-release-date): + Ditto. + + * Makefile: Update Makefile to build 11.84. + * ChangeLog.auctex: Merged upstream Changelog to Changelog.auctex. * Sync with upstream 11.84 (i.e. merge with branch diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 Makefile --- a/Makefile +++ b/Makefile ＠＠ -19,75 +19,107 ＠＠ VERSION = 1.51 -AUTHOR_VERSION = 11.55 +AUTHOR_VERSION = 11.84 MAINTAINER = Uwe Brauer <oub(a)mat.ucm.es> PACKAGE = auctex PKG_TYPE = regular -REQUIRES = xemacs-base +REQUIRES = xemacs-base texinfo fsf-compat mail-lib edit-utils CATEGORY = standard include ../../Local.rules -ELCS = bib-cite.elc font-latex.elc latex.elc \ - toolbar-x.elc tex-bar.elc \ - multi-prompt.elc tex-buf.elc tex-info.elc tex-mik.elc \ - tex.elc texmathp.elc context.elc \ - context-en.elc context-nl.elc tex-fold.elc \ +ELCC=$(XEMACS) -batch -q -no-site-file -no-init-file -l lpath.el +MULESRC = tex-jp.el +MULEELC = tex-jp.elc -EXTRA_SOURCES = CHANGES PROBLEMS README FAQ RELEASE TODO HISTORY \ - ChangeLog.auctex tex-site.el \ +AUCSRC = tex.el tex-buf.el tex-style.el latex.el tex-info.el \ + texmathp.el multi-prompt.el tex-mik.el font-latex.el tex-font.el \ + context.el context-en.el context-nl.el tex-fold.el \ + toolbar-x.el tex-bar.el bib-cite.el tex-fptex.el +AUCELC = $(AUCSRC:.el=.elc) -ETC_ELCS = etc/units.elc etc/nicefrac.elc etc/alltt.elc \ - etc/slides.elc etc/foils.elc etc/subfigure.elc etc/amstex.elc \ - etc/jurabib.elc etc/listings.elc etc/url.elc etc/csquotes.elc\ - etc/ltx-base.elc etc/jsbook.elc etc/ltxdoc.elc etc/captcont.elc \ - etc/emp.elc etc/jsarticle.elc etc/paralist.elc etc/scrpage2.elc \ - etc/alphanum.elc etc/doc.elc etc/jura.elc etc/beamer.elc \ - etc/italian.elc etc/prosper.elc etc/booktabs.elc \ - etc/article.elc etc/book.elc etc/letter.elc \ - etc/report.elc etc/amsart.elc etc/amsbook.elc \ - etc/epsf.elc etc/psfig.elc etc/latexinfo.elc \ - etc/dutch.elc etc/german.elc etc/dk.elc \ - etc/j-article.elc etc/j-book.elc etc/j-report.elc \ - etc/jarticle.elc etc/jbook.elc etc/jreport.elc \ - etc/dinbrief.elc etc/virtex.elc etc/plfonts.elc \ - etc/plhb.elc etc/harvard.elc etc/swedish.elc \ - etc/danish.elc etc/slovak.elc etc/czech.elc \ - etc/amsmath.elc etc/amstext.elc etc/amsbsy.elc \ - etc/amsopn.elc etc/amsthm.elc etc/natbib.elc \ - etc/index.elc etc/makeidx.elc etc/multind.elc \ - etc/varioref.elc etc/fancyref.elc etc/mdwlist.elc \ - etc/ngerman.elc etc/graphicx.elc etc/graphics.elc \ - etc/verbatim.elc etc/scrbase.elc etc/scrartcl.elc \ - etc/scrbook.elc etc/scrreprt.elc etc/scrlttr2.elc +STYLESRC = style/prosper.el \ + style/slides.el style/foils.el style/amstex.el \ + style/article.el style/book.el style/letter.el \ + style/report.el style/amsart.el style/amsbook.el \ + style/epsf.el style/psfig.el style/latexinfo.el \ + style/dutch.el style/german.el style/dk.el \ + style/j-article.el style/j-book.el style/j-report.el \ + style/jarticle.el style/jbook.el style/jreport.el \ + style/dinbrief.el style/virtex.el style/plfonts.el \ + style/plhb.el style/harvard.el style/swedish.el \ + style/danish.el style/slovak.el style/czech.el \ + style/amsmath.el style/amstext.el style/amsbsy.el \ + style/amsopn.el style/amsthm.el style/natbib.el \ + style/index.el style/makeidx.el style/multind.el \ + style/varioref.el style/fancyref.el style/mdwlist.el \ + style/ngerman.el style/graphicx.el style/graphics.el \ + style/verbatim.el style/scrbase.el style/scrartcl.el \ + style/scrbook.el style/scrreprt.el style/scrlttr2.el \ + style/scrpage2.el style/captcont.el style/subfigure.el \ + style/paralist.el style/booktabs.el style/emp.el \ + style/jura.el style/alphanum.el style/beamer.el \ + style/alltt.el style/italian.el style/doc.el \ + style/ltxdoc.el style/ltx-base.el style/units.el \ + style/nicefrac.el style/url.el style/listings.el \ + style/jurabib.el style/csquotes.el style/jsarticle.el \ + style/jsbook.el style/babel.el style/dk-bib.el \ + style/inputenc.el style/frenchb.el style/francais.el \ + style/MinionPro.el style/pdfsync.el style/polish.el \ + style/polski.el +STYLEELC = $(STYLESRC:.el=.elc) -EXTRA_DEPENDENCIES = $(ETC_ELCS) texi/tex-ref.dvi \ - texi/tex-ref.log INSTALLATION README CHANGES HISTORY +DISTCLEANFILES = auctex.el auto-loads.el +DISTTEXTS = FAQ INSTALL INSTALL.windows README TODO -DATA_FILES = $(ETC_ELCS) $(ETC_ELCS:%.elc=%.el) +EXTRA_DEPENDENCIES = $(STYLEELC) \ + doc/tex-ref.dvi doc/tex-ref.log \ + INSTALLATION README CHANGES \ + $(DATA_3_FILES) $(DATA_4_FILES) + +DATA_FILES = $(STYLEELC) $(STYLESRC) DATA_DEST = $(PACKAGE)/style -DATA_1_FILES = .dummy -DATA_1_DEST = $(PACKAGE)/var -DATA_2_FILES = $(wildcard images/*.xpm) +# DATA_1_FILES = .dummy +# DATA_1_DEST = $(PACKAGE)/var +# DATA_2_FILES = $(wildcard images/*.xpm) +# DATA_2_DEST = $(PACKAGE)/images +DATA_1_FILES = $(wildcard images/*.xpm) +DATA_1_DEST = $(PACKAGE)/images + +PRVSRC = preview/prv-emacs.el preview/preview.el preview/prv-xemacs.el +ELCS_1 = $(PRVSRC:.el=.elc) +ELCS_1_DEST = $(PACKAGE) +ELCS_1_FILES = $(ELCS_1) $(PRVSRC) + +ICON_SOURCES = \ + preview/images/prverr16.xpm preview/images/prverr20.xpm preview/images/prverr24.xbm \ + preview/images/prverr24.xpm preview/images/prvtex-cap-up.xpm preview/images/prvtex12.xbm \ + preview/images/prvtex12.xpm preview/images/prvtex16.xbm preview/images/prvtex16.xpm \ + preview/images/prvtex20.xpm preview/images/prvtex24.xbm preview/images/prvtex24.xpm \ + preview/images/prvwrk12.xpm preview/images/prvwrk14.xpm preview/images/prvwrk16.xpm \ + preview/images/prvwrk20.xpm preview/images/prvwrk24.xbm preview/images/prvwrk24.xpm +DATA_2_FILES = $(ICON_SOURCES) DATA_2_DEST = $(PACKAGE)/images +EXPLICIT_DOCS = doc/auctex.texi doc/preview-latex.texi +EXTRA_TEXI_FILES = \ + doc/changes.texi doc/faq.texi doc/fdl.texi doc/install.texi \ + doc/intro.texi doc/macros.texi doc/quickstart.texi \ + doc/todo.texi doc/version.texi \ + doc/preview-dtxdoc.texi doc/preview-faq.texi \ + doc/preview-problems.texi doc/preview-readme.texi \ + doc/preview-todo.texi \ + doc/tex-ref.tex doc/wininstall.texi doc/copying.texi RELEASE -EXPLICIT_DOCS = texi/auctex.texi -EXTRA_TEXI_FILES = texi/changes.texi texi/history.texi texi/install.texi \ - texi/intro.texi texi/macros.texi texi/intro.texi \ - texi/todo.texi texi/wininstall.texi -EXTRA_DOC_FILES = texi/tex-ref.tex +PRELOADS = -eval '(setq load-path (cons "." (cons "preview" load-path)))' -PRELOADS = -l lpath.el +ELCS = $(AUCELC) ifeq ($(BUILD_WITHOUT_MULE),) -ELCS += tex-jp.elc +ELCS += $(MULEELC) endif - -include ../../XEmacs.rules - %.dvi: %.tex ifneq ($(TEX),) cd $(＠D) && $(TEX) $(*F) ＠＠ -95,23 +127,104 ＠＠ - endif +RUN_MAKEINFO_INDIVIDUAL = $(MAKEINFO) -I doc/ -D rawfile --no-validate --force --no-headers -o $＠ $< + +## Preview latex +PL = preview/latex + +TEXMFGEN = preview.sty prauctex.def prauctex.cfg prshowbox.def \ + prshowlabels.def prtracingall.def prtightpage.def prlyx.def \ + prcounters.def prfootnotes.def + +PREVIEW_TEXMFGEN = $(foreach file,$(TEXMFGEN),$(PL)/$(file)) +DATA_3_FILES = $(PREVIEW_TEXMFGEN) +DATA_3_DEST = $(PACKAGE)/latex + +DATA_4_FILES = preview/latex/preview.dvi +DATA_4_DEST = $(PACKAGE)/doc + +EXTRA_AUTOLOADS_DEPENDENCIES = tex-site.el preview/auto.el + +include ../../XEmacs.rules + +# If Makefile or _pkg.el has changed (Makefile will trigger _pkg.el +# rebuilding), then our suppress forms may have changed. Just rebuilding +# the autoload file normally isn't enough as the old suppress forms will +# still sit there, so nuke it first. +$(AUTOLOAD_PATH)/auto-autoloads.el:: $(AUTOLOAD_PATH)/_pkg.el + rm -f $(AUTOLOAD_PATH)/auto-autoloads.el + +ifeq ($(XEMACS_21_5),t) +$(AUTOLOAD_PATH)/auto-autoloads.el:: $(GENERATED_ELC_DEPENDENCIES) $(EXTRA_AUTOLOADS_DEPENDENCIES) + rm -f $(AUTOLOAD_PATH)/auto-autoloads.el + $(XEMACS_BATCH_CLEAN) $(LOAD_AUTOLOADS) \ + -l autoload -f batch-update-directory-autoloads \ + $(PACKAGE) $(AUTOLOAD_PATH) + # The equivalent of `touch' is done automatically + cat tex-site.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + cat preview/auto.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + ＠rm -f $(AUTOLOAD_PATH)/auto-autoloads.el~ + echo "THIS IS XEMACS_21_5" + +$(AUTOLOAD_PATH)/custom-defines.el: $(GENERATED_ELC_DEPENDENCIES) $(EXTRA_AUTOLOADS_DEPENDENCIES) + $(XEMACS_BATCH_CLEAN) $(LOAD_AUTOLOADS) \ + -l autoload -f batch-update-directory-custom-defines \ + $(PACKAGE) $(AUTOLOAD_PATH) + ＠rm -f $(AUTOLOAD_PATH)/custom-defines.el~ + +else +AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"$(PACKAGE)\") +AUTOLOAD_FILE = (setq generated-autoload-file \ + \"$(AUTOLOAD_PATH)/auto-autoloads.el\") + +$(AUTOLOAD_PATH)/auto-autoloads.el:: $(GENERATED_ELC_DEPENDENCIES) $(EXTRA_AUTOLOADS_DEPENDENCIES) + rm -f $(AUTOLOAD_PATH)/auto-autoloads.el + $(XEMACS_BATCH_CLEAN) $(LOAD_AUTOLOADS) \ + -eval "$(AUTOLOAD_PACKAGE_NAME)" \ + -eval "$(AUTOLOAD_FILE)" \ + -l autoload -f batch-update-autoloads $^ + cat tex-site.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + cat preview/auto.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + ＠touch $(AUTOLOAD_PATH)/auto-autoloads.el + ＠rm -f $(AUTOLOAD_PATH)/auto-autoloads.el~ +endif + ## 70+ pages -texi/auc-tex.dvi: texi/auc-tex.texi - cd $(＠D) && $(TEX) "\nonstopmode\input auc-tex.texi" \ - && texindex auc-tex.ky && texindex auc-tex.fn \ - && texindex auc-tex.vr && texindex auc-tex.cp \ - && $(TEX) "\nonstopmode\input auc-tex.texi" +doc/auctex.dvi: doc/auctex.texi + cd $(＠D) && $(TEX) "\nonstopmode\input auctex.texi" \ + && texindex auctex.ky && texindex auctex.fn \ + && texindex auctex.vr && texindex auctex.cp \ + && $(TEX) "\nonstopmode\input auctex.texi" -RUN_MAKEINFO_INDIVIDUAL = $(MAKEINFO) -D rawfile -I texi/ --no-validate --force --no-headers -o $＠ $< - -INSTALLATION: texi/install.texi +INSTALLATION: doc/install.texi -$(RUN_MAKEINFO_INDIVIDUAL) -README: texi/intro.texi +README: doc/intro.texi -$(RUN_MAKEINFO_INDIVIDUAL) -CHANGES: texi/changes.texi +CHANGES: doc/changes.texi -$(RUN_MAKEINFO_INDIVIDUAL) -HISTORY: texi/history.texi +# does not build. +HISTORY: doc/history.texi -$(RUN_MAKEINFO_INDIVIDUAL) + +$(PL)/preview-mk.ins: $(PL)/preview.dtx $(PL)/bootstrap.ins + cd $(PL) && \ + $(TEX) '\nonstopmode \input bootstrap.ins' + +$(PL)/preview.ins: $(PL)/preview.dtx + cd $(PL) && \ + $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \ + '\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \ + '\endbatchfile' + +$(PREVIEW_TEXMFGEN) $(PL)/preview.drv: $(PL)/preview.dtx $(PL)/preview-mk.ins + cd $(PL) && \ + $(TEX) '\nonstopmode \input preview-mk.ins' + +$(PL)/preview.dvi: $(PL)/preview.drv $(PL)/preview.dtx $(PL)/preview.sty + cd $(PL) && \ + $(LATEX) '\nonstopmode \input preview.drv' && \ + $(LATEX) '\nonstopmode \input preview.drv' && \ + $(LATEX) '\nonstopmode \input preview.drv' diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 preview/latex/preview.dtx --- a/preview/latex/preview.dtx +++ b/preview/latex/preview.dtx ＠＠ -437,12 +437,12 ＠＠ \NeedsTeXFormat{LaTeX2e} \def\reserved＠a #1#2$#3: #4${\xdef#1{\reserved＠c #2#4 $}} \def\reserved＠c #1 #2${#1} \begingroup \catcode`\_=12 -\reserved＠a\pr＠version $Name$ \ifx\pr＠version\＠empty -\reserved＠a\pr＠version CVS-$Revision$ \endgroup \else +\reserved＠a\pr＠version $Name: release_11_84 $ \ifx\pr＠version\＠empty +\reserved＠a\pr＠version CVS-$Revision: 1.122 $ \endgroup \else \def\next release_{} \lccode`\_=`. \edef\next{\lowercase{\endgroup \def\noexpand\pr＠version{\expandafter\next\pr＠version}}} \next \fi -\reserved＠a\next $Date$ +\reserved＠a\next $Date: 2006/08/25 10:34:36 $ \edef\next{\noexpand\ProvidesPackage{preview}% [\next\space \pr＠version\space (AUCTeX/preview-latex)]} \next diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 preview/preview.el --- a/preview/preview.el +++ b/preview/preview.el ＠＠ -3511,8 +3511,8 ＠＠ (preview-reraise-error process))))) (defconst preview-version (eval-when-compile - (let ((name "$Name$") - (rev "$Revision$")) + (let ((name "$Name: $") + (rev "$Revision: 1.279 $")) (or (when (string-match "\\`[$]Name: *release_\$[^ ]+\$ *[$]\\'" name) (setq name (match-string 1 name)) (while (string-match "_" name) ＠＠ -3526,7 +3526,7 ＠＠ (defconst preview-release-date (eval-when-compile - (let ((date "$Date$")) + (let ((date "$Date: 2006-10-24 16:02:21 $")) (string-match "\\`[$]Date: *\$[0-9]+\$/\$[0-9]+\$/\$[0-9]+\$" date) Repository URL: https://bitbucket.org/xemacs/auctex/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

4 participants
3 comments

[COMMIT] Don't encode private code-points by default in UTF-8, #'encode-coding-region 7 years, 1 month

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1509006891 -3600 # Thu Oct 26 09:34:51 2017 +0100 # Node ID 32aa4c87fa7f91e059717f5a88300469d7c3e9d7 # Parent 3fa6bfc3ea4bb6bf9f2b354b9c5927232e23d7b0 Don't encode private code-points by default in UTF-8, #'encode-coding-region src/ChangeLog addition: 2017-10-26 Aidan Kehoe <kehoea(a)parhasard.net> * mule-coding.c (iso2022_encode): Pass the new ALLOW_PRIVATE argument to encode_unicode_to_dynarr(). * unicode.c: * unicode.c (struct unicode_coding_system): Add a new allow_private field here, respected on encoding and decoding. * unicode.c (CODING_SYSTEM_UNICODE_ALLOW_PRIVATE): New macro. * unicode.c (decode_utf_8): Make ALLOW_PRIVATE a Boolint in this function. * unicode.c (encode_unicode_to_dynarr): Take a new ALLOW_PRIVATE argument. * unicode.c (unicode_decode): * unicode.c (unicode_encode): Use the ALLOW_PRIVATE coding system property in these two functions. * unicode.c (unicode_putprop): Implement the ALLOW_PRIVATE property. * unicode.c (syms_of_unicode): Make Qallow_private available. * unicode.h: Declare encode_unicode_to_dynarr() as having an ALLOW_PRIVATE argument. diff -r 3fa6bfc3ea4b -r 32aa4c87fa7f src/ChangeLog --- a/src/ChangeLog Thu Oct 19 06:47:13 2017 +0100 +++ b/src/ChangeLog Thu Oct 26 09:34:51 2017 +0100 ＠＠ -1,3 +1,28 ＠＠ +2017-10-26 Aidan Kehoe <kehoea(a)parhasard.net> + + * mule-coding.c (iso2022_encode): + Pass the new ALLOW_PRIVATE argument to encode_unicode_to_dynarr(). + * unicode.c: + * unicode.c (struct unicode_coding_system): + Add a new allow_private field here, respected on encoding and + decoding. + * unicode.c (CODING_SYSTEM_UNICODE_ALLOW_PRIVATE): + New macro. + * unicode.c (decode_utf_8): + Make ALLOW_PRIVATE a Boolint in this function. + * unicode.c (encode_unicode_to_dynarr): + Take a new ALLOW_PRIVATE argument. + * unicode.c (unicode_decode): + * unicode.c (unicode_encode): + Use the ALLOW_PRIVATE coding system property in these two functions. + * unicode.c (unicode_putprop): + Implement the ALLOW_PRIVATE property. + * unicode.c (syms_of_unicode): + Make Qallow_private available. + * unicode.h: + Declare encode_unicode_to_dynarr() as having an ALLOW_PRIVATE + argument. + 2017-10-19 Aidan Kehoe <kehoea(a)parhasard.net> * symbols.c (Fapropos_internal): diff -r 3fa6bfc3ea4b -r 32aa4c87fa7f src/mule-coding.c --- a/src/mule-coding.c Thu Oct 19 06:47:13 2017 +0100 +++ b/src/mule-coding.c Thu Oct 26 09:34:51 2017 +0100 ＠＠ -3102,7 +3102,8 ＠＠ int code = ichar_to_unicode (ich, CONVERR_FAIL); if (encode_unicode_to_dynarr (code, str, src, dst, UNICODE_UTF_8, 0, - XCODING_SYSTEM_ISO2022_ESCAPE_QUOTED (codesys)) < 0) + XCODING_SYSTEM_ISO2022_ESCAPE_QUOTED (codesys), + 1) < 0) { ENCODING_ERROR_RETURN_OR_CONTINUE (str, src); } diff -r 3fa6bfc3ea4b -r 32aa4c87fa7f src/unicode.c --- a/src/unicode.c Thu Oct 19 06:47:13 2017 +0100 +++ b/src/unicode.c Thu Oct 26 09:34:51 2017 +0100 ＠＠ -202,7 +202,7 ＠＠ Lisp_Object Qunicode; Lisp_Object Qutf_16, Qutf_8, Qucs_4, Qutf_7, Qutf_32; -Lisp_Object Qneed_bom; +Lisp_Object Qneed_bom, Qallow_private; Lisp_Object Qutf_16_little_endian, Qutf_16_bom; Lisp_Object Qutf_16_little_endian_bom; ＠＠ -2705,6 +2705,7 ＠＠ enum unicode_encoding_type type; unsigned int little_endian :1; unsigned int need_bom :1; + unsigned int allow_private :1; }; #define CODING_SYSTEM_UNICODE_TYPE(codesys) \ ＠＠ -2719,6 +2720,10 ＠＠ (CODING_SYSTEM_TYPE_DATA (codesys, unicode)->need_bom) #define XCODING_SYSTEM_UNICODE_NEED_BOM(codesys) \ CODING_SYSTEM_UNICODE_NEED_BOM (XCODING_SYSTEM (codesys)) +#define CODING_SYSTEM_UNICODE_ALLOW_PRIVATE(codesys) \ + (CODING_SYSTEM_TYPE_DATA (codesys, unicode)->allow_private) +#define XCODING_SYSTEM_UNICODE_ALLOW_PRIVATE(codesys) \ + CODING_SYSTEM_UNICODE_ALLOW_PRIVATE (XCODING_SYSTEM (codesys)) static const struct memory_description unicode_coding_system_description[] = { { XD_END } ＠＠ -2777,7 +2782,7 ＠＠ void decode_utf_8 (struct unicode_coding_stream *data, unsigned_char_dynarr *dst, - UExtbyte c, int ignore_bom, int allow_private) + UExtbyte c, int ignore_bom, Boolint allow_private) { if (0 == data->counter) { ＠＠ -2942,7 +2947,8 ＠＠ unsigned_char_dynarr *dst, enum unicode_encoding_type type, int little_endian, - int preserve_error_characters) + Boolint preserve_error_characters, + Boolint allow_private) { int err = 0; if (code == -1) ＠＠ -3024,11 +3030,25 ＠＠ register int bytes; register unsigned char *dstp; + reconsider_length: if (code <= 0x7ff) bytes = 2; else if (code <= 0xffff) bytes = 3; - else if (code <= 0x1fffff) bytes = 4; - else if (code <= 0x3ffffff) bytes = 5; - else bytes = 6; + else if (code <= UNICODE_OFFICIAL_MAX) bytes = 4; + else if (allow_private) + { + if (code <= 0x1fffff) bytes = 4; + else if (code <= 0x3ffffff) bytes = 5; + else bytes = 6; + } + else + { + /* Not valid Unicode. Pass the replacement char (U+FFFD). */ + handle_encoding_error_before_output (str, src, dst, 1, + CODING_UNENCODABLE); + err = -1; + code = CANT_CONVERT_CHAR_WHEN_ENCODING_UNICODE; + goto reconsider_length; + } Dynarr_add_many (dst, 0, bytes); dstp = Dynarr_past_lastp (dst); ＠＠ -3091,6 +3111,7 ＠＠ int little_endian = XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (str->codesys); int ignore_bom = XCODING_SYSTEM_UNICODE_NEED_BOM (str->codesys); + Boolint allow_private = XCODING_SYSTEM_UNICODE_ALLOW_PRIVATE (str->codesys); Bytecount orign = n; int counter = data->counter; ＠＠ -3103,7 +3124,7 ＠＠ while (n--) { UExtbyte c = *src++; - decode_utf_8 (data, dst, c, ignore_bom, 0); + decode_utf_8 (data, dst, c, ignore_bom, allow_private); } counter = data->counter; ch = data->ch; ＠＠ -3339,6 +3360,8 ＠＠ XCODING_SYSTEM_UNICODE_TYPE (str->codesys); int little_endian = XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (str->codesys); + const Boolint allow_private + = XCODING_SYSTEM_UNICODE_ALLOW_PRIVATE (str->codesys); const Ibyte *srcend = src + n; #ifdef ENABLE_COMPOSITE_CHARS ＠＠ -3353,8 +3376,9 ＠＠ if (XCODING_SYSTEM_UNICODE_NEED_BOM (str->codesys) && !data->wrote_bom) { - assert (encode_unicode_to_dynarr (0xFEFF, str, src, dst, type, - little_endian, 0) >= 0); + text_checking_assert (encode_unicode_to_dynarr (0xFEFF, str, src, dst, + type, little_endian, + 0, allow_private) >= 0); data->wrote_bom = 1; } ＠＠ -3366,8 +3390,10 ＠＠ if (byte_ascii_p (c)) #endif /* MULE */ { - assert (encode_unicode_to_dynarr (c, str, src, dst, type, - little_endian, 0) >= 0); + text_checking_assert (encode_unicode_to_dynarr (c, str, src, dst, + type, little_endian, + 0, allow_private) + >= 0); src++; } #ifdef MULE ＠＠ -3383,7 +3409,7 ＠＠ #ifdef UNICODE_INTERNAL if (encode_unicode_to_dynarr (ich, str, src, dst, type, - little_endian, 0) < 0) + little_endian, 0, allow_private) < 0) { ENCODING_ERROR_RETURN_OR_CONTINUE (str, src); } ＠＠ -3398,7 +3424,8 ＠＠ /* #### Bother! We don't know how to handle this yet. */ encode_unicode_to_dynarr (-1, str, src, dst, - type, little_endian, 0); + type, little_endian, 0, + allow_private); ENCODING_ERROR_RETURN_OR_CONTINUE (str, src); } else ＠＠ -3423,7 +3450,8 ＠＠ charset_codepoint_to_unicode (charset, c1, c2, CONVERR_FAIL); if (encode_unicode_to_dynarr (code, str, src, dst, type, - little_endian, 0) < 0) + little_endian, 0, + allow_private) < 0) { ENCODING_ERROR_RETURN_OR_CONTINUE (str, src); } ＠＠ -3807,6 +3835,8 ＠＠ XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (codesys) = !NILP (value); else if (EQ (key, Qneed_bom)) XCODING_SYSTEM_UNICODE_NEED_BOM (codesys) = !NILP (value); + else if (EQ (key, Qallow_private)) + XCODING_SYSTEM_UNICODE_ALLOW_PRIVATE (codesys) = !NILP (value); else return 0; return 1; ＠＠ -3844,6 +3874,8 ＠＠ write_ascstring (printcharfun, ", little-endian"); if (XCODING_SYSTEM_UNICODE_NEED_BOM (cs)) write_ascstring (printcharfun, ", need-bom"); + if (XCODING_SYSTEM_UNICODE_ALLOW_PRIVATE (cs)) + write_ascstring (printcharfun, ", allow-private"); write_ascstring (printcharfun, ")"); } ＠＠ -3918,6 +3950,7 ＠＠ DEFSYMBOL (Qutf_7); DEFSYMBOL (Qneed_bom); + DEFSYMBOL (Qallow_private); DEFSYMBOL (Qutf_16); DEFSYMBOL (Qutf_16_little_endian); diff -r 3fa6bfc3ea4b -r 32aa4c87fa7f src/unicode.h --- a/src/unicode.h Thu Oct 19 06:47:13 2017 +0100 +++ b/src/unicode.h Thu Oct 26 09:34:51 2017 +0100 ＠＠ -94,10 +94,11 ＠＠ unsigned_char_dynarr *dst, enum unicode_encoding_type type, int little_endian, - int preserve_error_characters); + Boolint preserve_error_characters, + Boolint allow_private); void decode_utf_8 (struct unicode_coding_stream *data, unsigned_char_dynarr *dst, UExtbyte c, int ignore_bom, - int allow_private); + Boolint allow_private); void decode_unicode_to_dynarr (int ucs, unsigned_char_dynarr *dst); -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT TIME] Handle mixed TTY and window-system XEmacs better, don't pollute lossage, time.el 7 years, 1 month

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1508871793 -3600 # Tue Oct 24 20:03:13 2017 +0100 # Node ID 7daf4c73004fd4f47ef260baebad26953f7e0f5e # Parent e6d063da5d54876bcf3855c748b9d41453cb73d9 Handle mixed TTY and window-system XEmacs better, don't pollute lossage, time.el ChangeLog addition: 2017-10-24 Aidan Kehoe <kehoea(a)parhasard.net> * time.el: * time.el (display-time-mail-file): * time.el (display-time-insinuated): Moved earlier in the file. * time.el (display-time-mail-sign-string): * time.el (display-time-compatible): Removed. * time.el (load-conversion-table): * time.el (display-time-glyph-table): New. * time.el (display-time-string-to-char-list): Removed. * time.el (display-time-update-load-glyphs): New. * time.el (xpm-color-symbols)): New. * time.el (display-time-generate-time-glyphs): * time.el (display-time-update-time-glyphs): New. * time.el (display-time-insinuate): * time.el (display-time-convert-num): * time.el (display-time-convert-am-pm): * time.el (display-time-init-glyphs): Removed. * time.el (display-time-generate-mail-glyphs): New. * time.el (display-time-can-do-graphical-display): Removed. * time.el (display-time-mail-sign): * time.el (display-time-no-mail-sign): * time.el (display-time-convert-load): Removed. * time.el (display-time-form-list): * time.el (display-time-details): New. * time.el (make-display-time-details): New. * time.el (display-time-evaluate-list): * time.el (display-time-function): * time.el (display-time-string-forms): Removed. Extensive changes to this file. Thematically: 1. Rework very amateur code that called #'eval at runtime to map from a character to a glyph for the LED-type time display, use a hash table instead. 2. Instead of explicitly checking in Lisp within #'display-time-function for whether the current device can handle graphics, and failing to give reasonable output when the modeline is redisplayed on a TTY after being generated on a window-system, use specifier tags, as is the correct approach on XEmacs. This leads to simpler runtime code too. 3. Avoid using dynamic scope to communicate details of the current time to called functions, define a struct instead and pass an instance of that struct around. 4. Remove support for display-time-string-forms, long marked as deprecated. This was a list of forms to be evalled, with the performance and probably security drawbacks that implies. 5. When display-time-echo-area is t, don't log the output; this avoids filling up what #'view-lossage shows with a new message every minute, to the detriment of usability of that command. diff -r e6d063da5d54 -r 7daf4c73004f ChangeLog --- a/ChangeLog Thu May 15 21:13:05 2014 +0200 +++ b/ChangeLog Tue Oct 24 20:03:13 2017 +0100 ＠＠ -1,3 +1,53 ＠＠ +2017-10-24 Aidan Kehoe <kehoea(a)parhasard.net> + + * time.el: + * time.el (display-time-mail-file): + * time.el (display-time-insinuated): Moved earlier in the file. + * time.el (display-time-mail-sign-string): + * time.el (display-time-compatible): Removed. + * time.el (load-conversion-table): + * time.el (display-time-glyph-table): New. + * time.el (display-time-string-to-char-list): Removed. + * time.el (display-time-update-load-glyphs): New. + * time.el (xpm-color-symbols)): New. + * time.el (display-time-generate-time-glyphs): + * time.el (display-time-update-time-glyphs): New. + * time.el (display-time-insinuate): + * time.el (display-time-convert-num): + * time.el (display-time-convert-am-pm): + * time.el (display-time-init-glyphs): Removed. + * time.el (display-time-generate-mail-glyphs): New. + * time.el (display-time-can-do-graphical-display): Removed. + * time.el (display-time-mail-sign): + * time.el (display-time-no-mail-sign): + * time.el (display-time-convert-load): Removed. + * time.el (display-time-form-list): + * time.el (display-time-details): New. + * time.el (make-display-time-details): New. + * time.el (display-time-evaluate-list): + * time.el (display-time-function): + * time.el (display-time-string-forms): Removed. + Extensive changes to this file. Thematically: + + 1. Rework very amateur code that called #'eval at runtime to map + from a character to a glyph for the LED-type time display, use a + hash table instead. + 2. Instead of explicitly checking in Lisp within + #'display-time-function for whether the current device can handle + graphics, and failing to give reasonable output when the modeline + is redisplayed on a TTY after being generated on a window-system, + use specifier tags, as is the correct approach on XEmacs. This + leads to simpler runtime code too. + 3. Avoid using dynamic scope to communicate details of the current + time to called functions, define a struct instead and pass an + instance of that struct around. + 4. Remove support for display-time-string-forms, long marked as + deprecated. This was a list of forms to be evalled, with the + performance and probably security drawbacks that implies. + 5. When display-time-echo-area is t, don't log the output; this + avoids filling up what #'view-lossage shows with a new message + every minute, to the detriment of usability of that command. + 2014-05-15 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.16 released. diff -r e6d063da5d54 -r 7daf4c73004f time.el --- a/time.el Thu May 15 21:13:05 2014 +0200 +++ b/time.el Tue Oct 24 20:03:13 2017 +0100 ＠＠ -82,7 +82,6 ＠＠ balloon-help must be loaded before these settings take effect." :group 'display-time) - (defcustom display-time-mail-file nil "*File name of mail inbox file, for indicating existence of new mail. Non-nil and not a string means don't check for mail. nil means use ＠＠ -129,6 +128,8 ＠＠ :group 'display-time :type 'boolean) +(defvar display-time-insinuated nil) + ;;;###autoload (defun display-time () "Display current time, load level, and mail flag in mode line of each buffer. ＠＠ -187,7 +188,7 ＠＠ (defcustom display-time-mail-sign-string " Mail" "The string used as mail indicator in the echo area -(and in the modeline if display-time-show-icons-maybe is nil) +\(and in the modeline if display-time-show-icons-maybe is nil) if display-time-echo-area is t" :group 'display-time :type 'string) ＠＠ -355,251 +356,213 ＠＠ (number :tag "Threshold 5") (number :tag "Threshold 6"))) -(defcustom display-time-compatible nil - "*This variable may be set to t to get the old behaviour of display-time. -It should be considered obsolete and only be used if you really want the -old behaviour (eq. you made extensive customizations yourself). -This means no display of a spiffy mail icon or use of the -display-time-form-list instead of the old display-time-string-form." - :group 'display-time - :type 'boolean) +(defvar display-time-glyph-table (make-hash-table :test #'eq)) -(defun display-time-string-to-char-list (str) - (mapcar (function identity) str)) +(defsubst display-time-update-load-glyphs () + (if (not (equal display-time-display-pad display-time-display-pad-old)) + (display-time-generate-load-glyphs))) + +(defvar xpm-color-symbols) ;; Silence bytecomp warnings. -(defun display-time-generate-load-glyphs (&optional force) - (let* ((pad-color (if (symbolp display-time-display-pad) - (list "pad-color" '(face-background 'modeline)) - (list "pad-color" display-time-display-pad))) - (xpm-color-symbols (append (list pad-color) xpm-color-symbols))) - (if (and (featurep 'xpm) - (or force (not (equal display-time-display-pad - display-time-display-pad-old)))) - (progn - (setq display-time-load-0.0-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-0.0.xpm")))) - (setq display-time-load-0.5-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-0.5.xpm")))) - (setq display-time-load-1.0-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-1.0.xpm")))) - (setq display-time-load-1.5-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-1.5.xpm")))) - (setq display-time-load-2.0-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-2.0.xpm")))) - (setq display-time-load-2.5-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-2.5.xpm")))) - (setq display-time-load-3.0-glyph - (cons (make-extent nil nil) - (make-glyph - (concat display-time-icons-dir "l-3.0.xpm")))) - (setq display-time-display-pad-old display-time-display-pad) - )))) +(symbol-macrolet + ((load-conversion-table [#:0.0 #:0.5 #:1.0 #:1.5 #:2.0 #:2.5 #:3.0 1000])) + (fset + 'display-time-generate-load-glyphs + #'(lambda () + (let* ((xpm-color-symbols (cons `("pad-color" + ,(if (symbolp + display-time-display-pad) + '(face-background 'modeline) + display-time-display-pad)) + (if (featurep 'xpm) + xpm-color-symbols)))) + (macrolet + ((make-load-glyphs (&rest alist) + (cons + 'setf + (loop for (index string fallback) in alist + append + `((gethash (aref load-conversion-table ,index) + display-time-glyph-table) + (cons (make-extent nil nil) + (make-glyph `((global + ,＠(when (featurep 'xpm) + `((win + . + [xpm :file + ,(concat + display-time-icons-dir + ,(concat string + ".xpm"))]))) + ,,(or fallback + `(vector + 'string :data + (concat + " " + (number-to-string + (elt + display-time-load-list + ,index)))))))))))))) + (make-load-glyphs (0 "l-0.0") (1 "l-0.5") (2 "l-1.0") + (3 "l-1.5") (4 "l-2.0") (5 "l-2.5") + (6 "l-3.0" + (vector 'string :data + (format ">%f" + (elt display-time-load-list + 5)))))) + (setf display-time-display-pad-old + display-time-display-pad)))) + (fset + 'display-time-convert-load + #'(lambda (load-string &optional textual) + (if display-time-echo-area + (concat " " load-string) + (display-time-update-load-glyphs) + (gethash (aref load-conversion-table + (or (position (string-to-number load-string) + display-time-load-list :test #'<) + (1- (length load-conversion-table)))) + display-time-glyph-table))))) +(defsubst display-time-update-time-glyphs () + (when (or (not (equal display-time-display-time-background + display-time-display-time-bg-old)) + (not (equal display-time-display-time-foreground + display-time-display-time-fg-old))) + (display-time-generate-time-glyphs))) -(defun display-time-generate-time-glyphs (&optional force) - (let* ((ledbg (if (symbolp display-time-display-time-background) - (list "ledbg" '(face-background 'modeline)) - (list "ledbg" display-time-display-time-background))) - (ledfg (if (symbolp display-time-display-time-foreground) - (list "ledfg" '(face-foreground 'modeline)) - (list "ledfg" display-time-display-time-foreground))) - (xpm-color-symbols (append (list ledbg) - (list ledfg) xpm-color-symbols))) - (if (and (featurep 'xpm) - (or force (not (equal display-time-display-time-background - display-time-display-time-bg-old)) - (not (equal display-time-display-time-foreground - display-time-display-time-fg-old)))) - (progn - (setq display-time-1-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "1.xpm")))) - (setq display-time-2-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "2.xpm")))) - (setq display-time-3-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "3.xpm")))) - (setq display-time-4-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "4.xpm")))) - (setq display-time-5-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "5.xpm")))) - (setq display-time-6-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "6.xpm")))) - (setq display-time-7-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "7.xpm")))) - (setq display-time-8-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "8.xpm")))) - (setq display-time-9-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "9.xpm")))) - (setq display-time-0-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "0.xpm")))) - (setq display-time-:-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "dp.xpm")))) - (setq display-time-am-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "am.xpm")))) - (setq display-time-pm-glyph - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "pm.xpm")))) - (setq display-time-display-time-fg-old - display-time-display-time-foreground - display-time-display-time-bg-old - display-time-display-time-background) - )))) +(defun display-time-generate-time-glyphs () + (let* ((xpm-color-symbols (list* + `("ledbg" + ,(if (symbolp + display-time-display-time-background) + '(face-background 'modeline) + display-time-display-time-background)) + `("ledfg" + ,(if (symbolp + display-time-display-time-foreground) + '(face-foreground 'modeline) + display-time-display-time-foreground)) + (if (featurep 'xpm) xpm-color-symbols)))) + (macrolet + ((make-digit-glyphs (&rest digits) + (cons + 'setf + (loop for key in digits + append `((gethash ,key display-time-glyph-table) + (cons (make-extent nil nil) + (make-glyph `((global + ,＠(when + (featurep 'xpm) + `((win + . + [xpm :file + ,(concat + display-time-icons-dir + ,(format "%c.xpm" + key))]))) + ,,(vector 'string :data + (format "%c" key)))))))))) + (make-other-glyphs (&rest alist) + (cons + 'setf + (loop for (key . string) in alist + append `((gethash ,key display-time-glyph-table) + (cons (make-extent nil nil) + (make-glyph `((global + ,＠(when + (featurep 'xpm) + `((win + . + [xpm :file + ,(concat + display-time-icons-dir + ,(concat string + ".xpm"))]))) + ,,(vector + 'string :data + (concat " " + (upcase + string)))))))))))) + (make-digit-glyphs ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?0) + (make-other-glyphs ('am . "am") ('pm . "pm"))) + (setf (gethash ?: display-time-glyph-table) + (cons (make-extent nil nil) + (make-glyph `((global + ,＠(when (featurep 'xpm) + `((win . [xpm :file + ,(concat + display-time-icons-dir + "dp.xpm")]))) + [string :data ":"])))) + display-time-display-time-fg-old + display-time-display-time-foreground + display-time-display-time-bg-old + display-time-display-time-background))) -(defun display-time-init-glyphs () - "This is a hack to have all glyphs be displayed one time at startup. -It helps avoiding problems with the background color of the glyphs if a -balloon-help frame is open and a not yet displayed glyph is going to be -displayed." - (let ((i 0) - (list '("am" "pm" ":")) - elem mlist) - (while (< i 10) - (push (eval (intern-soft (concat "display-time-" - (number-to-string i) - "-glyph"))) mlist) - (setq i (1+ i))) - (setq i 0.0) - (while (<= i 3.0) - (push (eval (intern-soft (concat "display-time-load-" - (number-to-string i) - "-glyph"))) mlist) - (setq i (+ i 0.5))) - (while (setq elem (pop list)) - (push (eval (intern-soft (concat "display-time-" - elem "-glyph"))) mlist)) - (let ((global-mode-string mlist)) - (redisplay-frame)) - )) - -(defvar display-time-insinuated nil) +(defun display-time-generate-mail-glyphs () + (setf (gethash 'mail display-time-glyph-table) + (cons (let ((extent (make-extent nil nil))) + (setf (extent-property extent 'balloon-help) + 'display-time-mail-balloon) + extent) + (make-glyph + `((global + ,＠(when (featurep 'xpm) + `((win . [xpm :file ,(concat display-time-icons-dir + "letter.xpm")]))) + [string :data ,display-time-mail-sign-string])))) + (gethash 'no-mail display-time-glyph-table) + (cons (let ((extent (make-extent nil nil))) + (setf (extent-property extent 'balloon-help) + display-time-no-mail-balloon) ;; Yes, not a symbol. + extent) + (make-glyph + `((global + ,＠(when (featurep 'xpm) + `((win . [xpm :file ,(concat display-time-icons-dir + "no-letter.xpm")]))) + [string :data + ,(if (> (length display-time-no-mail-sign-string) 0) + (concat " " display-time-no-mail-sign-string) + display-time-no-mail-sign-string)])))))) ;; This used to be at top-level! (defun display-time-insinuate () - (when (featurep 'xpm) - (defvar display-time-mail-sign - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "letter.xpm")))) - (set-extent-property (car display-time-mail-sign) 'balloon-help - 'display-time-mail-balloon) -;;; (set-extent-keymap (car display-time-mail-sign) -;;; display-time-keymap) - (defvar display-time-no-mail-sign - (cons (make-extent nil nil) - (make-glyph (concat display-time-icons-dir "no-letter.xpm")))) - (set-extent-property (car display-time-no-mail-sign) 'balloon-help - display-time-no-mail-balloon) ;;; (set-extent-keymap (car display-time-no-mail-sign) ;;; display-time-keymap) - (defvar display-time-1-glyph nil) - (defvar display-time-2-glyph nil) - (defvar display-time-3-glyph nil) - (defvar display-time-4-glyph nil) - (defvar display-time-5-glyph nil) - (defvar display-time-6-glyph nil) - (defvar display-time-7-glyph nil) - (defvar display-time-8-glyph nil) - (defvar display-time-9-glyph nil) - (defvar display-time-0-glyph nil) - (defvar display-time-:-glyph nil) - (defvar display-time-am-glyph nil) - (defvar display-time-pm-glyph nil) - (defvar display-time-load-0.0-glyph nil) - (defvar display-time-load-0.5-glyph nil) - (defvar display-time-load-1.0-glyph nil) - (defvar display-time-load-1.5-glyph nil) - (defvar display-time-load-2.0-glyph nil) - (defvar display-time-load-2.5-glyph nil) - (defvar display-time-load-3.0-glyph nil) - (display-time-generate-time-glyphs 'force) - (display-time-generate-load-glyphs 'force) - (display-time-init-glyphs) - (sit-for 0)) + (display-time-generate-time-glyphs) + (display-time-generate-load-glyphs) + (display-time-generate-mail-glyphs) + (sit-for 0) (setq display-time-insinuated t)) +(defun display-time-convert-num (time-string balloon-help help-echo) + (if display-time-echo-area + time-string + (display-time-update-time-glyphs) + (loop for character across time-string + for glyph = (gethash character display-time-glyph-table) + then (gethash character display-time-glyph-table) + collect (prog1 + glyph + (setf (extent-property (car glyph) 'balloon-help) + balloon-help + (extent-property (car glyph) 'help-echo) + help-echo))))) -(defun display-time-can-do-graphical-display (&optional textual) - (and display-time-show-icons-maybe - (not textual) - (console-on-window-system-p) - (featurep 'xpm) - (not display-time-echo-area))) - - -(defun display-time-convert-num (time-string &optional textual) - (let ((list (display-time-string-to-char-list time-string)) - elem tmp balloon-help balloon-ext) - (if (not (display-time-can-do-graphical-display textual)) time-string - (display-time-generate-time-glyphs) - (setq balloon-help - (format "%s, %s %s %s %s" dayname day monthname year - (concat " Average load:" - (if (not (equal load "")) - load - " 0")))) - (setq balloon-ext (make-extent 0 (length balloon-help) balloon-help)) - (set-extent-property balloon-ext 'face 'display-time-time-balloon-face) - (set-extent-property balloon-ext 'duplicable 't) - (while (setq elem (pop list)) - (setq elem - (eval (intern-soft (concat "display-time-" - (char-to-string elem) - "-glyph")))) - (set-extent-property (car elem) 'balloon-help balloon-help) - (set-extent-property (car elem) 'help-echo - (format "%s, %s %s %s" - dayname day monthname year)) -;;; (set-extent-keymap (car elem) display-time-keymap) - (push elem tmp)) - (reverse tmp)))) - -(defun display-time-convert-load (load-string &optional textual) - (let ((load-number (string-to-number load-string)) - (alist (list (cons 0.0 0.0) - (cons 0.5 (car display-time-load-list)) - (cons 1.0 (cadr display-time-load-list)) - (cons 1.5 (caddr display-time-load-list)) - (cons 2.0 (cadddr display-time-load-list)) - (cons 2.5 (cadr (cdddr display-time-load-list))) - (cons 3.0 (caddr (cdddr display-time-load-list))) - (cons 100000 100000))) - elem load-elem) - (if (not (display-time-can-do-graphical-display textual)) - load-string - (display-time-generate-load-glyphs) - (while (>= load-number (cdr (setq elem (pop alist)))) - (setq load-elem elem)) - (eval (intern-soft (concat "display-time-load-" - (number-to-string (car load-elem)) - "-glyph")))))) - -(defun display-time-convert-am-pm (ampm-string &optional textual) - (if (not (display-time-can-do-graphical-display textual)) - ampm-string - (cond ((equal ampm-string "am") display-time-am-glyph) - ((equal ampm-string "pm") display-time-pm-glyph)))) +(defun display-time-convert-am-pm (ampm-string balloon-help help-echo) + (if display-time-echo-area + (concat " " ampm-string) + (let ((glyph (gethash (if (equal ampm-string "PM") 'pm 'am) + display-time-glyph-table))) + (if glyph + (prog1 + glyph + (setf (extent-property (car glyph) 'balloon-help) + balloon-help + (extent-property (car glyph) 'help-echo) + help-echo)))))) (defun display-time-mail-balloon (&rest ciao) (let* ((mail-spool-file (or display-time-mail-file ＠＠ -784,33 +747,29 ＠＠ ))) -(defun display-time-mail-sign (&optional textual) +(defsubst display-time-mail-sign () "*A function giving back the object indicating 'mail' which is the value of display-time-mail-sign when running under X, -display-time-echo-area is nil and display-time-show-icons-maybe is t. -It is the value of display-time-mail-sign-string otherwise or when -the optional parameter TEXTUAL is non-nil." - (if (not (display-time-can-do-graphical-display textual)) - display-time-mail-sign-string - (list " " display-time-mail-sign " "))) +display-time-echo-area is nil and display-time-show-icons-maybe is t." + (if display-time-echo-area + (concat " " display-time-mail-sign-string) + (list " " (gethash 'mail display-time-glyph-table) " "))) -(defun display-time-no-mail-sign (&optional textual) +(defsubst display-time-no-mail-sign () "*A function giving back the object indicating 'no mail' which is the value of display-time-no-mail-sign when running under X, display-time-echo-area is nil and display-time-show-icons-maybe is t. It is the value of display-time-no-mail-sign-string otherwise or when the optional parameter TEXTUAL is non-nil." - (if (not (display-time-can-do-graphical-display textual)) - display-time-no-mail-sign-string - (list " " display-time-no-mail-sign " "))) + (if display-time-echo-area + (concat " " display-time-no-mail-sign-string) + (list " " (gethash 'no-mail display-time-glyph-table) " "))) (defcustom display-time-form-list (list 'date 'time 'load 'mail) "*This list describes the format of the strings/glyphs which are to be displayed by display-time. -The old variable display-time-string-forms is only used if -display-time-compatible is non-nil. It is a list consisting of -strings or any of the following symbols: +The list comprises strings or any of the following symbols: There are three complex specs whose behaviour is changed via the setting of various variables ＠＠ -897,108 +856,131 ＠＠ (const :tag "Mail sign (text)" mail-text) (string :tag "String")))) -(defun display-time-evaluate-list () +(defstruct (display-time-details (:constructor nil)) + 24-hours hour 12-hours am-pm minutes seconds time-zone day month monthname + year dayname) + +(defun make-display-time-details (&optional time) + (read + (format-time-string + "[cl-struct-display-time-details \"%H\" ;; 24-hours +%k ;; Hour +\"%I\" ;; 12 hours +\"%p\" ;; am-pm +\"%M\" ;; minutes +\"%S\" ;; seconds +\"%Z\" ;; time-zone +\"%d\" ;; day +\"%m\" ;; month +\"%b\" ;; monthname (abbreviated) +\"%Y\" ;; year +\"%a\"] ;; dayname " time))) + +(defun display-time-evaluate-list (details load mail) "Evaluate the variable display-time-form-list" - (let ((list display-time-form-list) elem tmp result) - (while (setq elem (pop list)) + (let* ((help-echo (format "%s, %s %s %s" + (display-time-details-dayname details) + (display-time-details-day details) + (display-time-details-monthname details) + (display-time-details-year details))) + (balloon-help (concat help-echo " Average load:" + (if (not (equal load "")) load " 0"))) + (balloon-ext (make-extent 0 (length balloon-help) balloon-help)) + tmp) + (setf (extent-property balloon-ext 'face) + 'display-time-time-balloon-face + (extent-property balloon-ext 'duplicable) t) + (dolist (elem display-time-form-list) (cond ((stringp elem) (push elem tmp)) ((eq elem 'date) (push (if display-time-day-and-date - (format "%s %s %s " dayname monthname day) "") tmp)) + (concat (display-time-details-dayname details) + (display-time-details-monthname details) + (display-time-details-day details) + " ") + "") tmp)) ((eq elem 'time) (progn (push (display-time-convert-num - (format "%s:%s" - (if display-time-24hr-format 24-hours 12-hours) - minutes)) tmp) + (concat (if display-time-24hr-format + (display-time-details-24-hours details) + (display-time-details-12-hours details)) + ":" (display-time-details-minutes details)) + balloon-help help-echo) + tmp) (if (not display-time-24hr-format) - (push (display-time-convert-am-pm am-pm) tmp)))) + (push (display-time-convert-am-pm + (display-time-details-am-pm details) + balloon-help help-echo) tmp)))) ((eq elem 'time-text) - (push (display-time-convert-num - (format "%s:%s" - (if display-time-24hr-format 24-hours 12-hours) - minutes) t) tmp) + (push (concat (if display-time-24hr-format + (display-time-details-24-hours details) + (display-time-details-12-hours details)) + ":" (display-time-details-minutes details)) + tmp) (if (not display-time-24hr-format) - (push (display-time-convert-am-pm am-pm t) tmp))) - ((eq elem 'day) (push day tmp)) - ((eq elem 'dayname) (push dayname tmp)) - ((eq elem 'month) (push month tmp)) - ((eq elem 'monthname) (push monthname tmp)) + (push (display-time-convert-am-pm + (display-time-details-am-pm details) + balloon-help help-echo) tmp))) + ((eq elem 'day) (push (display-time-details-day details) tmp)) + ((eq elem 'dayname) + (push (display-time-details-dayname details) tmp)) + ((eq elem 'month) (push (display-time-details-month details) tmp)) + ((eq elem 'monthname) + (push (display-time-details-monthname details) tmp)) ((eq elem '24-hours) - (push (display-time-convert-num 24-hours) tmp)) + (push (display-time-convert-num + (display-time-details-24-hours details) + balloon-help help-echo) tmp)) ((eq elem 'year) - (push year tmp)) + (push (display-time-details-year details) tmp)) ((eq elem '24-hours-text) - (push (display-time-convert-num 24-hours t) tmp)) + (push (display-time-details-24-hours details) tmp)) ((eq elem '12-hours) - (push (display-time-convert-num 12-hours) tmp)) + (push (display-time-convert-num + (display-time-details-12-hours details) + balloon-help help-echo) tmp)) ((eq elem '12-hours-text) - (push (display-time-convert-num 12-hours t) tmp)) + (push (display-time-details-12-hours details) tmp)) ((eq elem 'minutes) - (push (display-time-convert-num minutes) tmp)) + (push (display-time-convert-num + (display-time-details-minutes details) + balloon-help help-echo) tmp)) + ((eq elem 'minutes-text) + (push (display-time-details-minutes details) tmp)) ((eq elem 'seconds) - (push (display-time-convert-num seconds) tmp)) - ((eq elem 'minutes-text) - (push (display-time-convert-num minutes t) tmp)) + (push (display-time-convert-num + (display-time-details-seconds details) + balloon-help help-echo) tmp)) ((eq elem 'am-pm) - (push (display-time-convert-am-pm am-pm) tmp)) + (push (display-time-convert-am-pm + (display-time-details-am-pm details) + balloon-help help-echo) tmp)) ((eq elem 'am-pm-text) - (push (display-time-convert-am-pm am-pm t) tmp)) + (push (display-time-details-am-pm details) tmp)) ((eq elem 'timezone) - (push time-zone tmp)) + (push (display-time-details-time-zone details) tmp)) ((eq elem 'load) (push (display-time-convert-load load) tmp)) ((eq elem 'load-text) - (push (display-time-convert-load load t) tmp)) + (push load tmp)) ((eq elem 'mail) (push (if mail (display-time-mail-sign) (display-time-no-mail-sign)) tmp)) ((eq elem 'mail-text) - (push (if mail (display-time-mail-sign t) - (display-time-no-mail-sign t)) tmp)) - )) + (push (if mail + display-time-mail-sign-string + display-time-no-mail-sign-string) tmp)))) ;; We know that we have a list containing only of strings if ;; display-time-echo-area is t. So we construct this string from ;; the list. Else we just reverse the list and give it as result. - (if (not display-time-echo-area) (setq result (reverse tmp)) - (while (setq elem (pop tmp)) - (setq result (concat elem result)))) - result)) - - -(defvar display-time-string-forms - '((if display-time-day-and-date - (format "%s %s %s " dayname monthname day) - "") - (format "%s:%s%s" - (if display-time-24hr-format 24-hours 12-hours) - minutes - (if display-time-24hr-format "" am-pm)) - load - (if mail " Mail" "")) - "*It will only be used if display-time-compatible is t. -A list of expressions governing display of the time in the mode line. -This expression is a list of expressions that can involve the keywords -`load', `day', `month', and `year', `12-hours', `24-hours', `minutes', -`seconds', all numbers in string form, and `monthname', `dayname', `am-pm', -and `time-zone' all alphabetic strings and `mail' a true/nil string value. - -For example, the form - - '((substring year -2) \"/\" month \"/\" day - \" \" 24-hours \":\" minutes \":\" seconds - (if time-zone \" (\") time-zone (if time-zone \")\")) - -would give mode line times like `94/12/30 21:07:48 (UTC)'.") - -(make-obsolete-variable 'display-time-string-forms - "You should use the new facilities for `display-time'. -Look at display-time-form-list.") + (setq tmp (nreverse tmp)) + (if display-time-echo-area (mapconcat #'identity tmp "") tmp))) (defun display-time-function () (let* ((now (current-time)) (nowhigh (* (- (nth 0 now) (* (/ (nth 0 now) 10) 10)) 65536)) - (time (current-time-string now)) + (display-time-details (make-display-time-details now)) (load (condition-case () (if (zerop (car (load-average))) "" (let ((str (format " %03d" (car (load-average))))) ＠＠ -1027,42 +1009,22 ＠＠ (setq display-time-server-down-time (+ (nth 1 now) nowhigh)) ;; Record that mail file is accessible. - (setq display-time-server-down-time nil)))))) - (24-hours (substring time 11 13)) - (hour (string-to-int 24-hours)) - (12-hours (int-to-string (1+ (% (+ hour 11) 12)))) - (am-pm (if (>= hour 12) "pm" "am")) - (minutes (substring time 14 16)) - (seconds (substring time 17 19)) - (time-zone (car (cdr (current-time-zone now)))) - (day (substring time 8 10)) - (year (substring time 20 24)) - (monthname (substring time 4 7)) - (month - (cdr - (assoc - monthname - '(("Jan" . "1") ("Feb" . "2") ("Mar" . "3") ("Apr" . "4") - ("May" . "5") ("Jun" . "6") ("Jul" . "7") ("Aug" . "8") - ("Sep" . "9") ("Oct" . "10") ("Nov" . "11") ("Dec" . "12"))))) - (dayname (substring time 0 3))) + (setq display-time-server-down-time nil))))))) (setq display-time-string - (if display-time-compatible - (mapconcat 'eval display-time-string-forms "") - (display-time-evaluate-list))) + (display-time-evaluate-list display-time-details load mail)) ;; This is inside the let binding, but we are not going to document ;; what variables are available. (run-hooks 'display-time-hook)) (if display-time-echo-area - (or (> (minibuffer-depth) 0) - ;; don't stomp echo-area-buffer if reading from minibuffer now. + (or (> (minibuffer-depth) 0) ;; Don't stomp echo-area-buffer if reading + ;; from minibuffer now. (save-excursion (save-window-excursion (select-window (minibuffer-window)) (erase-buffer) - (indent-to (- (frame-width) (length display-time-string) 1)) - (insert display-time-string) - (message (buffer-string))))) + (insert (format "%*s" (1- (frame-width)) display-time-string)) + ;; Don't leave the time in view-lossage. + (display-message 'no-log (buffer-string))))) (force-mode-line-update) ;; Do redisplay right now, if no input pending. (sit-for 0))) -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Use elisp_maphash(), #'apropos-internal, PREDICATE can call Lisp 7 years, 2 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been commited # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1508392033 -3600 # Thu Oct 19 06:47:13 2017 +0100 # Node ID 3fa6bfc3ea4bb6bf9f2b354b9c5927232e23d7b0 # Parent 95a188885942f52fda8d85b7f132163a90fd8943 Use elisp_maphash(), #'apropos-internal, PREDICATE can call Lisp src/ChangeLog addition: 2017-10-19 Aidan Kehoe <kehoea(a)parhasard.net> * symbols.c (Fapropos_internal): PREDICATE can call Lisp, use elisp_maphash() instead of elisp_maphash_unsafe() in this function. diff -r 95a188885942 -r 3fa6bfc3ea4b src/ChangeLog --- a/src/ChangeLog Tue Oct 17 14:48:30 2017 +0100 +++ b/src/ChangeLog Thu Oct 19 06:47:13 2017 +0100 ＠＠ -1,3 +1,9 ＠＠ +2017-10-19 Aidan Kehoe <kehoea(a)parhasard.net> + + * symbols.c (Fapropos_internal): + PREDICATE can call Lisp, use elisp_maphash() instead of + elisp_maphash_unsafe() in this function. + 2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net> * sequence.c (position): diff -r 95a188885942 -r 3fa6bfc3ea4b src/symbols.c --- a/src/symbols.c Tue Oct 17 14:48:30 2017 +0100 +++ b/src/symbols.c Thu Oct 19 06:47:13 2017 +0100 ＠＠ -195,7 +195,7 ＠＠ closure.predicate = predicate; closure.accumulation = Qnil; GCPRO1 (closure.accumulation); - elisp_maphash_unsafe (apropos_mapper, package, &closure); + elisp_maphash (apropos_mapper, package, &closure); closure.accumulation = list_sort (closure.accumulation, check_string_lessp_nokey, Qnil, Qnil); UNGCPRO; -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Correct the definition of the STRING_FULLSIZE() macro, alloc.c, NEW_GC 7 years, 2 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1508246164 -3600 # Tue Oct 17 14:16:04 2017 +0100 # Node ID 81e6fa9d46d02bedd36f321266b3f5787055e1b0 # Parent 222b2a338e9daa7f4b7c12efe00859c76058e946 Correct the definition of the STRING_FULLSIZE() macro, alloc.c, NEW_GC src/ChangeLog addition: 2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net> * alloc.c (STRING_FULLSIZE): Correct the definition of this macro under NEW_GC, get the NEW_GC build working again. Incidentally wake up the buildbot with this commit. diff -r 222b2a338e9d -r 81e6fa9d46d0 src/ChangeLog --- a/src/ChangeLog Fri Oct 13 21:29:51 2017 +0100 +++ b/src/ChangeLog Tue Oct 17 14:16:04 2017 +0100 ＠＠ -7,6 +7,13 ＠＠ Removed unused file-local C variables QSsubstitute, Qsubstitute_negated from these files. +2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * alloc.c (STRING_FULLSIZE): + Correct the definition of this macro under NEW_GC, get the NEW_GC + build working again. + Incidentally wake up the buildbot with this commit. + 2017-10-07 Aidan Kehoe <kehoea(a)parhasard.net> * eval.c (Feval): diff -r 222b2a338e9d -r 81e6fa9d46d0 src/alloc.c --- a/src/alloc.c Fri Oct 13 21:29:51 2017 +0100 +++ b/src/alloc.c Tue Oct 17 14:16:04 2017 +0100 ＠＠ -2802,7 +2802,7 ＠＠ #ifdef NEW_GC #define STRING_FULLSIZE(size) \ - ALIGN_SIZE (FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_String_Direct_Data, Lisp_Object, data, (size) + 1), sizeof (Lisp_Object *)); + ALIGN_SIZE (FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_String_Direct_Data, Lisp_Object, data, (size) + 1), sizeof (Lisp_Object *)) #else /* not NEW_GC */ /* String blocks contain this many useful bytes. */ #define STRING_CHARS_BLOCK_SIZE \ -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Handle START a bit better for string arguments, #'find, #'position 7 years, 2 months

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1508248110 -3600 # Tue Oct 17 14:48:30 2017 +0100 # Node ID 95a188885942f52fda8d85b7f132163a90fd8943 # Parent 81e6fa9d46d02bedd36f321266b3f5787055e1b0 Handle START a bit better for string arguments, #'find, #'position src/ChangeLog addition: 2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net> * sequence.c (position): Handle START a bit better, use XSTRING_ASCII_BEGIN() so we don't have to step through each character for the constant-byte-length part of the string. diff -r 81e6fa9d46d0 -r 95a188885942 src/ChangeLog --- a/src/ChangeLog Tue Oct 17 14:16:04 2017 +0100 +++ b/src/ChangeLog Tue Oct 17 14:48:30 2017 +0100 ＠＠ -1,3 +1,10 ＠＠ +2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * sequence.c (position): + Handle START a bit better, use XSTRING_ASCII_BEGIN() so we don't + have to step through each character for the constant-byte-length + part of the string. + 2017-10-13 Aidan Kehoe <kehoea(a)parhasard.net> * doc.c: diff -r 81e6fa9d46d0 -r 95a188885942 src/sequence.c --- a/src/sequence.c Tue Oct 17 14:16:04 2017 +0100 +++ b/src/sequence.c Tue Oct 17 14:48:30 2017 +0100 ＠＠ -1681,10 +1681,16 ＠＠ } else if (STRINGP (sequence)) { - Ibyte *startp = XSTRING_DATA (sequence), *cursor = startp; - Bytecount byte_len = XSTRING_LENGTH (sequence), cursor_offset = 0; + Ibyte *startp = XSTRING_DATA (sequence), *cursor; + Bytecount byte_len = XSTRING_LENGTH (sequence), cursor_offset; Lisp_Object character = Qnil; + cursor_offset = ii = (Bytecount) (min (XSTRING_ASCII_BEGIN (sequence), + starting)); + cursor = startp + cursor_offset; + /* It's probably worth making this even faster for the + non-variable-width-string case. Not now, though. */ + while (cursor_offset < byte_len && ii < ending) { if (ii >= starting) -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches October 2017