aa/b76b0c4411a1850a2b2e4f62d598e98d8c9f32

   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 0E426429E31\r
   6         for <notmuch@notmuchmail.org>; Thu,  9 Feb 2012 06:46:13 -0800 (PST)\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 Fx4HSV4hlMx6 for <notmuch@notmuchmail.org>;\r
  17         Thu,  9 Feb 2012 06:46:12 -0800 (PST)\r
  18 Received: from mail-qw0-f46.google.com (mail-qw0-f46.google.com\r
  19         [209.85.216.46]) (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 46891431FAF\r
  22         for <notmuch@notmuchmail.org>; Thu,  9 Feb 2012 06:46:12 -0800 (PST)\r
  23 Received: by qadc10 with SMTP id c10so4971907qad.5\r
  24         for <notmuch@notmuchmail.org>; Thu, 09 Feb 2012 06:46:11 -0800 (PST)\r
  25 MIME-Version: 1.0\r
  26 Received: by 10.229.69.33 with SMTP id x33mr1429603qci.30.1328798771663;\r
  27         Thu, 09 Feb 2012 06:46:11 -0800 (PST)\r
  28 Received: from localhost (nikula.org. [92.243.24.172])\r
  29         by mx.google.com with ESMTPS id ef1sm6120244qab.19.2012.02.09.06.46.09\r
  30         (version=SSLv3 cipher=OTHER); Thu, 09 Feb 2012 06:46:10 -0800 (PST)\r
  31 From: Jani Nikula <jani@nikula.org>\r
  32 To: notmuch@notmuchmail.org\r
  33 Subject: [PATCH v2 2/2] emacs: support text/calendar mime type\r
  34 Date: Thu,  9 Feb 2012 14:46:03 +0000\r
  35 Message-Id:\r
  36  <25a7cebf4b36e42f8232e34f86d7b5379d1d1959.1328798471.git.jani@nikula.org>\r
  37 X-Mailer: git-send-email 1.7.1\r
  38 In-Reply-To: <cover.1328719309.git.jani@nikula.org>\r
  39 References: <cover.1328719309.git.jani@nikula.org>\r
  40 In-Reply-To:\r
  41  <ab777cf0fa83778d3399ac52094df9230738819d.1328798471.git.jani@nikula.org>\r
  42 References:\r
  43  <ab777cf0fa83778d3399ac52094df9230738819d.1328798471.git.jani@nikula.org>\r
  44 X-Gm-Message-State:\r
  45  ALoCoQk99hfDyaixEAQcKlPFbEhaDrMCjMXNmMUXG9J9RAijwRHcKu44pemjnC0F0bSJUnre0Pzx\r
  46 X-BeenThere: notmuch@notmuchmail.org\r
  47 X-Mailman-Version: 2.1.13\r
  48 Precedence: list\r
  49 List-Id: "Use and development of the notmuch mail system."\r
  50         <notmuch.notmuchmail.org>\r
  51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  52         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  54 List-Post: <mailto:notmuch@notmuchmail.org>\r
  55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  58 X-List-Received-Date: Thu, 09 Feb 2012 14:46:13 -0000\r
  59 \r
  60 Replace text/x-vcalendar with text/calendar, while maintaining support\r
  61 and backwards compatibility for text/x-vcalendar.\r
  62 \r
  63 Code by David Edmondson <dme@dme.org>\r
  64 ---\r
  65  emacs/notmuch-show.el |    6 +++++-\r
  66  1 files changed, 5 insertions(+), 1 deletions(-)\r
  67 \r
  68 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
  69 index 5f643f1..33a4f18 100644\r
  70 --- a/emacs/notmuch-show.el\r
  71 +++ b/emacs/notmuch-show.el\r
  72 @@ -711,7 +711,7 @@ current buffer, if possible."\r
  73         (run-hook-with-args 'notmuch-show-insert-text/plain-hook msg depth))))\r
  74    t)\r
  75  \r
  76 -(defun notmuch-show-insert-part-text/x-vcalendar (msg part content-type nth depth declared-type)\r
  77 +(defun notmuch-show-insert-part-text/calendar (msg part content-type nth depth declared-type)\r
  78    (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename))\r
  79    (insert (with-temp-buffer\r
  80             (insert (notmuch-show-get-bodypart-content msg part nth))\r
  81 @@ -729,6 +729,10 @@ current buffer, if possible."\r
  82               result)))\r
  83    t)\r
  84  \r
  85 +;; For backwards compatibility.\r
  86 +(defun notmuch-show-insert-part-text/x-vcalendar (msg part content-type nth depth declared-type)\r
  87 +  (notmuch-show-insert-part-text/calendar msg part content-type nth depth declared-type))\r
  88 +\r
  89  (defun notmuch-show-insert-part-application/octet-stream (msg part content-type nth depth declared-type)\r
  90    ;; If we can deduce a MIME type from the filename of the attachment,\r
  91    ;; do so and pass it on to the handler for that type.\r
  92 -- \r
  93 1.7.1\r
  94 \r