From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 13 Apr 2009 18:06:32 +0000 (+0000)
Subject: - updated to 1.5.19
X-Git-Tag: auto/th/mutt-1_5_19-1~3
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=commitdiff_plain;h=eb755509acba66e84e43e436533020cbfd02534f;ds=sidebyside

- updated to 1.5.19

Changed files:
    mutt-cd.signatures_menu.patch -> 1.3
---

diff --git a/mutt-cd.signatures_menu.patch b/mutt-cd.signatures_menu.patch
index 9f9418b..24e0c58 100644
--- a/mutt-cd.signatures_menu.patch
+++ b/mutt-cd.signatures_menu.patch
@@ -179,7 +179,7 @@ diff -pruN2 mutt-1.3.27.orig/protos.h mutt-1.3.27/protos.h
 diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 --- mutt-1.3.27.orig/signature.c	Thu Jan  1 01:00:00 1970
 +++ mutt-1.3.27/signature.c	Wed Jan 23 22:35:32 2002
-@@ -0,0 +1,499 @@
+@@ -0,0 +1,505 @@
 +/*
 + * Copyright (C) 2001 Cedric Duval <cedricduval@free.fr>
 + * 
@@ -470,15 +470,21 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 +  char buf[STRING];
 +  SIG_LIST *result = NULL;
 +  int i;
++  char* searchBuf = menu->menu >= 0 && menu->menu < MENU_MAX ?
++                    SearchBuffers[menu->menu] : NULL;
 +
-+  snprintf (buf, sizeof(buf), menu->searchBuf ? menu->searchBuf : "");
++  snprintf (buf, sizeof(buf), searchBuf ? searchBuf : "");
 +  if (mutt_get_field (_("Search for: "), buf,
 +		      sizeof (buf), M_CLEAR) != 0 || !buf[0])
 +    return (NULL);
-+  mutt_str_replace (&menu->searchBuf, buf);
++  if (menu->menu >= 0 && menu->menu < MENU_MAX)
++  {
++    mutt_str_replace (&SearchBuffers[menu->menu], buf);
++    searchBuf = SearchBuffers[menu->menu];
++  }
 +
-+  if ((i = regcomp (&re, menu->searchBuf, REG_NOSUB | REG_EXTENDED | REG_WORDS
-+		    | mutt_which_case (menu->searchBuf))) != 0)
++  if ((i = regcomp (&re, searchBuf, REG_NOSUB | REG_EXTENDED | REG_WORDS
++		    | mutt_which_case (searchBuf))) != 0)
 +  {
 +    regerror (i, &re, buf, sizeof (buf));
 +    regfree (&re);