unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 12/13] vim: remove backwards compatibility wrappers
Date: Sun, 18 Apr 2021 17:48:50 -0500	[thread overview]
Message-ID: <20210418224851.88240-13-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210418224851.88240-1-felipe.contreras@gmail.com>

Seven years is more than enough.

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

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index e717fb5a..717633c7 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -399,20 +399,16 @@ endfunction
 "" root
 
 function! s:set_defaults()
+	if !exists('g:notmuch_folders')
+		let g:notmuch_folders = s:notmuch_folders_default
+	endif
+
 	if !exists('g:notmuch_date_format')
-		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
+		let g:notmuch_date_format = s:notmuch_date_format_default
 	endif
 
 	if !exists('g:notmuch_datetime_format')
-		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
+		let g:notmuch_datetime_format = s:notmuch_datetime_format_default
 	endif
 
 	if !exists('g:notmuch_reply_quote_format')
@@ -424,41 +420,21 @@ function! s:set_defaults()
 	endif
 
 	if !exists('g:notmuch_reader')
-		if exists('g:notmuch_rb_reader')
-			let g:notmuch_reader = g:notmuch_rb_reader
-		else
-			let g:notmuch_reader = s:notmuch_reader_default
-		endif
+		let g:notmuch_reader = s:notmuch_reader_default
 	endif
 
 	if !exists('g:notmuch_sendmail')
-		if exists('g:notmuch_rb_sendmail')
-			let g:notmuch_sendmail = g:notmuch_rb_sendmail
-		else
-			let g:notmuch_sendmail = s:notmuch_sendmail_default
-		endif
+		let g:notmuch_sendmail = s:notmuch_sendmail_default
 	endif
 
 	if !exists('g:notmuch_folders_count_threads')
-		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
+		let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default
 	endif
 
 	if !exists('g:notmuch_compose_start_insert')
 		let g:notmuch_compose_start_insert = s:notmuch_compose_start_insert_default
 	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')
 		call extend(g:notmuch_search_maps, g:notmuch_custom_search_maps)
 	endif
@@ -466,14 +442,6 @@ function! s:set_defaults()
 	if exists('g:notmuch_custom_show_maps')
 		call extend(g:notmuch_show_maps, g:notmuch_custom_show_maps)
 	endif
-
-	if !exists('g:notmuch_folders')
-		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
 
 function! s:NotMuch(...)
-- 
2.31.0

  parent reply	other threads:[~2021-04-18 22:49 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-18 22:48 [PATCH 00/13] vim: a bunch of updates from upstream Felipe Contreras
2021-04-18 22:48 ` [PATCH 01/13] vim: fix Mail 2.8.0 warning Felipe Contreras
2021-04-26 23:10   ` David Bremner
2021-04-18 22:48 ` [PATCH 02/13] vim: doc: small fixes Felipe Contreras
2021-04-18 22:48 ` [PATCH 03/13] vim: doc: minor spelling fix Felipe Contreras
2021-04-18 22:48 ` [PATCH 04/13] vim: fix for missing parts Felipe Contreras
2021-04-18 22:48 ` [PATCH 05/13] vim: show first part if no text part is detected Felipe Contreras
2021-04-18 22:48 ` [PATCH 06/13] vim: trivial cleanup Felipe Contreras
2021-04-18 22:48 ` [PATCH 07/13] vim: use notmuch config command Felipe Contreras
2021-04-18 22:48 ` [PATCH 08/13] vim: trivial cleanup Felipe Contreras
2021-04-18 22:48 ` [PATCH 09/13] vim: option to add email address to reply quote Felipe Contreras
2021-04-18 22:48 ` [PATCH 10/13] vim: option to add reply quote datetime Felipe Contreras
2021-04-18 22:48 ` [PATCH 11/13] vim: syntax: fix message description highlighting Felipe Contreras
2021-04-18 22:48 ` Felipe Contreras [this message]
2021-04-18 22:48 ` [PATCH 13/13] vim: README: sync with upstream Felipe Contreras
2021-04-19 10:16 ` [PATCH 00/13] vim: a bunch of updates from upstream David Bremner
2021-04-19 20:44   ` Felipe Contreras
2021-04-19 22:14     ` David Bremner
2021-04-20  3:21       ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210418224851.88240-13-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).