[PATCH 18/21] vim: add wrapper for old variable names

diff --git a/33/861d7ef2e595648efd7e2ad41293482f203151 b/33/861d7ef2e595648efd7e2ad41293482f203151
new file mode 100644 (file)
index 0000000..8a54cb1
--- /dev/null
+++ b/33/861d7ef2e595648efd7e2ad41293482f203151
@@ -0,0 +1,144 @@
+Return-Path: <felipe.contreras@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4CBF242116C\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:04:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id T4XQmLwrL3S5 for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Nov 2013 07:04:13 -0700 (PDT)\r
+Received: from mail-oa0-f42.google.com (mail-oa0-f42.google.com\r
+       [209.85.219.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 24154431FD9\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:22 -0700 (PDT)\r
+Received: by mail-oa0-f42.google.com with SMTP id k14so5693349oag.1\r
+       for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:21 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=IS5N5Q0lXp5Qpz3fU2a/3s/uhxsRf9fZ86VM2iV86RM=;\r
+       b=Fi+UcOXeeTI8AKm7HFbgekJ+NTwqye+VxYJpRvvjT9QFDGwqDOhRkiWL9TO8w5ksvV\r
+       FEzFuNadrfF96eauvAVyyzeP5tKi96EQLBMpe3wKv2zf7bqut7f4JSZO7hkniaS+z65g\r
+       bpBEKzJ3NDztXgRpSPm30W/sSiv61agleacpdBwYHF841P1pjQsWYaCtHBzsedAvkhlm\r
+       1XTZftTF/ov40YkJyXhwMXJNFocZKqfAsUdvTdpfP1UoL+KloAX8taaCh1RlU7XFMNiP\r
+       E1vcgQxLYa8ri01NNiD49tIjoPaCnev0zMgOazkbqBdqaGjgKK/kBwO5gigMg0HOGTVr\r
+       3jGA==\r
+X-Received: by 10.182.104.36 with SMTP id gb4mr6540381obb.43.1383401001647;\r
+       Sat, 02 Nov 2013 07:03:21 -0700 (PDT)\r
+Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241])\r
+       by mx.google.com with ESMTPSA id\r
+       jz7sm24742139oeb.4.2013.11.02.07.03.20 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Sat, 02 Nov 2013 07:03:20 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 18/21] vim: add wrapper for old variable names\r
+Date: Sat,  2 Nov 2013 07:55:51 -0600\r
+Message-Id: <1383400554-1832-19-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.8.4.2+fc1\r
+In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 02 Nov 2013 14:04:18 -0000\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/notmuch.vim | 44 ++++++++++++++++++++++++++++++++++++++------\r
+ 1 file changed, 38 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 71d4b32..fc9eaa2 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -391,23 +391,51 @@ endfunction\r
+ \r
+ function! s:set_defaults()\r
+       if !exists('g:notmuch_date_format')\r
+-              let g:notmuch_date_format = s:notmuch_date_format_default\r
++              if exists('g:notmuch_rb_date_format')\r
++                      let g:notmuch_date_format = g:notmuch_rb_date_format\r
++              else\r
++                      let g:notmuch_date_format = s:notmuch_date_format_default\r
++              endif\r
+       endif\r
+ \r
+       if !exists('g:notmuch_datetime_format')\r
+-              let g:notmuch_datetime_format = s:notmuch_datetime_format_default\r
++              if exists('g:notmuch_rb_datetime_format')\r
++                      let g:notmuch_datetime_format = g:notmuch_rb_datetime_format\r
++              else\r
++                      let g:notmuch_datetime_format = s:notmuch_datetime_format_default\r
++              endif\r
+       endif\r
+ \r
+       if !exists('g:notmuch_reader')\r
+-              let g:notmuch_reader = s:notmuch_reader_default\r
++              if exists('g:notmuch_rb_reader')\r
++                      let g:notmuch_reader = g:notmuch_rb_reader\r
++              else\r
++                      let g:notmuch_reader = s:notmuch_reader_default\r
++              endif\r
+       endif\r
+ \r
+       if !exists('g:notmuch_sendmail')\r
+-              let g:notmuch_sendmail = s:notmuch_sendmail_default\r
++              if exists('g:notmuch_rb_sendmail')\r
++                      let g:notmuch_sendmail = g:notmuch_rb_sendmail\r
++              else\r
++                      let g:notmuch_sendmail = s:notmuch_sendmail_default\r
++              endif\r
+       endif\r
+ \r
+       if !exists('g:notmuch_folders_count_threads')\r
+-              let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default\r
++              if exists('g:notmuch_rb_count_threads')\r
++                      let g:notmuch_count_threads = g:notmuch_rb_count_threads\r
++              else\r
++                      let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default\r
++              endif\r
++      endif\r
++\r
++      if !exists('g:notmuch_custom_search_maps') && exists('g:notmuch_rb_custom_search_maps')\r
++              let g:notmuch_custom_search_maps = g:notmuch_rb_custom_search_maps\r
++      endif\r
++\r
++      if !exists('g:notmuch_custom_show_maps') && exists('g:notmuch_rb_custom_show_maps')\r
++              let g:notmuch_custom_show_maps = g:notmuch_rb_custom_show_maps\r
+       endif\r
+ \r
+       if exists('g:notmuch_custom_search_maps')\r
+@@ -419,7 +447,11 @@ function! s:set_defaults()\r
+       endif\r
+ \r
+       if !exists('g:notmuch_folders')\r
+-              let g:notmuch_folders = s:notmuch_folders_default\r
++              if exists('g:notmuch_rb_folders')\r
++                      let g:notmuch_folders = g:notmuch_rb_folders\r
++              else\r
++                      let g:notmuch_folders = s:notmuch_folders_default\r
++              endif\r
+       endif\r
+ endfunction\r
+ \r
+-- \r
+1.8.4.2+fc1\r
+\r