← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/dictionaries-common/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/800_ispell.el_has-defvaralias.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2011-06-08 13:18:25 UTC
  • mfrom: (1.1.37 sid)
  • Revision ID: james.westby@ubuntu.com-20110608131825-fimpnbuh09dmbkcd
Tags: 1.11.3ubuntu1
https://launchpad.net/bugs/794498
* Merge from debian unstable. (LP: #794498) 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/800_ispell.el_has-defvaralias.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 800_ispell.el_has-defvaralias.dpatch by Agustin Martin Domingo <agmartin@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Use defvaralias only if available
6
 
 
7
 
(defvaralias) availability
8
 
   emacs21: no
9
 
   emacs22: yes
10
 
   emacs23: yes
11
 
   emacs-snapshot: yes
12
 
   xemacs: si
13
 
 
14
 
@DPATCH@
15
 
diff -urNad dictionaries-common~/support/emacsen/ispell.el dictionaries-common/support/emacsen/ispell.el
16
 
--- dictionaries-common~/support/emacsen/ispell.el      2007-06-07 16:22:05.000000000 +0200
17
 
+++ dictionaries-common/support/emacsen/ispell.el       2007-06-07 16:23:54.000000000 +0200
18
 
@@ -421,7 +421,8 @@
19
 
 The function must take one string argument and return a string."
20
 
   :type 'function
21
 
   :group 'ispell)
22
 
-(defvaralias 'ispell-format-word 'ispell-format-word-function)
23
 
+(if (fboundp 'defvaralias)
24
 
+    (defvaralias 'ispell-format-word 'ispell-format-word-function))
25
 
 
26
 
 (defcustom ispell-use-framepop-p nil
27
 
   "When non-nil ispell uses framepop to display choices in a dedicated frame.