[PATCH] VIM: Make starting in 'insert' mode for compose optional

diff --git a/0f/a0366e324bc4c0bdce46b1a2f6b05e96fea557 b/0f/a0366e324bc4c0bdce46b1a2f6b05e96fea557
new file mode 100644 (file)
index 0000000..f27b0ce
--- /dev/null
+++ b/0f/a0366e324bc4c0bdce46b1a2f6b05e96fea557
@@ -0,0 +1,103 @@
+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 C8244431FBD\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Oct 2014 10:11:37 -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 Y2LIYmkoYpu1 for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Oct 2014 10:11:32 -0700 (PDT)\r
+Received: from cmta7.telus.net (cmta7.telus.net [209.171.16.80])\r
+       by olra.theworths.org (Postfix) with ESMTP id 38962431FB6\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Oct 2014 10:11:32 -0700 (PDT)\r
+Received: from ovo.mains.priv ([207.102.88.62]) by cmta7.telus.net with TELUS\r
+       id xtBX1o00K1LiWEf01tBX49; Wed, 01 Oct 2014 11:11:31 -0600\r
+X-Authority-Analysis: v=2.0 cv=TdpIQ2sh c=1 sm=2\r
+       a=EcQDfIwDZEqJA1f7rVUV8Q==:17 a=S-IsBHyFrF4A:10 a=tsa3CZZnAAAA:8\r
+       a=fArRigtdUK9Wchup0toA:9 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] VIM: Make starting in 'insert' mode for compose optional\r
+Date: Wed,  1 Oct 2014 10:11:28 -0700\r
+Message-Id: <1412183488-12707-1-git-send-email-imain@stemwinder.org>\r
+X-Mailer: git-send-email 1.9.3\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: Wed, 01 Oct 2014 17:11:37 -0000\r
+\r
+This adds a variable to make starting in insert mode optional when\r
+composing and replying to emails.  I found it unusual to be started in\r
+insert mode so I thought I'd make it optional as others may find this as\r
+well.\r
+\r
+    Ian\r
+---\r
+ vim/notmuch.vim | 13 +++++++++++--\r
+ 1 file changed, 11 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 331e930..252f16b 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -59,6 +59,7 @@ let s:notmuch_datetime_format_default = '%d.%m.%y %H:%M:%S'\r
+ 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
++let s:notmuch_compose_start_insert_default = 1\r
+ \r
+ function! s:new_file_buffer(type, fname)\r
+       exec printf('edit %s', a:fname)\r
+@@ -132,7 +133,9 @@ function! s:show_reply()\r
+       let b:compose_done = 0\r
+       call s:set_map(g:notmuch_compose_maps)\r
+       autocmd BufDelete <buffer> call s:on_compose_delete()\r
+-      startinsert!\r
++      if g:notmuch_compose_start_insert\r
++              startinsert!\r
++      end\r
+ endfunction\r
+ \r
+ function! s:compose()\r
+@@ -140,7 +143,9 @@ function! s:compose()\r
+       let b:compose_done = 0\r
+       call s:set_map(g:notmuch_compose_maps)\r
+       autocmd BufDelete <buffer> call s:on_compose_delete()\r
+-      startinsert!\r
++      if g:notmuch_compose_start_insert\r
++              startinsert!\r
++      end\r
+ endfunction\r
+ \r
+ function! s:show_info()\r
+@@ -428,6 +433,10 @@ function! s:set_defaults()\r
+               endif\r
+       endif\r
+ \r
++      if !exists('g:notmuch_compose_start_insert')\r
++              let g:notmuch_compose_start_insert = s:notmuch_compose_start_insert_default\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
+1.9.3\r
+\r