← Back to branch summary

~ubuntu-dev/ubuntu/lucid/dictionaries-common/lucid-201002110914

« back to all changes in this revision

Viewing changes to debian/patches/471_ispell.el_hunspell-nil-character-mode.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-05-14 08:30:40 UTC
  • mfrom: (1.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090514083040-ezikpis3zhc0aff5
Tags: 1.2.1ubuntu1
https://launchpad.net/bugs/371263
* Merge from debian unstable, remaining changes: LP: #371263
  - ./scripts/system/dc-debconf-select.pl: Drop default debconf priority
    from 'critical' to 'medium'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/471_ispell.el_hunspell-nil-character-mode.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 471_ispell.el_hunspell-nil-character-mode.dpatch by  <agmartin@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Make sure extended-character-mode is nil for hunspell
 
6
 
 
7
Work around hunspell not ignoring extended-character-mode
 
8
set from pipe mode by making sure extended-character-mode
 
9
is nil for hunspell.
 
10
 
 
11
See
 
12
 
 
13
https://sourceforge.net/tracker/?func=detail&atid=756395&aid=2617130&group_id=143754
 
14
 
 
15
@DPATCH@
 
16
diff -urNad dictionaries-common~/support/emacsen/ispell.el dictionaries-common/support/emacsen/ispell.el
 
17
--- dictionaries-common~/support/emacsen/ispell.el      2009-03-10 00:00:23.000000000 +0100
 
18
+++ dictionaries-common/support/emacsen/ispell.el       2009-03-10 00:08:12.000000000 +0100
 
19
@@ -1381,8 +1381,10 @@
 
20
   (nth 5 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
 
21
             (assoc ispell-current-dictionary ispell-dictionary-alist))))
 
22
 (defun ispell-get-extended-character-mode ()
 
23
-  (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
 
24
-            (assoc ispell-current-dictionary ispell-dictionary-alist))))
 
25
+  (if ispell-really-hunspell     ;; hunspell treats ~word as ordinary words
 
26
+      nil                        ;; in pipe mode. Disable extended-char-mode
 
27
+    (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
 
28
+              (assoc ispell-current-dictionary ispell-dictionary-alist)))))
 
29
 (defalias 'ispell-get-coding-system 'debian-ispell-get-coding-system)
 
30
 
 
31