From 8633619510e0dbfa5371eeb36c92bb6a2b7836ff Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Thu, 3 Dec 2009 13:13:40 +0000 Subject: [PATCH] - fix #542657 - emacs does not display indic text --- emacs-23.1-indian.patch | 23 +++++++++++++++++++++++ emacs.spec | 9 +++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 emacs-23.1-indian.patch 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 7994f5d..9829ea1 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -26,6 +26,7 @@ Patch0: glibc-open-macro.patch Patch1: rpm-spec-mode.patch Patch2: po-mode-auto-replace-date-71264.patch Patch3: rpm-spec-mode-utc.patch +Patch4: emacs-23.1-indian.patch #Patch4: emacsclient.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 @@ -48,6 +49,7 @@ BuildRequires: desktop-file-utils Requires: desktop-file-utils Conflicts: gettext < 0.10.40 Provides: emacs(bin) +Requires: m17n-db-datafiles Obsoletes: emacs-nxml-mode < 0.20041004-10 Provides: emacs-nxml-mode = 0.20041004-10 @@ -117,7 +119,7 @@ Emacs packages or see some elisp examples. %prep %setup -q %patch0 -p1 -b .glibc-open-macro -#%%patch4 -p1 +%patch4 -p1 # install rest of site-lisp files ( cd site-lisp @@ -382,6 +384,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-7 +- fix #542657 - emacs does not display indic text + * Wed Oct 14 2009 Jonathan G. Underwood - 1:23.1-6 - Update macros.xemacs to treat epoch correctly and be consistent with xemacs package - Use site_start_d macro consistently