← Back to branch summary

~ubuntu-branches/ubuntu/precise/emacs-goodies-el/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/51_todoo_bug267637.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-06-22 19:03:03 UTC
  • mfrom: (4.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20100622190303-ygrbht6kae9ukl8m
Tags: 33.6ubuntu1
https://launchpad.net/bugs/597284
* Merge from debian unstable.  Remaining changes: LP: #597284
  - Add {hardy,jaunty,karmic,lucid}-proposed distribution targets
    to dpkg-dev-el.
  - Add maverick{,-proposed} distribution targets; drop out the lucid
    non-proposed target, since uploads to the release pocket are not
    permitted for stable releases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/51_todoo_bug267637.dpatch
1
 
#!/bin/sh -e
2
 
## 51_todoo_bug267637.dpatch by Peter S Galbraith <psg@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
if [ $# -ne 1 ]; then
8
 
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
9
 
    exit 1
10
 
fi
11
 
 
12
 
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
13
 
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
14
 
 
15
 
case "$1" in
16
 
       -patch) patch $patch_opts -p1 < $0;;
17
 
       -unpatch) patch $patch_opts -p1 -R < $0;;
18
 
        *)
19
 
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
20
 
                exit 1;;
21
 
esac
22
 
 
23
 
exit 0
24
 
 
25
 
@DPATCH@
26
 
diff -urNad /home/psg/emacs/emacs-goodies-el/emacs-goodies-el/elisp/emacs-goodies-el/todoo.el emacs-goodies-el/elisp/emacs-goodies-el/todoo.el
27
 
--- /home/psg/emacs/emacs-goodies-el/emacs-goodies-el/elisp/emacs-goodies-el/todoo.el   2004-11-25 21:51:26.000000000 -0500
28
 
+++ emacs-goodies-el/elisp/emacs-goodies-el/todoo.el    2004-11-25 21:56:39.000000000 -0500
29
 
@@ -57,6 +57,10 @@
30
 
 
31
 
 ;;; ChangeLog:
32
 
 
33
 
+;; 2004-11-24 Peter S Galbraith <psg@debian.org>
34
 
+;;  Debian bug 267637 fix: changes to outline-regexp should be buffer-local.
35
 
+;;  Thanks to Daniel Skarda <0rfelyus@hobitin.ucw.cz> for pointing it out.
36
 
+
37
 
 ;; 1.2 - Fixed bug in menu (todoo-show->todoo)
38
 
 ;;       Fixed bug when deleting window in todoo-save-and-exit
39
 
 ;;       Added early sub-item support (might be buggy, but still
40
 
@@ -512,10 +516,11 @@
41
 
   (make-local-variable 'font-lock-defaults)
42
 
   (setq font-lock-defaults '(todoo-font-lock-keywords t))
43
 
 
44
 
-  (setq outline-regexp (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
45
 
-                              (regexp-quote todoo-item-marker-assigned) 
46
 
-                              " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
47
 
-                              " \\)"))
48
 
+  (set (make-local-variable 'outline-regexp)
49
 
+        (concat "^\\(" (regexp-quote todoo-item-marker) " \\|"
50
 
+                (regexp-quote todoo-item-marker-assigned) 
51
 
+                " \\|[ ]*" (regexp-quote todoo-sub-item-marker)
52
 
+                " \\)"))
53
 
 
54
 
   (outline-minor-mode 1)
55