emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: gerard.vermeulen@posteo.net
To: Ihor Radchenko <yantar92@posteo.net>
Cc: Bastien <bzg@gnu.org>, Emacs orgmode <emacs-orgmode@gnu.org>,
	emacs-orgmode-bounces+gerard.vermeulen=posteo.net@gnu.org
Subject: Re: [BUG] Emacs-29.0.60: (setopt org-babel-load-languages ...) may cause warnings
Date: Thu, 02 Feb 2023 19:33:00 +0000	[thread overview]
Message-ID: <faa3006625dc1f9e7e6a2df7972a46b0@posteo.net> (raw)
In-Reply-To: <87pmasqxpr.fsf@localhost>

[-- Attachment #1: Type: text/plain, Size: 998 bytes --]



On 02.02.2023 09:26, Ihor Radchenko wrote:
> gerard.vermeulen@posteo.net writes:
> 
>>> May you please convert the diff into a patch with changelog entry and
>>> commit message? See
>>> https://orgmode.org/worg/org-contribute.html#org045e318
>> 
>> patch attached.
> 
> Thanks!
> 
>> 1. I have assigned my copyright for Emacs stuff to the FSF
> 
> Bastien, may you please confirm?
> 
>> 2. My initial version of the patch was against bugfix and now I have 
>> set
>> :package-version to "9.6"
> 
> Correct.
> You can also remove :version tag while we are at it. It is redundant
> when :package-version is provided (we are slowly getting rid of the
> :version tags across Org).
> 
>>      according to the instructions on the org-contribute page. I do 
>> not
>> know if this is acceptable (it
>>      feels a bit like breaking the rules), but I am happy to redo the
>> patch for main.
> 
> bugfix is fine. This is a trivial patch.

I have attached an amended patch with the :version tag removed.

[-- Attachment #2: 0001-org.el-Sync-org-babel-load-languages-with-Babel-file.patch --]
[-- Type: application/octet-stream, Size: 3046 bytes --]

From 54834588332fd4acc196fb5f006738b0f3a54cb1 Mon Sep 17 00:00:00 2001
From: Gerard Vermeulen <gerard.vermeulen@posteo.net>
Date: Wed, 1 Feb 2023 15:03:43 +0100
Subject: [PATCH] org.el: Sync org-babel-load-languages with Babel files in Org

* lisp/org.el (org-babel-load-languages): Sync with Babel files

(org-babel-load-languages): Synchronize the defcustom with the rest of
the code base, group languages by Org Babel file, and spell languages
using camel case (the current fashion).

Link: https://list.orgmode.org/712f2ef5b4edb2d9b565f6467e582030@posteo.net/
---
 lisp/org.el | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 1b829d837..1c1866dee 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -297,47 +297,49 @@ default, only Emacs Lisp is loaded, since it has no specific
 requirement."
   :group 'org-babel
   :set 'org-babel-do-load-languages
-  :version "24.1"
+  :package-version '(Org . "9.6")
   :type '(alist :tag "Babel Languages"
 		:key-type
 		(choice
 		 (const :tag "Awk" awk)
-		 (const :tag "C" C)
+		 (const :tag "C, D, C++, and cpp" C)
 		 (const :tag "R" R)
                  (const :tag "Calc" calc)
-		 (const :tag "Clojure" clojure)
+		 (const :tag "Clojure and ClojureScript" clojure)
 		 (const :tag "CSS" css)
 		 (const :tag "Ditaa" ditaa)
 		 (const :tag "Dot" dot)
                  (const :tag "Emacs Lisp" emacs-lisp)
+                 (const :tag "Eshell" eshell)
 		 (const :tag "Forth" forth)
 		 (const :tag "Fortran" fortran)
-		 (const :tag "Gnuplot" gnuplot)
+		 (const :tag "GnuPlot" gnuplot)
+		 (const :tag "Groovy" groovy)
 		 (const :tag "Haskell" haskell)
                  (const :tag "Java" java)
-		 (const :tag "Javascript" js)
-		 (const :tag "LaTeX" latex)
-                 (const :tag "Lilypond" lilypond)
+		 (const :tag "JavaScript" js)
+                 (const :tag "Julia" julia)
+                 (const :tag "LaTeX" latex)
+                 (const :tag "LilyPond" lilypond)
 		 (const :tag "Lisp" lisp)
+                 (const :tag "Lua" lua)
 		 (const :tag "Makefile" makefile)
 		 (const :tag "Maxima" maxima)
-		 (const :tag "Matlab" matlab)
-                 (const :tag "Ocaml" ocaml)
-		 (const :tag "Octave" octave)
+                 (const :tag "OCaml" ocaml)
+		 (const :tag "Octave and MatLab" octave)
 		 (const :tag "Org" org)
 		 (const :tag "Perl" perl)
-		 (const :tag "Pico Lisp" picolisp)
+                 (const :tag "Processing" processing)
 		 (const :tag "PlantUML" plantuml)
 		 (const :tag "Python" python)
 		 (const :tag "Ruby" ruby)
 		 (const :tag "Sass" sass)
-		 (const :tag "Scala" scala)
 		 (const :tag "Scheme" scheme)
 		 (const :tag "Screen" screen)
+                 (const :tag "Sed" sed)
 		 (const :tag "Shell Script" shell)
                  (const :tag "Sql" sql)
-		 (const :tag "Sqlite" sqlite)
-		 (const :tag "Stan" stan))
+		 (const :tag "Sqlite" sqlite))
 		:value-type (boolean :tag "Activate" :value t)))
 
 ;;;; Customization variables
-- 
2.39.1


  reply	other threads:[~2023-02-02 19:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-31  7:19 [BUG] Emacs-29.0.60: (setopt org-babel-load-languages ...) may cause warnings gerard.vermeulen
2023-01-31 10:34 ` Ihor Radchenko
2023-02-01 14:22   ` gerard.vermeulen
2023-02-02  8:26     ` Ihor Radchenko
2023-02-02 19:33       ` gerard.vermeulen [this message]
2023-03-03 14:58         ` Ihor Radchenko
2023-02-28  9:31       ` Bastien Guerry
2023-03-03 15:00         ` Ihor Radchenko

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://www.orgmode.org/

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

  git send-email \
    --in-reply-to=faa3006625dc1f9e7e6a2df7972a46b0@posteo.net \
    --to=gerard.vermeulen@posteo.net \
    --cc=bzg@gnu.org \
    --cc=emacs-orgmode-bounces+gerard.vermeulen=posteo.net@gnu.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=yantar92@posteo.net \
    /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://git.savannah.gnu.org/cgit/emacs/org-mode.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).