From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4F9ALzt2UGG0XwAAgWs5BA (envelope-from ) for ; Sun, 26 Sep 2021 15:31:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GObRKjt2UGEJTAAAbx9fmQ (envelope-from ) for ; Sun, 26 Sep 2021 13:31:39 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 11A94317E0 for ; Sun, 26 Sep 2021 15:31:39 +0200 (CEST) Received: from localhost ([::1]:46678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUUFl-0002yp-3E for larch@yhetil.org; Sun, 26 Sep 2021 09:31:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUUEi-0002yS-TD for emacs-orgmode@gnu.org; Sun, 26 Sep 2021 09:30:32 -0400 Received: from ciao.gmane.io ([116.202.254.214]:54038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUUEh-00016c-9O for emacs-orgmode@gnu.org; Sun, 26 Sep 2021 09:30:32 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1mUUEf-0004ap-DX for emacs-orgmode@gnu.org; Sun, 26 Sep 2021 15:30:29 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: [PATCH] org.el: Use org-contrib module instead of CONTRIB dir in docs Date: Sun, 26 Sep 2021 20:30:20 +0700 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9F54FB9C9A94C2894A9F2123" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 X-Woof-Patch: [PATCH] org.el: Use org-contrib module instead of CONTRIB dir in docs In-Reply-To: Content-Language: en-US Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632663099; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=bjPk20g+oPfGy35Xzb5absIid68Qvg52udQc0w3EQlY=; b=Si4nL1wJE1imC7bdCzYf9ha9gNV+yEIyqlrw8yFq03ptFNNDgRmmyIKMhPUzq0GGMfTSBw bIhCeVxzttsiSNHo7KTHp+rxdHXGp62r5OfeMZ9cFw0FRg+BlV9Zp7T5JFmJEy/dqjF8Tm riAUcRUxJypZ8UtQPC2/o/EIa3e3undhtMK66YwjqD3ojPRiqCmB8fdwhwkuTdjosnrEGy w7IObqSVmPwdrshnam0TNY6gX1EdJZ6bRcpsnJCio0ZdhwJXVuYSQTLxjB9RFnfqZqBZ2u K4JT1+inN7GvtgccV+kvt3LmUZzM46HcKMkbanM+4gEvB25ijX9VK2ewwS+F2w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632663099; a=rsa-sha256; cv=none; b=auhUtF9DwEuS+Sv7YxySnEltHGQ8FG0/Mqi3tLFzPATVyVlQWepILgyy4bZdEvc/YKsw55 o2i9aZdRzKzB/5Fi6vcTJnJE9JKlWLzEiWWt/aZ/PDegEax5G/PAdD4JMWJ/5lxO6Hr26q +0ZRk+dLPiYZGbjp/JQElg1l70Ag+gNk0yi+FsgFMQiRj++VvYA3X6V+IJm9CYxqge0qE9 0Cy987qDQl7MhTFYLx0dO4x8SZfbrCgATl5W+Vz3LfoLCWbiR4QgAkNTH76ieBNWh78jQk u4KebCu3u8jyrQqZr4SQglquPeDHKMJHtCfcAh9vheadv08UWDzkXUXlxWObdQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -0.29 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 11A94317E0 X-Spam-Score: -0.29 X-Migadu-Scanner: scn0.migadu.com X-TUID: t4uBvrkqw5jw This is a multi-part message in MIME format. --------------9F54FB9C9A94C2894A9F2123 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 07/07/2021 14:23, Michael Maurer wrote: > On Tue, 6 Jul 2021 at 08:07, Michael Maurer wrote: >> >> (setq org-return-follows-link t) >> (custom-set-variables >> '(org-modules (quote (org-wikinodes))) >> '(org-return-follows-link t)) > > Is this deprecated and no longer part of org? I searched the > org-folder for any file resembling wikinodes, but couldn't find > anything. Another patch to avoid confusing of users in customization interface. --------------9F54FB9C9A94C2894A9F2123 Content-Type: text/x-patch; charset=UTF-8; name="0001-org.el-Use-org-contrib-module-instead-of-CONTRIB-dir.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-org.el-Use-org-contrib-module-instead-of-CONTRIB-dir.pa"; filename*1="tch" >From 97e1d7548c6b050bc11a452072fb1e0d9032ab23 Mon Sep 17 00:00:00 2001 From: Max Nikulin Date: Sun, 26 Sep 2021 20:25:14 +0700 Subject: [PATCH] org.el: Use org-contrib module instead of CONTRIB dir in docs * lisp/org.el (org-modules, org-export-backends): Update docstrings since CONTRIB directory was transformed into a package in NonGNU ELPA. Reported by Michael Maurer https://lists.gnu.org/archive/html/emacs-orgmode/2021-07/msg00195.html --- lisp/org.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 5379bd297..5ff8990bd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -689,12 +689,13 @@ defined in org-duration.el.") (defcustom org-modules '(ol-doi ol-w3m ol-bbdb ol-bibtex ol-docview ol-gnus ol-info ol-irc ol-mhe ol-rmail ol-eww) "Modules that should always be loaded together with org.el. -If a description starts with , the file is not part of Emacs -and loading it will require that you have downloaded and properly -installed the Org mode distribution. +If a description starts with , the file is not part of Emacs and Org mode, +so loading it will require that you have properly installed org-contrib +package from NonGNU Emacs Lisp Package Archive +http://elpa.nongnu.org/nongnu/org-contrib.html You can also use this system to load external packages (i.e. neither Org -core modules, nor modules from the CONTRIB directory). Just add symbols +core modules, nor org-contrib modules). Just add symbols to the end of the list. If the package is called org-xyz.el, then you need to add the symbol `xyz', and the package must have a call to: @@ -768,9 +769,10 @@ For export specific modules, see also `org-export-backends'." (defcustom org-export-backends '(ascii html icalendar latex odt) "List of export back-ends that should be always available. -If a description starts with , the file is not part of Emacs -and loading it will require that you have downloaded and properly -installed the Org mode distribution. +If a description starts with , the file is not part of Emacs and Org mode, +so loading it will require that you have properly installed org-contrib +package from NonGNU Emacs Lisp Package Archive +http://elpa.nongnu.org/nongnu/org-contrib.html Unlike to `org-modules', libraries in this list will not be loaded along with Org, but only once the export framework is -- 2.25.1 --------------9F54FB9C9A94C2894A9F2123--