rpms/xemacs/devel xemacs-21.5.29-arabic-547840.patch, NONE, 1.1 xemacs.spec, 1.58, 1.59
Jerry James
jjames at fedoraproject.org
Mon Dec 21 23:27:04 UTC 2009
Author: jjames
Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23852/devel
Modified Files:
xemacs.spec
Added Files:
xemacs-21.5.29-arabic-547840.patch
Log Message:
* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
- Don't crash with a Persian keyboard layout (bz 547840).
xemacs-21.5.29-arabic-547840.patch:
ChangeLog | 10 ++++++
mule/arabic.el | 30 +++++++++++++++++-
mule/iso-with-esc.el | 83 ---------------------------------------------------
unicode.el | 1
4 files changed, 39 insertions(+), 85 deletions(-)
--- NEW FILE xemacs-21.5.29-arabic-547840.patch ---
diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog
--- xemacs-21.5.29.ORIG/lisp/ChangeLog 2009-12-21 16:14:56.870726786 -0700
+++ xemacs-21.5.29/lisp/ChangeLog 2009-12-21 16:16:50.931726958 -0700
@@ -1,3 +1,13 @@
+2009-12-21 Aidan Kehoe <kehoea at parhasard.net>
+
+ * mule/arabic.el (arabic-iso8859-6):
+ Move the creation of this character set to this (dumped) file,
+ since it's needed for input on X11.
+ * mule/iso-with-esc.el:
+ Remove arabic-iso8859-6 and its Unicode map from this file.
+ * unicode.el (load-unicode-tables):
+ Load arabic-iso8859-6 on startup again.
+
2009-11-01 Stephen Turnbull <stephen at xemacs.org>
* faces.el (Face-frob-property):
diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el
--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/arabic.el 2009-12-21 16:15:16.751751709 -0700
@@ -28,8 +28,34 @@
;;; Code:
-;; See iso-with-esc.el for commentary on the ISO standard Arabic character
-;; set.
+;; 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.
+
+;; But; it's necessary for input on X11.
+
+(make-charset
+ 'arabic-iso8859-6
+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127"
+ '(dimension 1
+ registry "ISO8859-6"
+ chars 96
+ columns 1
+ direction r2l
+ final ?G
+ graphic 1
+ short-name "RHP of ISO8859/6"
+ long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127"))
(make-8-bit-coding-system
'iso-8859-6
diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el
--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2009-05-18 08:51:06.000000000 -0600
+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2009-12-21 16:15:16.752749776 -0700
@@ -120,89 +120,6 @@
safe-charsets (ascii greek-iso8859-7)
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
diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el
--- xemacs-21.5.29.ORIG/lisp/unicode.el 2009-05-18 08:51:07.000000000 -0600
+++ xemacs-21.5.29/lisp/unicode.el 2009-12-21 16:15:16.752749776 -0700
@@ -73,6 +73,7 @@
("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)
Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xemacs.spec 8 Dec 2009 17:17:38 -0000 1.58
+++ xemacs.spec 21 Dec 2009 23:27:03 -0000 1.59
@@ -22,7 +22,7 @@
Name: xemacs
Version: 21.5.29
-Release: 9%{?snap:.%{snap}}%{?dist}
+Release: 10%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -56,6 +56,8 @@ Patch9: %{name}-21.5.29-destdir.
Patch10: %{name}-21.5.29-tty-font-512623.patch
# Sent upstream 2009-12-08
Patch11: %{name}-21.5.29-etags-memmove-545399.patch
+# Applied upstream 2009-12-21
+Patch12: %{name}-21.5.29-arabic-547840.patch
# Sent upstream 2009-03-12
Patch14: %{name}-beta-infodir.patch
@@ -229,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%patch14 -p1
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -592,6 +595,9 @@ fi
%changelog
+* Mon Dec 21 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-10
+- Don't crash with a Persian keyboard layout (bz 547840)
+
* Tue Dec 8 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-9
- Add patch to use memmove in etags (bz 545399).
More information about the fedora-extras-commits
mailing list