[PATCH 17/21] vim: move default sets to set_defaults()

diff --git a/86/ff976501793f7ab6a6e531735f1097bf060df4 b/86/ff976501793f7ab6a6e531735f1097bf060df4
new file mode 100644 (file)
index 0000000..82d72d8
--- /dev/null
+++ b/86/ff976501793f7ab6a6e531735f1097bf060df4
@@ -0,0 +1,128 @@
+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 608DC421174\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:04:10 -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 1X3Bha5LN4l6 for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Nov 2013 07:04:05 -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 C81E5429E43\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:19 -0700 (PDT)\r
+Received: by mail-oa0-f42.google.com with SMTP id k14so5694677oag.15\r
+       for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:19 -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=+p6NGqAXHM+MUZ+lnJIDivk5MFEtJt+mRiuAuWoaAXY=;\r
+       b=JtGnWwG1Ma6kG80lynWFl3wNsdpZrhidE+NP2IU7HrmaxqiNu9BhBr5DKjaVyXJWGo\r
+       oV27TkftMYRyCeF9kO08vSZP6HS9/VsJJstlygVqGE2njivvhWlqnSOylJ1lcPaTvPOo\r
+       3FlXxjquOpCqwUHIrsBZbTsBfpVbOC58bLPR13Oh8F5rham5OuY72F6TcwgpuISMkb53\r
+       iGdqLpTLpnlKLyDh9tUZEObjaSB/5fOiCBXaNw38V6nPxpcaYfoZXKp+DLbQXwHO0xl2\r
+       sN3VnRWoGLf+akl9oKpDEynKaKAeTDHqBPvOtOlrEN5pW53JvbbHLpPti+5nvc1RTB1r\r
+       wQdw==\r
+X-Received: by 10.182.81.41 with SMTP id w9mr6514979obx.18.1383400999106;\r
+       Sat, 02 Nov 2013 07:03:19 -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
+       eg8sm19940507obd.6.2013.11.02.07.03.17 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Sat, 02 Nov 2013 07:03:18 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 17/21] vim: move default sets to set_defaults()\r
+Date: Sat,  2 Nov 2013 07:55:50 -0600\r
+Message-Id: <1383400554-1832-18-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:11 -0000\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/notmuch.vim | 40 ++++++++++++++++++++--------------------\r
+ 1 file changed, 20 insertions(+), 20 deletions(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 2fe9346..71d4b32 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -60,26 +60,6 @@ let s:notmuch_reader_default = 'mutt -f %s'\r
+ let s:notmuch_sendmail_default = 'sendmail'\r
+ let s:notmuch_folders_count_threads_default = 0\r
+ \r
+-if !exists('g:notmuch_date_format')\r
+-      let g:notmuch_date_format = s:notmuch_date_format_default\r
+-endif\r
+-\r
+-if !exists('g:notmuch_datetime_format')\r
+-      let g:notmuch_datetime_format = s:notmuch_datetime_format_default\r
+-endif\r
+-\r
+-if !exists('g:notmuch_reader')\r
+-      let g:notmuch_reader = s:notmuch_reader_default\r
+-endif\r
+-\r
+-if !exists('g:notmuch_sendmail')\r
+-      let g:notmuch_sendmail = s:notmuch_sendmail_default\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
+-endif\r
+-\r
+ function! s:new_file_buffer(type, fname)\r
+       exec printf('edit %s', a:fname)\r
+       execute printf('set filetype=notmuch-%s', a:type)\r
+@@ -410,6 +390,26 @@ endfunction\r
+ "" root\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
++      endif\r
++\r
++      if !exists('g:notmuch_datetime_format')\r
++              let g:notmuch_datetime_format = s:notmuch_datetime_format_default\r
++      endif\r
++\r
++      if !exists('g:notmuch_reader')\r
++              let g:notmuch_reader = s:notmuch_reader_default\r
++      endif\r
++\r
++      if !exists('g:notmuch_sendmail')\r
++              let g:notmuch_sendmail = s:notmuch_sendmail_default\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
++      endif\r
++\r
+       if exists('g:notmuch_custom_search_maps')\r
+               call extend(g:notmuch_search_maps, g:notmuch_custom_search_maps)\r
+       endif\r
+-- \r
+1.8.4.2+fc1\r
+\r