diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 60ef33bc6..dd3538743 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -96,27 +96,29 @@ like javac -verbose." (group (1+ (in alnum ?_))) ; capture the class name (0+ space) ?{) "Regexp for the class declaration.") -(defconst org-babel-java--main-re (rx line-start (0+ space) "public" - (1+ space) "static" - (1+ space) "void" - (1+ space) "main" - (0+ space) ?\( - (0+ space) "String" - (0+ space) (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--main-re + (rx line-start (0+ space) "public" + (1+ space) "static" + (1+ space) "void" + (1+ space) "main" + (0+ space) ?\( + (0+ space) "String" + (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for the main method declaration.") -(defconst org-babel-java--any-method-re (rx line-start - (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility - (opt (seq "static" (1+ space))) ; binding - (1+ (in alnum ?_ ?\[ ?\])) ; return type - (1+ space) (1+ (in alnum ?_)) ; method name - (0+ space) ?\( - (0+ space) (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--any-method-re + (rx line-start + (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility + (opt (seq "static" (1+ space))) ; binding + (1+ (in alnum ?_ ?\[ ?\])) ; return type + (1+ space) (1+ (in alnum ?_)) ; method name + (0+ space) ?\( + (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for any method.") (defconst org-babel-java--result-wrapper "\n public static String __toString(Object val) { if (val instanceof String) { @@ -192,7 +194,7 @@ replaced in this string.") ;; the dir to write the source file (packagedir (if (and (not run-from-temp) packagename) (file-name-as-directory - (concat basedir (replace-regexp-in-string "\\\." "/" packagename))) + (concat basedir (replace-regexp-in-string "\\." "/" packagename))) basedir)) ;; the filename of the source file (src-file (concat packagedir classname ".java")) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index b44db4c24..2e70ed32b 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -1,4 +1,4 @@ -;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- +;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison @@ -149,7 +149,7 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) - (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value))) + (let* ((lengths (mapcar #'length (cl-remove-if-not #'sequencep value))) (max (if lengths (apply #'max lengths) 0)) (min (if lengths (apply #'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). diff --git a/lisp/org-element.el b/lisp/org-element.el index 1c971b2f8..f8334ccbc 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -118,7 +118,7 @@ ;; to current setup. (defconst org-element-citation-key-re - (rx "@" (group (one-or-more (any word "-.:?!`'/*@+|(){}<>&_^$#%&~")))) + (rx "@" (group (one-or-more (any word "-.:?!`'/*@+|(){}<>&_^$#%~")))) "Regexp matching a citation key. Key is located in match group 1.") @@ -1024,7 +1024,7 @@ Assume point is at beginning of the headline." (title-start (prog1 (point) (unless (or todo priority commentedp) ;; Headline like "* :tag:" - (skip-syntax-backward " \t")))) + (skip-chars-backward " \t")))) (tags (when (re-search-forward "[ \t]+\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$" (line-end-position) diff --git a/lisp/org-src.el b/lisp/org-src.el index 0e16e236b..8d02cf434 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -38,6 +38,7 @@ (require 'org-keys) (declare-function org-mode "org" ()) +(declare-function org--get-expected-indentation "org" (element contentsp)) (declare-function org-element-at-point "org-element" ()) (declare-function org-element-class "org-element" (datum &optional parent)) (declare-function org-element-context "org-element" (&optional element)) diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el index 87ed9ed2d..1150643d7 100644 --- a/lisp/ox-koma-letter.el +++ b/lisp/ox-koma-letter.el @@ -1,4 +1,4 @@ -;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine -*- lexical-binding: t; -*- +;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine -*- lexical-binding: t; -*- ;; Copyright (C) 2007-2021 Free Software Foundation, Inc. diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 11d9c09eb..fcf876854 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -141,7 +141,7 @@ CONTENTS and INFO are ignored." CONTENTS is its contents, as a string or nil. INFO is ignored." (let ((case-fold-search t)) (replace-regexp-in-string - "^[ \t]*#\\+attr_[-_a-za-z0-9]+:\\(?: .*\\)?\n" "" + "^[ \t]*#\\+attr_[-_a-z0-9]+:\\(?: .*\\)?\n" "" (org-export-expand blob contents t)))) (defun org-org-headline (headline contents info)