branch: externals/org
commit 98fd6d5fd58540b94a64a2358abcbb1bbd8421ea
Author: Bastien <b...@gnu.org>
Commit: Bastien <b...@gnu.org>
Remove references to deleted packages
* testing/lisp/test-ob-vala.el: Delete file.
* mk/default.mk (BTEST_OB_LANGUAGES):
* lisp/ox-man.el (org-man-source-highlight-langs):
* lisp/org.el (org-babel-load-languages): Remove references to
deleted packages.
---
lisp/org.el | 23 +++-------
lisp/ox-man.el | 2 +-
mk/default.mk | 2 +-
testing/lisp/test-ob-vala.el | 104 -------------------------------------------
4 files changed, 9 insertions(+), 122 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 96d0e8a..5379bd2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -274,32 +274,25 @@ requirement."
(const :tag "Awk" awk)
(const :tag "C" C)
(const :tag "R" R)
- (const :tag "Asymptote" asymptote)
- (const :tag "Calc" calc)
+ (const :tag "Calc" calc)
(const :tag "Clojure" clojure)
(const :tag "CSS" css)
(const :tag "Ditaa" ditaa)
(const :tag "Dot" dot)
- (const :tag "Ebnf2ps" ebnf2ps)
- (const :tag "Emacs Lisp" emacs-lisp)
+ (const :tag "Emacs Lisp" emacs-lisp)
(const :tag "Forth" forth)
(const :tag "Fortran" fortran)
(const :tag "Gnuplot" gnuplot)
(const :tag "Haskell" haskell)
- (const :tag "hledger" hledger)
- (const :tag "IO" io)
- (const :tag "J" J)
- (const :tag "Java" java)
+ (const :tag "Java" java)
(const :tag "Javascript" js)
(const :tag "LaTeX" latex)
- (const :tag "Ledger" ledger)
- (const :tag "Lilypond" lilypond)
+ (const :tag "Lilypond" lilypond)
(const :tag "Lisp" lisp)
(const :tag "Makefile" makefile)
(const :tag "Maxima" maxima)
(const :tag "Matlab" matlab)
- (const :tag "Mscgen" mscgen)
- (const :tag "Ocaml" ocaml)
+ (const :tag "Ocaml" ocaml)
(const :tag "Octave" octave)
(const :tag "Org" org)
(const :tag "Perl" perl)
@@ -312,11 +305,9 @@ requirement."
(const :tag "Scheme" scheme)
(const :tag "Screen" screen)
(const :tag "Shell Script" shell)
- (const :tag "Shen" shen)
- (const :tag "Sql" sql)
+ (const :tag "Sql" sql)
(const :tag "Sqlite" sqlite)
- (const :tag "Stan" stan)
- (const :tag "Vala" vala))
+ (const :tag "Stan" stan))
:value-type (boolean :tag "Activate" :value t)))
;;;; Customization variables
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index bcce808..f9fc0ff 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -186,7 +186,7 @@ When nil, no transformation is made."
(ldap "ldap") (opa "opa")
(php "php") (postscript "postscript") (prolog "prolog")
(properties "properties") (makefile "makefile")
- (tml "tml") (vala "vala") (vbscript "vbscript") (xorg "xorg"))
+ (tml "tml") (vbscript "vbscript") (xorg "xorg"))
"Alist mapping languages to their listing language counterpart.
The key is a symbol, the major mode symbol without the \"-mode\".
The value is the string that should be inserted as the language
diff --git a/mk/default.mk b/mk/default.mk
index e92d58c..8ab31e0 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -43,7 +43,7 @@ BTEST_POST =
# -L <path-to>/ert # needed for Emacs23, Emacs24 has ert
built in
# -L <path-to>/ess # needed for running R tests
# -L <path-to>/htmlize # need at least version 1.34 for source
code formatting
-BTEST_OB_LANGUAGES = awk C fortran maxima lilypond octave perl python vala
+BTEST_OB_LANGUAGES = awk C fortran maxima lilypond octave perl python
# R # requires ESS to be installed and
configured
# ruby # requires inf-ruby to be installed and
configured
# extra packages to require for testing
diff --git a/testing/lisp/test-ob-vala.el b/testing/lisp/test-ob-vala.el
deleted file mode 100644
index 364f2e9..0000000
--- a/testing/lisp/test-ob-vala.el
+++ /dev/null
@@ -1,104 +0,0 @@
-;;; test-ob-vala.el --- tests for ob-vala.el
-
-;; Copyright (C) 2017, 2019 Christian Garbs
-;; Authors: Christian Garbs
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-;;; Code:
-(unless (featurep 'ob-vala)
- (signal 'missing-test-dependency "Support for Vala code blocks"))
-
-(org-test-for-executable org-babel-vala-compiler)
-
-(ert-deftest ob-vala/assert ()
- (should t))
-
-(ert-deftest ob-vala/static-output ()
- "Parse static output to variable."
- (should (= 42
- (org-test-with-temp-text
- "
-#+begin_src vala
- class Demo.HelloWorld : GLib.Object {
- public static int main(string[] args) {
- stdout.printf(\"42\n\");
- return 0;
- }
- }
-#+end_src"
- (org-babel-next-src-block)
- (org-babel-execute-src-block)))))
-
-(ert-deftest ob-vala/return-numerics ()
- "Return multiple numeric values."
- (should (equal '((0) (1) (2))
- (org-test-with-temp-text
- "
-#+begin_src vala
- class Demo.HelloWorld : GLib.Object {
- public static int main(string[] args) {
- for (int i=0; i<3; i++) {
- stdout.printf(\"%d\n\", i);
- }
- return 0;
- }
- }
-#+end_src"
- (org-babel-next-src-block)
- (org-babel-execute-src-block)))))
-
-(ert-deftest ob-vala/compiler-args ()
- "Pass compiler arguments."
- (should (string= "Foo"
- (org-test-with-temp-text
- "
-#+begin_src vala :flags -D FOO
- class Demo.HelloWorld : GLib.Object {
- public static int main(string[] args) {
-#if FOO
- stdout.printf(\"Foo\n\");
-#else
- stdout.printf(\"No foo\n\");
-#endif
- return 0;
- }
- }
-#+end_src"
- (org-babel-next-src-block)
- (org-babel-execute-src-block)))))
-
-(ert-deftest ob-vala/comdline-args ()
- "Pass commandline arguments."
- (should (equal '(("foo") ("bar"))
- (org-test-with-temp-text
- "
-#+begin_src vala :cmdline foo bar
- class Demo.HelloWorld : GLib.Object {
- public static int main(string[] args) {
- // skip args[0], it is the binary name
- for (int i=1; i < args.length; i++) {
- stdout.printf(\"%s\n\" , args[i]);
- }
- return 0;
- }
- }
-#+end_src"
- (org-babel-next-src-block)
- (org-babel-execute-src-block)))))
-
-
-;;; test-ob-vala.el ends here
