From patchwork Mon Oct 16 09:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 54864 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6119827BBEA; Mon, 16 Oct 2023 10:18:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A92AA27BBE9 for ; Mon, 16 Oct 2023 10:18:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsJkK-0005mM-V5; Mon, 16 Oct 2023 05:18:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsJkG-0005g7-E3 for guix-patches@gnu.org; Mon, 16 Oct 2023 05:18:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qsJkE-0006Wg-Gr for guix-patches@gnu.org; Mon, 16 Oct 2023 05:18:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qsJkc-0007A6-OQ for guix-patches@gnu.org; Mon, 16 Oct 2023 05:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60029] [PATCH v3 1/3] gnu: vim: Add vim packages to 'package-path' instead of 'runtime-path'. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Oct 2023 09:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60029 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60029@debbugs.gnu.org Cc: paren@disroot.org, me@jonscoresby.com, Efraim Flashner Received: via spool by 60029-submit@debbugs.gnu.org id=B60029.169744789327442 (code B ref 60029); Mon, 16 Oct 2023 09:19:02 +0000 Received: (at 60029) by debbugs.gnu.org; 16 Oct 2023 09:18:13 +0000 Received: from localhost ([127.0.0.1]:55233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsJjo-00078S-8K for submit@debbugs.gnu.org; Mon, 16 Oct 2023 05:18:12 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:43227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsJjk-00077x-Mi for 60029@debbugs.gnu.org; Mon, 16 Oct 2023 05:18:10 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-405505b07dfso32635895e9.0 for <60029@debbugs.gnu.org>; Mon, 16 Oct 2023 02:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697447858; x=1698052658; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=rerW/ocfr2cEHI1JFetmfiECdDCymukJpQww1fGSoFo=; b=WU/10Q6BZY2uCtEJaTTeuTIJBf5zM9nM3htX+jYd26UD4AdWBcPNcxYXFOVlBGJBfB C+aD19AgzQlfWodkwN5oM0elgHym5u/jb523Bh+E8vdybGiVfqit5tOD14j0/aCrqce+ a7+xJDESXK+6fBRCXx2/yGy+1baO9ipZxuX22nyZhq5TDOUNgghpkT7Lu5WJAtKZj2zj NOtxVPfnJgr3/Y8EPoW5x2pjrE5ZLAjksQW/IdPvrgTXp0P/jkyKMG7acScXsOxdssd/ in1TD8kMbaoylCt2CaVaaJXGMBKEp0Zb4zkIHi6Thp0wS2Amsw6xjW8I4oCq0DkEBqju kOOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697447858; x=1698052658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rerW/ocfr2cEHI1JFetmfiECdDCymukJpQww1fGSoFo=; b=ESUpq0r3USh7dOLYpte43wEYiIa0TXESBBHMkm7lMc64euhsxqyGEjc/8qjbTYUyD/ 69AmpFsHTsHcsp/SOJxjDyJkNCbLvGLCkXKjEcaQS4LbD4SQGL5PDTZPkx5P5SvZMC0n p8Snn3HGzZuMTW+LdPSFg2GBPKse8l/E40THOIcWwPoS/oQ0o/vp5g/mNuF4tCt+7Wz1 pQ1MUaUqGyF/SDq4fLkYZq9FNbaXWQ1v017CmuYROt4lupqTGHTL/1TZph2ge3U2tu1s +M9Nf8DYKriPXzIjuLZNsiY09hBukk2T3w4Vm0bPS6XRa8TsV6VaVXfJM4GhVNmml5hB NSLA== X-Gm-Message-State: AOJu0Yy5Ctk74R5WZWbcgITBzY6no6QbY09mFJtuI90p9E0OtkSkhVrK 6r+Kzoqn4ZKvVp04Tf2UE7PNWwda2lnRpg== X-Google-Smtp-Source: AGHT+IGbSxY4oezAzirMyebndunhBrJ1wtZTgqv3IOJQhdHpwUegpEheBVDESpR6iZbSrvWglwktKw== X-Received: by 2002:adf:f249:0:b0:324:8353:5247 with SMTP id b9-20020adff249000000b0032483535247mr4743793wrp.16.1697447857974; Mon, 16 Oct 2023 02:17:37 -0700 (PDT) Received: from localhost ([31.210.180.106]) by smtp.gmail.com with ESMTPSA id bv2-20020a0560001f0200b0032d09f7a713sm16094788wrb.18.2023.10.16.02.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 02:17:37 -0700 (PDT) From: Efraim Flashner Date: Mon, 16 Oct 2023 12:15:11 +0300 Message-ID: <3f91d5d543a57335eb10f146a1dd55fc2dab003c.1697446927.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jonathan Scoresby This is neccesary because vim's built-in plugin manager looks for directories under 'package-path' instead of 'runtime-path.' Once we have told vim the package-path, it adds all the packages to the runtime-path automatically for us. * gnu/packages/aux-files/guix.vim: Add paths to packagepath instead of runtimepath. Remove code to adjust runtimepath after adding paths. Signed-off-by: Efraim Flashner --- gnu/packages/aux-files/guix.vim | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/aux-files/guix.vim b/gnu/packages/aux-files/guix.vim index 9397c53701..24a6b941a8 100644 --- a/gnu/packages/aux-files/guix.vim +++ b/gnu/packages/aux-files/guix.vim @@ -1,13 +1,8 @@ -" This appends all of the vim plugins to the end of Vim's runtimepath. +" This appends all applicable vim paths to the end of packagepath. Once we +" have told vim the packagepath vim will add it to the runtimepath for us. for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $HOME ."/.guix-home/profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT] let vimplugins = directory . "/share/vim/vimfiles" if isdirectory(vimplugins) - let &rtp = join([&rtp,vimplugins], ',') + let &pp = join([&pp,vimplugins], ',') endif endfor -" Unconditionally add */after directories last, as intended by upstream -" TODO: Remove duplicate */after directories -for directory in [$VIM . "/vimfiles", $HOME ."/.vim"] - let vimplugins = directory . "/after" - let &rtp = join([&rtp,vimplugins], ',') -endfor