Spell checking broken by non-default dictionary (#827033)

This commit is contained in:
Petr Hracek 2013-04-08 13:26:23 +02:00
parent a0dbe3ce2b
commit 1e51ea0bb9
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 2740d9c..e56e576 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1171,7 +1171,7 @@ aspell is used along with Emacs).")
;; Unless default dict, re-add "-d" option with the mapped value
(if dict-name
(if dict-equiv
- (nconc ispell-args (list "-d" dict-equiv))
+ (setq ispell-args (nconc ispell-args (list "-d" dict-equiv)))
(message
"ispell-set-spellchecker-params: Missing hunspell equiv for \"%s\". Skipping."
dict-name)

View File

@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 24.2
Release: 16%{?dist}
Release: 17%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@ -30,6 +30,8 @@ Patch11: emacs-bell-dont-work.patch
Patch12: emacs-gtk-warning.patch
# Fix for emacs bug #13460.
Patch100: emacs-24.2-hunspell.patch
# Fix for emacs bug #827033.
Patch101: emacs-24.2-hunspell.2.patch
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
@ -171,6 +173,7 @@ packages that add functionality to Emacs.
%patch12 -p1 -b .gtk-warning.patch
%patch100 -p1 -b .hunspell
%patch101 -p1 -b .hunspell.2
# We prefer our emacs.desktop file
cp %SOURCE1 etc/emacs.desktop
@ -208,6 +211,7 @@ ln -s ../../%{name}/%{version}/etc/NEWS doc
# Remove unpatched files as all files in the lisp directory are
# installed.
rm lisp/textmodes/ispell.el.hunspell
rm lisp/textmodes/ispell.el.hunspell.2
rm lisp/textmodes/ispell.el.spellchecker
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
@ -448,6 +452,9 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
* Mon Apr 08 2013 Petr Hracek <phracek@redhat.com> - 1:24.2-17
- Spell checking broken by non-default dictionary (#827033)
* Thu Apr 04 2013 Petr Hracek <phracek@redhat.com> - 1:24.2-16
- Fix #929353: emacs gives gtk-warning