[PATCH v2] VIM: Use notmuch CLI for config

diff --git a/17/4344d472c79a4912f7c4bb7f0c5492db0476ca b/17/4344d472c79a4912f7c4bb7f0c5492db0476ca
new file mode 100644 (file)
index 0000000..2e5ce40
--- /dev/null
+++ b/17/4344d472c79a4912f7c4bb7f0c5492db0476ca
@@ -0,0 +1,109 @@
+Return-Path: <imain@stemwinder.org>\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 A653C431FBC\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Oct 2014 16:47:30 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 yMWWguEOmANw for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Oct 2014 16:47:25 -0700 (PDT)\r
+Received: from cmta18.telus.net (cmta18.telus.net [209.171.16.91])\r
+       by olra.theworths.org (Postfix) with ESMTP id 10CF6431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Oct 2014 16:47:24 -0700 (PDT)\r
+Received: from ovo.mains.priv ([207.102.88.62]) by cmta18.telus.net with TELUS\r
+       id yPnP1o0061LiWEf01PnPx4; Thu, 02 Oct 2014 17:47:24 -0600\r
+X-Authority-Analysis: v=2.0 cv=GdvJa3rL c=1 sm=2\r
+       a=EcQDfIwDZEqJA1f7rVUV8Q==:17 a=S-IsBHyFrF4A:10 a=tsa3CZZnAAAA:8\r
+       a=lnbEfRDau6mwN6_a2jMA:9 a=uq6gwDkGiqMBWQl4:21 a=EZkrjcdb60U0uwMN:21\r
+       a=EcQDfIwDZEqJA1f7rVUV8Q==:117\r
+X-Telus-Outbound-IP: 207.102.88.62\r
+From: Ian Main <imain@stemwinder.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] VIM: Use notmuch CLI for config\r
+Date: Thu,  2 Oct 2014 16:47:15 -0700\r
+Message-Id: <1412293635-31273-1-git-send-email-imain@stemwinder.org>\r
+X-Mailer: git-send-email 1.9.3\r
+In-Reply-To: <1412286796-27479-1-git-send-email-imain@stemwinder.org>\r
+References: <1412286796-27479-1-git-send-email-imain@stemwinder.org>\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: Thu, 02 Oct 2014 23:47:30 -0000\r
+\r
+This patch switches from reading .notmuch-config directly to using\r
+the CLI the same way that emacs does it.  It actually uses less code\r
+and is probably less error prone.\r
+\r
+    Ian\r
+---\r
+\r
+This update changes result to be '' instead of nil\r
+by default so missing config items won't cause an error.\r
+\r
+ vim/notmuch.vim | 31 ++++++++++++-------------------\r
+ 1 file changed, 12 insertions(+), 19 deletions(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 331e930..b251af6 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -471,28 +471,21 @@ ruby << EOF\r
+       $searches = []\r
+       $threads = []\r
+       $messages = []\r
+-      $config = {}\r
+       $mail_installed = defined?(Mail)\r
+ \r
+-      def get_config\r
+-              group = nil\r
+-              config = ENV['NOTMUCH_CONFIG'] || '~/.notmuch-config'\r
+-              File.open(File.expand_path(config)).each do |l|\r
+-                      l.chomp!\r
+-                      case l\r
+-                      when /^\[(.*)\]$/\r
+-                              group = $1\r
+-                      when ''\r
+-                      when /^(.*)=(.*)$/\r
+-                              key = "%s.%s" % [group, $1]\r
+-                              value = $2\r
+-                              $config[key] = value\r
+-                      end\r
+-              end\r
++      def get_config_item(item)\r
++              result = ''\r
++              IO.popen(['notmuch', 'config', 'get', item]) { |out|\r
++                      result = out.read\r
++              }\r
++              return result.rstrip\r
++      end\r
+ \r
+-              $db_name = $config['database.path']\r
+-              $email_name = $config['user.name']\r
+-              $email_address = $config['user.primary_email']\r
++      def get_config\r
++              $db_name = get_config_item('database.path')\r
++              $email_name = get_config_item('user.name')\r
++              $email_address = get_config_item('user.primary_email')\r
++              $email_name = get_config_item('user.name')\r
+               $email = "%s <%s>" % [$email_name, $email_address]\r
+       end\r
+ \r
+-- \r
+1.9.3\r
+\r