19/35a2a05e73430391b44c3e0fbe88640348957d

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id B0318431FC3\r
   6         for <notmuch@notmuchmail.org>; Tue,  5 Jun 2012 08:43:01 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id dLFbXFh54fV0 for <notmuch@notmuchmail.org>;\r
  17         Tue,  5 Jun 2012 08:43:00 -0700 (PDT)\r
  18 Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com\r
  19         [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 89020431FB6\r
  22         for <notmuch@notmuchmail.org>; Tue,  5 Jun 2012 08:43:00 -0700 (PDT)\r
  23 Received: by lagu2 with SMTP id u2so4394767lag.26\r
  24         for <notmuch@notmuchmail.org>; Tue, 05 Jun 2012 08:42:57 -0700 (PDT)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=google.com; s=20120113;\r
  27         h=from:to:subject:date:message-id:x-mailer:in-reply-to:references\r
  28         :in-reply-to:references:x-gm-message-state;\r
  29         bh=UbLK1i0uVqLvUX/ibVikyB/UkqUlJUYRVzL37x99tAU=;\r
  30         b=CEERzPXpKhHB1VNGlmq9nqHVPhzJDhGcOnlqdcI0BeTxVuzI1R/QYaCUqDcKkhwGcz\r
  31         6nYPiobn1c10wfZ0yQv89BHXiWIZWbll09r1rtsmurE/QKL6hNwLZGu0K6nltUzsyEqD\r
  32         TwxTewOY27am0Vl1SsLVNwEdb2dRdLTfjkfisYDvE8pJfkMFKixxhk6FI4QNHhldzBf4\r
  33         DUlyC1UTxPhcdh1xqfZN3CFaeDBmnPcjY2cZODyiE1STuefrzcsvlPuoSV3FbO5YgRLn\r
  34         vWfQwC62CTVOGW+sD9Fovw8oUOZZaUJDS8h3FvaU3LLEkzqmVTSatfl79K5OiSTi1k5E\r
  35         ZtZg==\r
  36 Received: by 10.112.102.136 with SMTP id fo8mr8354919lbb.106.1338910977647;\r
  37         Tue, 05 Jun 2012 08:42:57 -0700 (PDT)\r
  38 Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.\r
  39         [80.220.80.68])\r
  40         by mx.google.com with ESMTPS id sm7sm3148732lab.5.2012.06.05.08.42.56\r
  41         (version=SSLv3 cipher=OTHER); Tue, 05 Jun 2012 08:42:56 -0700 (PDT)\r
  42 From: Jani Nikula <jani@nikula.org>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 2/2] emacs: only strip "re:" in the beginning of subject\r
  45 Date: Tue,  5 Jun 2012 18:42:51 +0300\r
  46 Message-Id:\r
  47  <505a22a469143e310b1af8965161b6a008a3c527.1338910938.git.jani@nikula.org>\r
  48 X-Mailer: git-send-email 1.7.9.5\r
  49 In-Reply-To:\r
  50  <3a9ce3cd2074e311f86f3e416644b2879516ffbf.1338910938.git.jani@nikula.org>\r
  51 References:\r
  52  <3a9ce3cd2074e311f86f3e416644b2879516ffbf.1338910938.git.jani@nikula.org>\r
  53 In-Reply-To:\r
  54  <3a9ce3cd2074e311f86f3e416644b2879516ffbf.1338910938.git.jani@nikula.org>\r
  55 References:\r
  56  <3a9ce3cd2074e311f86f3e416644b2879516ffbf.1338910938.git.jani@nikula.org>\r
  57 X-Gm-Message-State:\r
  58  ALoCoQnAGkFnqSGYbe64my4iSqVlqri7ufmwulcmF347bP7iTOkK//LaijYSFKFE/K5UB/jccElI\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Tue, 05 Jun 2012 15:43:02 -0000\r
  72 \r
  73 Fix notmuch-show-strip-re by matching "re:" only in the beginning of\r
  74 the input string.\r
  75 ---\r
  76  emacs/notmuch-show.el |    2 +-\r
  77  test/emacs-show       |    1 -\r
  78  2 files changed, 1 insertion(+), 2 deletions(-)\r
  79 \r
  80 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
  81 index d318430..36cad93 100644\r
  82 --- a/emacs/notmuch-show.el\r
  83 +++ b/emacs/notmuch-show.el\r
  84 @@ -819,7 +819,7 @@ message at DEPTH in the current thread."\r
  85    (make-symbol (concat "notmuch-show-" type)))\r
  86  \r
  87  (defun notmuch-show-strip-re (string)\r
  88 -  (replace-regexp-in-string "\\([Rr]e: *\\)+" "" string))\r
  89 +  (replace-regexp-in-string "^\\([Rr]e: *\\)+" "" string))\r
  90  \r
  91  (defvar notmuch-show-previous-subject "")\r
  92  (make-variable-buffer-local 'notmuch-show-previous-subject)\r
  93 diff --git a/test/emacs-show b/test/emacs-show\r
  94 index 1ddb28e..e9a714f 100755\r
  95 --- a/test/emacs-show\r
  96 +++ b/test/emacs-show\r
  97 @@ -33,7 +33,6 @@ output=$(test_emacs '(notmuch-show-strip-re "re:Re: re:  Re:  re:subject")')\r
  98  test_expect_equal "$output" '"subject"'\r
  99  \r
 100  test_begin_subtest "Bare subject #3"\r
 101 -test_subtest_known_broken\r
 102  output=$(test_emacs '(notmuch-show-strip-re "the cure: fix the regexp")')\r
 103  test_expect_equal "$output" '"the cure: fix the regexp"'\r
 104  \r
 105 -- \r
 106 1.7.9.5\r
 107 \r