Return-Path: <felipe.contreras@gmail.com>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 4CBF242116C
	for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:04:18 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.799
X-Spam-Level: 
X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id T4XQmLwrL3S5 for <notmuch@notmuchmail.org>;
	Sat,  2 Nov 2013 07:04:13 -0700 (PDT)
Received: from mail-oa0-f42.google.com (mail-oa0-f42.google.com
	[209.85.219.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 24154431FD9
	for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:22 -0700 (PDT)
Received: by mail-oa0-f42.google.com with SMTP id k14so5693349oag.1
	for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:in-reply-to:references;
	bh=IS5N5Q0lXp5Qpz3fU2a/3s/uhxsRf9fZ86VM2iV86RM=;
	b=Fi+UcOXeeTI8AKm7HFbgekJ+NTwqye+VxYJpRvvjT9QFDGwqDOhRkiWL9TO8w5ksvV
	FEzFuNadrfF96eauvAVyyzeP5tKi96EQLBMpe3wKv2zf7bqut7f4JSZO7hkniaS+z65g
	bpBEKzJ3NDztXgRpSPm30W/sSiv61agleacpdBwYHF841P1pjQsWYaCtHBzsedAvkhlm
	1XTZftTF/ov40YkJyXhwMXJNFocZKqfAsUdvTdpfP1UoL+KloAX8taaCh1RlU7XFMNiP
	E1vcgQxLYa8ri01NNiD49tIjoPaCnev0zMgOazkbqBdqaGjgKK/kBwO5gigMg0HOGTVr
	3jGA==
X-Received: by 10.182.104.36 with SMTP id gb4mr6540381obb.43.1383401001647;
	Sat, 02 Nov 2013 07:03:21 -0700 (PDT)
Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241])
	by mx.google.com with ESMTPSA id
	jz7sm24742139oeb.4.2013.11.02.07.03.20 for <multiple recipients>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Sat, 02 Nov 2013 07:03:20 -0700 (PDT)
From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 18/21] vim: add wrapper for old variable names
Date: Sat,  2 Nov 2013 07:55:51 -0600
Message-Id: <1383400554-1832-19-git-send-email-felipe.contreras@gmail.com>
X-Mailer: git-send-email 1.8.4.2+fc1
In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>
References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Nov 2013 14:04:18 -0000

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 vim/notmuch.vim | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 71d4b32..fc9eaa2 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -391,23 +391,51 @@ endfunction
 
 function! s:set_defaults()
 	if !exists('g:notmuch_date_format')
-		let g:notmuch_date_format = s:notmuch_date_format_default
+		if exists('g:notmuch_rb_date_format')
+			let g:notmuch_date_format = g:notmuch_rb_date_format
+		else
+			let g:notmuch_date_format = s:notmuch_date_format_default
+		endif
 	endif
 
 	if !exists('g:notmuch_datetime_format')
-		let g:notmuch_datetime_format = s:notmuch_datetime_format_default
+		if exists('g:notmuch_rb_datetime_format')
+			let g:notmuch_datetime_format = g:notmuch_rb_datetime_format
+		else
+			let g:notmuch_datetime_format = s:notmuch_datetime_format_default
+		endif
 	endif
 
 	if !exists('g:notmuch_reader')
-		let g:notmuch_reader = s:notmuch_reader_default
+		if exists('g:notmuch_rb_reader')
+			let g:notmuch_reader = g:notmuch_rb_reader
+		else
+			let g:notmuch_reader = s:notmuch_reader_default
+		endif
 	endif
 
 	if !exists('g:notmuch_sendmail')
-		let g:notmuch_sendmail = s:notmuch_sendmail_default
+		if exists('g:notmuch_rb_sendmail')
+			let g:notmuch_sendmail = g:notmuch_rb_sendmail
+		else
+			let g:notmuch_sendmail = s:notmuch_sendmail_default
+		endif
 	endif
 
 	if !exists('g:notmuch_folders_count_threads')
-		let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default
+		if exists('g:notmuch_rb_count_threads')
+			let g:notmuch_count_threads = g:notmuch_rb_count_threads
+		else
+			let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default
+		endif
+	endif
+
+	if !exists('g:notmuch_custom_search_maps') && exists('g:notmuch_rb_custom_search_maps')
+		let g:notmuch_custom_search_maps = g:notmuch_rb_custom_search_maps
+	endif
+
+	if !exists('g:notmuch_custom_show_maps') && exists('g:notmuch_rb_custom_show_maps')
+		let g:notmuch_custom_show_maps = g:notmuch_rb_custom_show_maps
 	endif
 
 	if exists('g:notmuch_custom_search_maps')
@@ -419,7 +447,11 @@ function! s:set_defaults()
 	endif
 
 	if !exists('g:notmuch_folders')
-		let g:notmuch_folders = s:notmuch_folders_default
+		if exists('g:notmuch_rb_folders')
+			let g:notmuch_folders = g:notmuch_rb_folders
+		else
+			let g:notmuch_folders = s:notmuch_folders_default
+		endif
 	endif
 endfunction
 
-- 
1.8.4.2+fc1