mutt-patched/sidebar-newonly: integrating Steve Kemp's patch to optionally select...

[software/mutt-debian.git] / debian / patches / features / xtitles

diff --git a/debian/patches/features/xtitles b/debian/patches/features/xtitles
index 7d5a6cba1b8b2f6539b5b320284f979b13cbf564..b42acc15a708c00814c6d358b4d72cee371870e1 100644 (file)
--- a/debian/patches/features/xtitles
+++ b/debian/patches/features/xtitles
@@ -10,8 +10,10 @@ This is the xterm title patch as found on the mutt mailing lists.
     (cleaner code, no functional change, evades conflict with sidebar patch)
 
 == END PATCH
---- a/curs_main.c
-+++ b/curs_main.c
+Index: mutt/curs_main.c
+===================================================================
+--- mutt.orig/curs_main.c      2009-06-25 12:35:37.000000000 +0200
++++ mutt/curs_main.c   2009-06-25 12:35:44.000000000 +0200
 @@ -110,6 +110,19 @@
  
  extern size_t UngetCount;
@@ -46,9 +48,11 @@ This is the xterm title patch as found on the mutt mailing lists.
        }
  
        menu->redraw = 0;
---- a/globals.h
-+++ b/globals.h
-@@ -140,6 +140,8 @@
+Index: mutt/globals.h
+===================================================================
+--- mutt.orig/globals.h        2009-06-25 12:35:37.000000000 +0200
++++ mutt/globals.h     2009-06-25 12:35:44.000000000 +0200
+@@ -141,6 +141,8 @@
  WHERE char *Tochars;
  WHERE char *Username;
  WHERE char *Visual;
@@ -57,8 +61,10 @@ This is the xterm title patch as found on the mutt mailing lists.
  
  WHERE char *CurrentFolder;
  WHERE char *LastFolder;
---- a/init.c
-+++ b/init.c
+Index: mutt/init.c
+===================================================================
+--- mutt.orig/init.c   2009-06-25 12:35:42.000000000 +0200
++++ mutt/init.c        2009-06-25 12:35:44.000000000 +0200
 @@ -1892,6 +1892,26 @@
        toggle_option (MuttVars[idx].data);
        else
@@ -86,11 +92,13 @@ This is the xterm title patch as found on the mutt mailing lists.
      }
      else if (myvar || DTYPE (MuttVars[idx].type) == DT_STR ||
             DTYPE (MuttVars[idx].type) == DT_PATH ||
---- a/init.h
-+++ b/init.h
-@@ -3285,6 +3285,27 @@
-   ** option does nothing: mutt will never write out the ``Bcc:'' header
-   ** in this case.
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:35:42.000000000 +0200
++++ mutt/init.h        2009-06-25 12:35:44.000000000 +0200
+@@ -3337,6 +3337,27 @@
+   ** Also see the $$read_inc, $$net_inc and $$time_inc variables and the
+   ** ``$tuning'' section of the manual for performance considerations.
    */
 +  {"xterm_icon",       DT_STR,   R_BOTH, UL &XtermIcon,  UL "M%?n?AIL&ail?"},
 +  /*
@@ -114,11 +122,13 @@ This is the xterm title patch as found on the mutt mailing lists.
 +  ** to the one used by ``$$status_format''.
 +  */
    /*--*/
-   { NULL }
+   { NULL, 0, 0, 0, 0 }
  };
---- a/mutt.h
-+++ b/mutt.h
-@@ -438,6 +438,7 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:35:37.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:35:44.000000000 +0200
+@@ -446,6 +446,7 @@
    OPTWRAPSEARCH,
    OPTWRITEBCC,                /* write out a bcc header? */
    OPTXMAILER,
@@ -126,10 +136,12 @@ This is the xterm title patch as found on the mutt mailing lists.
  
    OPTCRYPTUSEGPGME,
    OPTCRYPTUSEPKA,
---- a/pager.c
-+++ b/pager.c
-@@ -1761,6 +1761,13 @@
-       mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
+Index: mutt/pager.c
+===================================================================
+--- mutt.orig/pager.c  2009-06-25 12:35:37.000000000 +0200
++++ mutt/pager.c       2009-06-25 12:35:44.000000000 +0200
+@@ -1784,6 +1784,13 @@
+       }
        BKGDSET (MT_COLOR_NORMAL);
        SETCOLOR (MT_COLOR_NORMAL);
 +      if (option(OPTXTERMSETTITLES))
@@ -142,8 +154,10 @@ This is the xterm title patch as found on the mutt mailing lists.
      }
  
      if ((redraw & REDRAW_INDEX) && index)
---- a/status.c
-+++ b/status.c
+Index: mutt/status.c
+===================================================================
+--- mutt.orig/status.c 2009-06-25 12:35:37.000000000 +0200
++++ mutt/status.c      2009-06-25 12:35:44.000000000 +0200
 @@ -195,6 +195,8 @@
        break;
  
@@ -153,8 +167,10 @@ This is the xterm title patch as found on the mutt mailing lists.
        if (menu->top + menu->pagelen >= menu->max)
        cp = menu->top ? "end" : "all";
        else
---- a/mutt_menu.h
-+++ b/mutt_menu.h
+Index: mutt/mutt_menu.h
+===================================================================
+--- mutt.orig/mutt_menu.h      2009-06-25 12:35:37.000000000 +0200
++++ mutt/mutt_menu.h   2009-06-25 12:35:44.000000000 +0200
 @@ -103,6 +103,8 @@
  void menu_current_bottom (MUTTMENU *);
  void menu_check_recenter (MUTTMENU *);
@@ -164,9 +180,3 @@ This is the xterm title patch as found on the mutt mailing lists.
  
  MUTTMENU *mutt_new_menu (int);
  void mutt_menuDestroy (MUTTMENU **);
---- a/PATCHES
-+++ b/PATCHES
-@@ -1,2 +1,3 @@
-+patch-1.5.13.nt+ab.xtitles.4
- patch-1.5.6.dw.maildir-mtime.1
- patch-1.5.13.cd.ifdef.2