← Back to branch summary

~ubuntu-branches/ubuntu/natty/dictionaries-common/natty

« back to all changes in this revision

Viewing changes to debian/patches/210_ispell.el_session-localwords.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2011-02-01 21:25:19 UTC
  • mfrom: (1.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20110201212519-b6t8xingamsqyn4q
Tags: 1.5.17ubuntu1
https://launchpad.net/bugs/711487
* Merge from debian unstable. (LP: #711487) Remaining changes:
  - scripts/system/dc-debconf-select.pl: Drop default debconf priority
    from 'high' to 'medium'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/210_ispell.el_session-localwords.dpatch
8
8
 
9
9
@DPATCH@
10
10
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dictionaries-common~/support/emacsen/ispell.el dictionaries-common/support/emacsen/ispell.el
11
 
--- dictionaries-common~/support/emacsen/ispell.el      2010-06-16 11:59:19.000000000 +0200
12
 
+++ dictionaries-common/support/emacsen/ispell.el       2010-06-16 12:51:06.000000000 +0200
 
11
--- dictionaries-common~/support/emacsen/ispell.el      2011-01-12 13:13:08.000000000 +0100
 
12
+++ dictionaries-common/support/emacsen/ispell.el       2011-01-12 13:14:24.000000000 +0100
13
13
@@ -1142,7 +1142,8 @@
14
14
        `(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
15
15
                    :help ,(purecopy "Supply explicit dictionary file name")))
25
25
             ["Complete Word Frag"ispell-complete-word-interior-frag t]
26
26
             ["Complete Word"   ispell-complete-word            t]
27
27
-            ["Kill Process"    ispell-kill-ispell              t]
28
 
+            ["Kill Process"    ispell-kill-ispell       t 'clear]
 
28
+            ["Kill Process"    (ispell-kill-ispell nil 'clear) t]
29
29
             ["Customize..."    (customize-group 'ispell)       t]
30
30
             ;; flyspell-mode may not be bound...
31
31
             ;;["flyspell"      flyspell-mode
51
51
                    (if (null ispell-pdict-modified-p)
52
52
                        (setq ispell-pdict-modified-p
53
53
                              (list ispell-pdict-modified-p)))
54
 
@@ -2687,13 +2696,16 @@
 
54
@@ -2697,13 +2706,16 @@
55
55
        (set-process-query-on-exit-flag ispell-process nil))))
56
56
 
57
57
 ;;;###autoload
70
70
   (if (not (and ispell-process
71
71
                (eq (ispell-process-status) 'run)))
72
72
       (or no-error
73
 
@@ -2761,6 +2773,7 @@
 
73
@@ -2771,6 +2783,7 @@
74
74
               (setq ispell-local-dictionary-overridden t))
75
75
           (error "Undefined dictionary: %s" dict))
76
76
         (ispell-internal-change-dictionary)
78
78
         (message "%s Ispell dictionary set to %s"
79
79
                  (if arg "Global" "Local")
80
80
                  dict))))
81
 
@@ -3850,6 +3863,11 @@
 
81
@@ -3877,6 +3890,11 @@
82
82
   ;; Actually start a new ispell process, because we need
83
83
   ;; to send commands now to specify the local words to it.
84
84
   (ispell-init-process)