From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qMcQOZe3fGBesAAAgWs5BA (envelope-from ) for ; Mon, 19 Apr 2021 00:49:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gMmQNJe3fGB9OgAAB5/wlQ (envelope-from ) for ; Sun, 18 Apr 2021 22:49:59 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7180C1CF9F for ; Mon, 19 Apr 2021 00:49:59 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7950D271C7; Sun, 18 Apr 2021 18:49:22 -0400 (EDT) Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by mail.notmuchmail.org (Postfix) with ESMTPS id D275B271B8 for ; Sun, 18 Apr 2021 18:49:16 -0400 (EDT) Received: by mail-oi1-x234.google.com with SMTP id n140so33708244oig.9 for ; Sun, 18 Apr 2021 15:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sW+ejJtAfR6i17ssu6BSDXY0AP3LQRFUgr6uz0fx8QA=; b=sNHeVum9U4LJfZyM3XVBtnw2cIEQDA8Q7cd72i/jXL193zxyX2k9lwx2lBmTEWd8Ha ZWKwNX/Kdkokvo4faYs63NMb44Fie8kJGf8Bk+u3+iJT8L9we97EUY5TQeMV3zn9LJKh wdvcv0qf+IgEEj15Llio5vgNUC2uGu1WeVHw1J8V2jh01QOBnKJuroVCD7v5e+y+ZVBD gUGMIjc0jH+8IcvfZnRcEyy5RG9zqc5l+vJYVBqCxW10K2CKEiEwHs3MCXOqkhSYp6+F 0it4bCpa5Y6tRlnGBjLFMeekeLUp/kxlBTUvRngzcPTmZJgNL1M17Kd/plUU699XbIcD oSpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sW+ejJtAfR6i17ssu6BSDXY0AP3LQRFUgr6uz0fx8QA=; b=BQ3AU/3U8tU/Ie0nodRZ2hVg44oAeQ/mqBWTjViHpiFNQ4ajOFVn3kq9VvP9J/+koo ncptS7d5cYFHDyikEuXRsb/pHIKBpERKH/J2nly45SJ/5Auoix9ZkQS9lsYE/RvicdqB 54mAGTaPFeIv/eegQdBOWR2YQTjfps9NgX1Y4olS8herdUXjBDx6DmQ4NicUKbapM1Qr edidP57retJTuMprKxZ2iEwpsJg/58z0LcGgjBe0s0MHVpOxOXigN+F/W72zLp9z5T/M 6M1lxjMaMtseIilS96sOpytjHos5FiO4ilgSZiLFX0dukZOeA5pf7cV0C6pL6jj52gun /6cQ== X-Gm-Message-State: AOAM530tk5TQGjEF99sUrg1/ui3ZhlGYnpEvGyRjUhmd+N4pPK7zADIz iVVYVjerGKwEwxC0ZqZQ7jrMIZjgfLtgGA== X-Google-Smtp-Source: ABdhPJzBOVjhgZhUJgigzPO0Ugt21Uw22z8D2vr89fd13OtZtXeT/tn++DbdvU/HlyfyzgHcas2Akg== X-Received: by 2002:a05:6808:6ca:: with SMTP id m10mr2475134oih.166.1618786156055; Sun, 18 Apr 2021 15:49:16 -0700 (PDT) Received: from localhost ([2806:2f0:4000:bfd0:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id c12sm2543194oou.26.2021.04.18.15.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 15:49:15 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Cc: Felipe Contreras Subject: [PATCH 12/13] vim: remove backwards compatibility wrappers Date: Sun, 18 Apr 2021 17:48:50 -0500 Message-Id: <20210418224851.88240-13-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210418224851.88240-1-felipe.contreras@gmail.com> References: <20210418224851.88240-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: RV5EGH4QIK6RG33COWU4VA3D2736M6AP X-Message-ID-Hash: RV5EGH4QIK6RG33COWU4VA3D2736M6AP X-MailFrom: felipe.contreras@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618786199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=8i64s3chotQGkXlq+WMi/bJzBEh2uETV6iN0SS/9O3g=; b=W44/VJlt8CE1KgvLS5wgCn3vuwkAcbSXKBqq7NmnSnuP60+Kad7UC1ItxCOeg8H/hC/6rw kXY5QRPB8aoOHxutRc0islQlOxcFLSwGwDIOkRrpY5JPbT6gdsHaR7NzPBFJi2IbSKQ/o6 n012Wx6fLJT5ZkS39AZtB5OQFMlD2CDEB4h6SIcszPm2YKtrbUSqwxyq8ehHa2bXZ4Hg6w oCfgg8+3h0m2WoiGNGHbHtdKMepiK8DK3qSAmrJTptqrNe7F2qWRVRWj37I7WLh02GksVt 8yf6JGHEnSZcXxRF86fSH2KRa13EPYsq4gCTp9Fy0n2L8st2rE/9KJX4agoRLQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618786199; a=rsa-sha256; cv=none; b=P1h20FAC7PVyQxF4iK/3enJBTLN1shtdBeiVVC2rL+pnRKkUglBGkwYb6aPrTzjhpW3X5R uqvIUbvEKXgjlmzTrydMQp61ahSTACFOY3jAm0g5VnHnPzbHulGuYrXYYzMi1mVRpJYAUn 48dgO7Gy37JS09v5TiB7ilVMcOr3RjvL7cVy0spix1/z7SPTDdhhyvJISj1uSwiBU2AOsX c3g3GWEzt/oNLxEMLBRoTZ3wTpFN3ln/gbi3zpGIXw7UKYv6yNdk3cnQq/rSJqw9rZ7rH7 GAngBVXY6detXk7vpEf4Tl1TExpuLMsSsSjq4ROIhPXm/sxAaj6KISHUs3B5hw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=sNHeVum9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=sNHeVum9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 7180C1CF9F X-Spam-Score: -0.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: sVzX5NcG8QsI Seven years is more than enough. Signed-off-by: Felipe Contreras --- 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