From 6c1c662e7509283c2f7c61a5950b31c99c17e404 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Dec 03 2009 12:20:22 +0000 Subject: - fix #542657 - emacs does not display indic text --- diff --git a/emacs-23.1-indian.patch b/emacs-23.1-indian.patch new file mode 100644 index 0000000..503f2cf --- /dev/null +++ b/emacs-23.1-indian.patch @@ -0,0 +1,23 @@ +diff -up emacs-23.1/lisp/language/indian.el.indian emacs-23.1/lisp/language/indian.el +--- emacs-23.1/lisp/language/indian.el.indian 2009-12-03 13:03:04.000000000 +0100 ++++ emacs-23.1/lisp/language/indian.el 2009-12-03 13:05:53.000000000 +0100 +@@ -165,15 +165,15 @@ South Indian language Malayalam is suppo + "Regexp matching a composable sequence of Malayalam characters.") + + (let ((script-regexp-alist +- `((devanagari . ,devanagari-composable-pattern) ++ `((devanagari . "[\x900-\x97F\x200C\x200D]+") + (bengali . "[\x980-\x9FF\x200C\x200D]+") + (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+") + (gujarati . "[\xA80-\xAFF\x200C\x200D]+") + (oriya . "[\xB00-\xB7F\x200C\x200D]+") +- (tamil . ,tamil-composable-pattern) ++ (tamil . "[\xB80-\xBFF\x200C\x200D]+") + (telugu . "[\xC00-\xC7F\x200C\x200D]+") +- (kannada . ,kannada-composable-pattern) +- (malayalam . ,malayalam-composable-pattern)))) ++ (kannada . "[\xC80-\xCFF\x200C\x200D]+") ++ (malayalam . "[\xD00-\xD7F\x200C\x200D]+")))) + (map-char-table + #'(lambda (key val) + (let ((slot (assq val script-regexp-alist))) diff --git a/emacs.spec b/emacs.spec index 728b3a2..de8b1f0 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.1 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -30,6 +30,7 @@ Patch4: emacs-gtk.patch Patch5: emacs-23.1-xdg.patch Patch6: emacs-23.1-cpp.patch Patch7: emacs-23.1-scroll.patch +Patch8: emacs-23.1-indian.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel @@ -56,6 +57,7 @@ Provides: emacs(bin) # #516391 Obsoletes: emacs-nxml-mode < 0.20041004-10 Provides: emacs-nxml-mode = 0.20041004-10 +Requires: m17n-db-datafiles # C and build patches @@ -126,6 +128,7 @@ Emacs packages or see some elisp examples. %patch5 -p1 -b .xdg %patch6 -p1 %patch7 -p1 -b .scroll +%patch8 -p1 # install rest of site-lisp files ( cd site-lisp @@ -397,6 +400,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Thu Dec 03 2009 Daniel Novotny 1:23.1-16 +- fix #542657 - emacs does not display indic text + * Wed Dec 02 2009 Daniel Novotny 1:23.1-15 - fix #543046 - Using scroll bar in emacs highlights/selects text