← Back to branch summary

~ubuntu-branches/ubuntu/precise/mutt/precise

« back to all changes in this revision

Viewing changes to debian/patches/mutt-patched/sidebar-sorted

  • Committer: Package Import Robot
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy)
  • Date: 2010-12-17 14:28:28 UTC
  • mfrom: (16.2.3 experimental)
  • Revision ID: package-import@ubuntu.com-20101217142828-ve8yy0xf1zomtnx9
Tags: 1.5.21-1ubuntu1
https://launchpad.net/bugs/691512
https://launchpad.net/bugs/607448
* Merge with Debian experimental (LP: #691512), remaining changes:
  + debian/control, debian/patches/debian-specific/build_doc_adjustments.diff:
    Use w3m (main) instead of elinks (universe) for generating documentation.
  + Drop libtokyocabinet-dev (universe) from Build-Depends, use always
    libgdbm-dev and also use gdbm for the header cache backend. (lp: #607448)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/mutt-patched/sidebar-sorted
11
11
PS: This has to be applied ontop of my sidebar-dotted patch, but it
12
12
should be easy to adopt it to a vanilla mutt.
13
13
 
14
 
Index: mutt/sidebar.c
15
 
===================================================================
16
 
--- mutt.orig/sidebar.c 2009-06-25 12:36:59.000000000 +0200
17
 
+++ mutt/sidebar.c      2009-06-25 12:37:03.000000000 +0200
 
14
--- a/sidebar.c
 
15
+++ b/sidebar.c
18
16
@@ -54,6 +54,35 @@
19
17
        for ( ; tmp->next != 0; tmp = tmp->next )
20
18
                tmp->next->prev = tmp;
51
49
        if ( TopBuffy == 0 && BottomBuffy == 0 )
52
50
                TopBuffy = Incoming;
53
51
        if ( BottomBuffy == 0 ) {
54
 
Index: mutt/init.h
55
 
===================================================================
56
 
--- mutt.orig/init.h    2009-06-25 12:36:59.000000000 +0200
57
 
+++ mutt/init.h 2009-06-25 12:37:03.000000000 +0200
58
 
@@ -1974,6 +1974,11 @@
 
52
--- a/init.h
 
53
+++ b/init.h
 
54
@@ -1986,6 +1986,11 @@
59
55
   ** .pp
60
56
   ** Should the sidebar shorten the path showed.
61
57
   */
67
63
   { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
68
64
   /*
69
65
   ** .pp
70
 
Index: mutt/mutt.h
71
 
===================================================================
72
 
--- mutt.orig/mutt.h    2009-06-25 12:36:59.000000000 +0200
73
 
+++ mutt/mutt.h 2009-06-25 12:37:03.000000000 +0200
74
 
@@ -427,6 +427,7 @@
 
66
--- a/mutt.h
 
67
+++ b/mutt.h
 
68
@@ -433,6 +433,7 @@
75
69
   OPTSCORE,
76
70
   OPTSIDEBAR,
77
71
   OPTSIDEBARSHORTPATH,