33/861d7ef2e595648efd7e2ad41293482f203151

   1 Return-Path: <felipe.contreras@gmail.com>\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 4CBF242116C\r
   6         for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:04:18 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, 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 T4XQmLwrL3S5 for <notmuch@notmuchmail.org>;\r
  17         Sat,  2 Nov 2013 07:04:13 -0700 (PDT)\r
  18 Received: from mail-oa0-f42.google.com (mail-oa0-f42.google.com\r
  19         [209.85.219.42]) (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 24154431FD9\r
  22         for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:22 -0700 (PDT)\r
  23 Received: by mail-oa0-f42.google.com with SMTP id k14so5693349oag.1\r
  24         for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:21 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  26         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  27         bh=IS5N5Q0lXp5Qpz3fU2a/3s/uhxsRf9fZ86VM2iV86RM=;\r
  28         b=Fi+UcOXeeTI8AKm7HFbgekJ+NTwqye+VxYJpRvvjT9QFDGwqDOhRkiWL9TO8w5ksvV\r
  29         FEzFuNadrfF96eauvAVyyzeP5tKi96EQLBMpe3wKv2zf7bqut7f4JSZO7hkniaS+z65g\r
  30         bpBEKzJ3NDztXgRpSPm30W/sSiv61agleacpdBwYHF841P1pjQsWYaCtHBzsedAvkhlm\r
  31         1XTZftTF/ov40YkJyXhwMXJNFocZKqfAsUdvTdpfP1UoL+KloAX8taaCh1RlU7XFMNiP\r
  32         E1vcgQxLYa8ri01NNiD49tIjoPaCnev0zMgOazkbqBdqaGjgKK/kBwO5gigMg0HOGTVr\r
  33         3jGA==\r
  34 X-Received: by 10.182.104.36 with SMTP id gb4mr6540381obb.43.1383401001647;\r
  35         Sat, 02 Nov 2013 07:03:21 -0700 (PDT)\r
  36 Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241])\r
  37         by mx.google.com with ESMTPSA id\r
  38         jz7sm24742139oeb.4.2013.11.02.07.03.20 for <multiple recipients>\r
  39         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  40         Sat, 02 Nov 2013 07:03:20 -0700 (PDT)\r
  41 From: Felipe Contreras <felipe.contreras@gmail.com>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH 18/21] vim: add wrapper for old variable names\r
  44 Date: Sat,  2 Nov 2013 07:55:51 -0600\r
  45 Message-Id: <1383400554-1832-19-git-send-email-felipe.contreras@gmail.com>\r
  46 X-Mailer: git-send-email 1.8.4.2+fc1\r
  47 In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
  48 References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
  49 X-BeenThere: notmuch@notmuchmail.org\r
  50 X-Mailman-Version: 2.1.13\r
  51 Precedence: list\r
  52 List-Id: "Use and development of the notmuch mail system."\r
  53         <notmuch.notmuchmail.org>\r
  54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  55         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  57 List-Post: <mailto:notmuch@notmuchmail.org>\r
  58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  61 X-List-Received-Date: Sat, 02 Nov 2013 14:04:18 -0000\r
  62 \r
  63 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
  64 ---\r
  65  vim/notmuch.vim | 44 ++++++++++++++++++++++++++++++++++++++------\r
  66  1 file changed, 38 insertions(+), 6 deletions(-)\r
  67 \r
  68 diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
  69 index 71d4b32..fc9eaa2 100644\r
  70 --- a/vim/notmuch.vim\r
  71 +++ b/vim/notmuch.vim\r
  72 @@ -391,23 +391,51 @@ endfunction\r
  73  \r
  74  function! s:set_defaults()\r
  75         if !exists('g:notmuch_date_format')\r
  76 -               let g:notmuch_date_format = s:notmuch_date_format_default\r
  77 +               if exists('g:notmuch_rb_date_format')\r
  78 +                       let g:notmuch_date_format = g:notmuch_rb_date_format\r
  79 +               else\r
  80 +                       let g:notmuch_date_format = s:notmuch_date_format_default\r
  81 +               endif\r
  82         endif\r
  83  \r
  84         if !exists('g:notmuch_datetime_format')\r
  85 -               let g:notmuch_datetime_format = s:notmuch_datetime_format_default\r
  86 +               if exists('g:notmuch_rb_datetime_format')\r
  87 +                       let g:notmuch_datetime_format = g:notmuch_rb_datetime_format\r
  88 +               else\r
  89 +                       let g:notmuch_datetime_format = s:notmuch_datetime_format_default\r
  90 +               endif\r
  91         endif\r
  92  \r
  93         if !exists('g:notmuch_reader')\r
  94 -               let g:notmuch_reader = s:notmuch_reader_default\r
  95 +               if exists('g:notmuch_rb_reader')\r
  96 +                       let g:notmuch_reader = g:notmuch_rb_reader\r
  97 +               else\r
  98 +                       let g:notmuch_reader = s:notmuch_reader_default\r
  99 +               endif\r
 100         endif\r
 101  \r
 102         if !exists('g:notmuch_sendmail')\r
 103 -               let g:notmuch_sendmail = s:notmuch_sendmail_default\r
 104 +               if exists('g:notmuch_rb_sendmail')\r
 105 +                       let g:notmuch_sendmail = g:notmuch_rb_sendmail\r
 106 +               else\r
 107 +                       let g:notmuch_sendmail = s:notmuch_sendmail_default\r
 108 +               endif\r
 109         endif\r
 110  \r
 111         if !exists('g:notmuch_folders_count_threads')\r
 112 -               let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default\r
 113 +               if exists('g:notmuch_rb_count_threads')\r
 114 +                       let g:notmuch_count_threads = g:notmuch_rb_count_threads\r
 115 +               else\r
 116 +                       let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default\r
 117 +               endif\r
 118 +       endif\r
 119 +\r
 120 +       if !exists('g:notmuch_custom_search_maps') && exists('g:notmuch_rb_custom_search_maps')\r
 121 +               let g:notmuch_custom_search_maps = g:notmuch_rb_custom_search_maps\r
 122 +       endif\r
 123 +\r
 124 +       if !exists('g:notmuch_custom_show_maps') && exists('g:notmuch_rb_custom_show_maps')\r
 125 +               let g:notmuch_custom_show_maps = g:notmuch_rb_custom_show_maps\r
 126         endif\r
 127  \r
 128         if exists('g:notmuch_custom_search_maps')\r
 129 @@ -419,7 +447,11 @@ function! s:set_defaults()\r
 130         endif\r
 131  \r
 132         if !exists('g:notmuch_folders')\r
 133 -               let g:notmuch_folders = s:notmuch_folders_default\r
 134 +               if exists('g:notmuch_rb_folders')\r
 135 +                       let g:notmuch_folders = g:notmuch_rb_folders\r
 136 +               else\r
 137 +                       let g:notmuch_folders = s:notmuch_folders_default\r
 138 +               endif\r
 139         endif\r
 140  endfunction\r
 141  \r
 142 -- \r
 143 1.8.4.2+fc1\r
 144 \r