Browse Source

Tiny formatting fixes

* lisp/ox.el (org-export-table-dimensions):
* lisp/ox-texinfo.el (org-texinfo-template):
* lisp/ox-md.el (org-md-link):
* lisp/ox-icalendar.el (org-icalendar-use-UTC-date-time-p):
* lisp/ox-ascii.el (org-ascii-fixed-width):
* lisp/org.el (org-context):
* lisp/org-table.el (org-table-eval-formula)
(org-table-export):
* lisp/org-refile.el:
* lisp/org-plot.el (org-plot/gnuplot-to-grid-data):
* lisp/org-num.el (org-num):
* lisp/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org-macro.el (org-macro):
* lisp/org-lint.el (org-lint):
* lisp/org-keys.el (org-keys):
* lisp/org-duration.el:
* lisp/org-clock.el (org-clock-get-last-clock-out-time)
(org-clock-update-mode-line, org-find-open-clocks):
* lisp/org-agenda.el (org-diary)
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item)
(org-agenda-highlight-todo, org-cmp-alpha)
(org-agenda-filter-by-category):
* lisp/ol.el (org-link-expand-abbrev, ol):
* lisp/ol-docview.el (ol-docview):
* lisp/ol-bibtex.el (org-execute-file-search-in-bibtex)
(org-bibtex, org-bibtex-read):
* lisp/ol-bbdb.el (org-bbdb-anniversary-description):
* lisp/ob-tangle.el (org-babel-tangle-jump-to-org):
* lisp/ob-table.el (org-babel-table-truncate-at-newline):
* lisp/ob-stan.el:
* lisp/ob-sqlite.el (org-babel-sqlite-table-or-scalar):
* lisp/ob-sql.el:
* lisp/ob-shen.el:
* lisp/ob-shell.el (org-babel-prep-session:shell)
(org-babel-prep-session:shell):
* lisp/ob-sed.el (org-babel-execute:sed)
(org-babel-execute:sed):
* lisp/ob-screen.el:
* lisp/ob-sass.el:
* lisp/ob-ruby.el (org-babel-prep-session:ruby)
(org-babel-prep-session:ruby):
* lisp/ob-ref.el (org-babel-ref-resolve, ob-ref):
* lisp/ob-python.el (org-babel-prep-session:python)
(org-babel-prep-session:python):
* lisp/ob-plantuml.el:
* lisp/ob-picolisp.el:
* lisp/ob-perl.el:
* lisp/ob-org.el:
* lisp/ob-octave.el (org-babel-prep-session:octave)
(org-babel-prep-session:octave)
(org-babel-octave-evaluate-session):
* lisp/ob-ocaml.el:
* lisp/ob-mscgen.el (org-babel-execute:mscgen)
(org-babel-execute:mscgen):
* lisp/ob-maxima.el:
(ob-maxima):
* lisp/ob-matlab.el:
* lisp/ob-makefile.el:
* lisp/ob-lua.el (org-babel-prep-session:lua)
(org-babel-prep-session:lua):
* lisp/ob-lisp.el:
* lisp/ob-ledger.el:
* lisp/ob-latex.el (org-babel-expand-body:latex)
(org-babel-expand-body:latex, ob-latex):
* lisp/ob-js.el:
* lisp/ob-java.el:
* lisp/ob-io.el (org-babel-prep-session:io)
(org-babel-prep-session:io):
* lisp/ob-hledger.el:
* lisp/ob-haskell.el:
* lisp/ob-groovy.el (org-babel-groovy-wrapper-method)
(org-babel-groovy-evaluate):
* lisp/ob-gnuplot.el:
* lisp/ob-fortran.el (org-babel-expand-body:fortran)
(org-babel-expand-body:fortran):
* lisp/ob-forth.el (org-babel-forth-session-execute):
* lisp/ob-exp.el (ob-exp):
* lisp/ob-eval.el:
* lisp/ob-emacs-lisp.el:
* lisp/ob-ebnf.el:
* lisp/ob-dot.el:
* lisp/ob-ditaa.el:
* lisp/ob-css.el:
* lisp/ob-core.el (org-babel-put-rownames):
* lisp/ob-coq.el:
* lisp/ob-comint.el:
* lisp/ob-calc.el:
* lisp/ob-awk.el:
* lisp/ob-asymptote.el:
* lisp/ob-abc.el:
* lisp/ob-R.el (org-babel-prep-session:R): Formatting fixes.
Bastien 5 years ago
parent
commit
6a1f6ee1f8
72 changed files with 136 additions and 164 deletions
  1. 2 3
      lisp/ob-R.el
  2. 1 0
      lisp/ob-abc.el
  3. 0 2
      lisp/ob-asymptote.el
  4. 0 2
      lisp/ob-awk.el
  5. 0 2
      lisp/ob-calc.el
  6. 0 2
      lisp/ob-comint.el
  7. 2 0
      lisp/ob-coq.el
  8. 2 1
      lisp/ob-core.el
  9. 0 2
      lisp/ob-css.el
  10. 0 2
      lisp/ob-ditaa.el
  11. 0 2
      lisp/ob-dot.el
  12. 13 12
      lisp/ob-ebnf.el
  13. 0 2
      lisp/ob-emacs-lisp.el
  14. 0 2
      lisp/ob-eval.el
  15. 0 1
      lisp/ob-exp.el
  16. 2 1
      lisp/ob-forth.el
  17. 2 1
      lisp/ob-fortran.el
  18. 0 2
      lisp/ob-gnuplot.el
  19. 0 4
      lisp/ob-groovy.el
  20. 3 7
      lisp/ob-haskell.el
  21. 2 3
      lisp/ob-hledger.el
  22. 0 3
      lisp/ob-io.el
  23. 0 2
      lisp/ob-java.el
  24. 0 2
      lisp/ob-js.el
  25. 3 2
      lisp/ob-latex.el
  26. 0 2
      lisp/ob-ledger.el
  27. 0 2
      lisp/ob-lisp.el
  28. 2 3
      lisp/ob-lua.el
  29. 0 2
      lisp/ob-makefile.el
  30. 0 2
      lisp/ob-matlab.el
  31. 0 5
      lisp/ob-maxima.el
  32. 1 4
      lisp/ob-mscgen.el
  33. 0 2
      lisp/ob-ocaml.el
  34. 4 4
      lisp/ob-octave.el
  35. 0 2
      lisp/ob-org.el
  36. 0 2
      lisp/ob-perl.el
  37. 0 2
      lisp/ob-picolisp.el
  38. 0 2
      lisp/ob-plantuml.el
  39. 2 3
      lisp/ob-python.el
  40. 2 2
      lisp/ob-ref.el
  41. 2 3
      lisp/ob-ruby.el
  42. 0 2
      lisp/ob-sass.el
  43. 0 2
      lisp/ob-screen.el
  44. 3 1
      lisp/ob-sed.el
  45. 2 3
      lisp/ob-shell.el
  46. 1 0
      lisp/ob-shen.el
  47. 0 2
      lisp/ob-sql.el
  48. 2 3
      lisp/ob-sqlite.el
  49. 1 0
      lisp/ob-stan.el
  50. 2 3
      lisp/ob-table.el
  51. 2 1
      lisp/ob-tangle.el
  52. 2 2
      lisp/ol-bbdb.el
  53. 6 3
      lisp/ol-bibtex.el
  54. 0 1
      lisp/ol-docview.el
  55. 2 2
      lisp/ol.el
  56. 22 11
      lisp/org-agenda.el
  57. 6 3
      lisp/org-clock.el
  58. 1 0
      lisp/org-duration.el
  59. 1 1
      lisp/org-keys.el
  60. 1 1
      lisp/org-lint.el
  61. 1 1
      lisp/org-macro.el
  62. 4 2
      lisp/org-mouse.el
  63. 1 1
      lisp/org-num.el
  64. 2 1
      lisp/org-plot.el
  65. 1 0
      lisp/org-refile.el
  66. 4 2
      lisp/org-table.el
  67. 14 7
      lisp/org.el
  68. 2 1
      lisp/ox-ascii.el
  69. 2 1
      lisp/ox-icalendar.el
  70. 2 1
      lisp/ox-md.el
  71. 2 1
      lisp/ox-texinfo.el
  72. 2 1
      lisp/ox.el

+ 2 - 3
lisp/ob-R.el

@@ -193,7 +193,8 @@ This function is called by `org-babel-execute-src-block'."
     (org-babel-comint-in-buffer session
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input nil t)
               (end-of-line 1) (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
     session))
 
 
 (defun org-babel-load-session:R (session body params)
 (defun org-babel-load-session:R (session body params)
@@ -464,6 +465,4 @@ Insert hline if column names in output have been requested."
 
 
 (provide 'ob-R)
 (provide 'ob-R)
 
 
-
-
 ;;; ob-R.el ends here
 ;;; ob-R.el ends here

+ 1 - 0
lisp/ob-abc.el

@@ -86,4 +86,5 @@
   (error "ABC does not support sessions"))
   (error "ABC does not support sessions"))
 
 
 (provide 'ob-abc)
 (provide 'ob-abc)
+
 ;;; ob-abc.el ends here
 ;;; ob-abc.el ends here

+ 0 - 2
lisp/ob-asymptote.el

@@ -134,6 +134,4 @@ Otherwise, it is either `real', if some elements are floats, or
 
 
 (provide 'ob-asymptote)
 (provide 'ob-asymptote)
 
 
-
-
 ;;; ob-asymptote.el ends here
 ;;; ob-asymptote.el ends here

+ 0 - 2
lisp/ob-awk.el

@@ -106,6 +106,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-awk)
 (provide 'ob-awk)
 
 
-
-
 ;;; ob-awk.el ends here
 ;;; ob-awk.el ends here

+ 0 - 2
lisp/ob-calc.el

@@ -105,6 +105,4 @@
 
 
 (provide 'ob-calc)
 (provide 'ob-calc)
 
 
-
-
 ;;; ob-calc.el ends here
 ;;; ob-calc.el ends here

+ 0 - 2
lisp/ob-comint.el

@@ -151,6 +151,4 @@ FILE exists at end of evaluation."
 
 
 (provide 'ob-comint)
 (provide 'ob-comint)
 
 
-
-
 ;;; ob-comint.el ends here
 ;;; ob-comint.el ends here

+ 2 - 0
lisp/ob-coq.el

@@ -76,3 +76,5 @@ create one.  Return the initialized session."
   (get-buffer org-babel-coq-buffer))
   (get-buffer org-babel-coq-buffer))
 
 
 (provide 'ob-coq)
 (provide 'ob-coq)
+
+;;; ob-coq.el ends here

+ 2 - 1
lisp/ob-core.el

@@ -1655,7 +1655,8 @@ Note: this function removes any hlines in TABLE."
       (mapcar (lambda (row)
       (mapcar (lambda (row)
                 (if (listp row)
                 (if (listp row)
                     (cons (or (pop rownames) "") row)
                     (cons (or (pop rownames) "") row)
-                  row)) table)
+                  row))
+	      table)
     table))
     table))
 
 
 (defun org-babel-pick-name (names selector)
 (defun org-babel-pick-name (names selector)

+ 0 - 2
lisp/ob-css.el

@@ -43,6 +43,4 @@ CSS does not support sessions."
 
 
 (provide 'ob-css)
 (provide 'ob-css)
 
 
-
-
 ;;; ob-css.el ends here
 ;;; ob-css.el ends here

+ 0 - 2
lisp/ob-ditaa.el

@@ -119,6 +119,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-ditaa)
 (provide 'ob-ditaa)
 
 
-
-
 ;;; ob-ditaa.el ends here
 ;;; ob-ditaa.el ends here

+ 0 - 2
lisp/ob-dot.el

@@ -87,6 +87,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-dot)
 (provide 'ob-dot)
 
 
-
-
 ;;; ob-dot.el ends here
 ;;; ob-dot.el ends here

+ 13 - 12
lisp/ob-ebnf.el

@@ -23,18 +23,18 @@
 
 
 ;;; Commentary:
 ;;; Commentary:
 
 
-;;; Org-Babel support for using ebnf2ps to generate encapsulated postscript
-;;; railroad diagrams. It recognizes these arguments:
-;;;
-;;;     :file is required; it must include the extension '.eps.' All the rules
-;;;           in the block will be drawn in the same file. This is done by
-;;;           inserting a '[<file>' comment at the start of the block (see the
-;;;           documentation for ebnf-eps-buffer for more information).
-;;;
-;;;     :style specifies a value in ebnf-style-database. This provides the
-;;;            ability to customize the output. The style can also specify the
-;;;            grammar syntax (by setting ebnf-syntax); note that only ebnf,
-;;;            iso-ebnf, and yacc are supported by this file.
+;; Org-Babel support for using ebnf2ps to generate encapsulated postscript
+;; railroad diagrams. It recognizes these arguments:
+;;
+;;     :file is required; it must include the extension '.eps.' All the rules
+;;           in the block will be drawn in the same file. This is done by
+;;           inserting a '[<file>' comment at the start of the block (see the
+;;           documentation for ebnf-eps-buffer for more information).
+;;
+;;     :style specifies a value in ebnf-style-database. This provides the
+;;            ability to customize the output. The style can also specify the
+;;            grammar syntax (by setting ebnf-syntax); note that only ebnf,
+;;            iso-ebnf, and yacc are supported by this file.
 
 
 ;;; Requirements:
 ;;; Requirements:
 
 
@@ -77,4 +77,5 @@ This function is called by `org-babel-execute-src-block'."
       result)))
       result)))
 
 
 (provide 'ob-ebnf)
 (provide 'ob-ebnf)
+
 ;;; ob-ebnf.el ends here
 ;;; ob-ebnf.el ends here

+ 0 - 2
lisp/ob-emacs-lisp.el

@@ -108,6 +108,4 @@ corresponding :lexical source block argument."
 
 
 (provide 'ob-emacs-lisp)
 (provide 'ob-emacs-lisp)
 
 
-
-
 ;;; ob-emacs-lisp.el ends here
 ;;; ob-emacs-lisp.el ends here

+ 0 - 2
lisp/ob-eval.el

@@ -144,6 +144,4 @@ This buffer is named by `org-babel-error-buffer-name'."
 
 
 (provide 'ob-eval)
 (provide 'ob-eval)
 
 
-
-
 ;;; ob-eval.el ends here
 ;;; ob-eval.el ends here

+ 0 - 1
lisp/ob-exp.el

@@ -406,7 +406,6 @@ inhibit insertion of results into the buffer."
 	     (let (org-confirm-babel-evaluate)
 	     (let (org-confirm-babel-evaluate)
 	       (org-babel-execute-src-block nil info)))))))))
 	       (org-babel-execute-src-block nil info)))))))))
 
 
-
 (provide 'ob-exp)
 (provide 'ob-exp)
 
 
 ;;; ob-exp.el ends here
 ;;; ob-exp.el ends here

+ 2 - 1
lisp/ob-forth.el

@@ -76,7 +76,8 @@ This function is called by `org-babel-execute-src-block'."
 		    ;; Report errors.
 		    ;; Report errors.
 		    (org-babel-eval-error-notify 1
 		    (org-babel-eval-error-notify 1
 		     (buffer-substring
 		     (buffer-substring
-		      (+ (match-beginning 0) 1) (point-max))) nil))))
+		      (+ (match-beginning 0) 1) (point-max)))
+		    nil))))
 	      (split-string (org-trim
 	      (split-string (org-trim
 			     (org-babel-expand-body:generic body params))
 			     (org-babel-expand-body:generic body params))
 			    "\n"
 			    "\n"

+ 2 - 1
lisp/ob-fortran.el

@@ -101,7 +101,8 @@ its header arguments."
 		     (concat
 		     (concat
 		      ;; variables
 		      ;; variables
 		      (mapconcat 'org-babel-fortran-var-to-fortran vars "\n")
 		      (mapconcat 'org-babel-fortran-var-to-fortran vars "\n")
-		      body) params)
+		      body)
+		     params)
 		  body) "\n") "\n")))
 		  body) "\n") "\n")))
 
 
 (defun org-babel-fortran-ensure-main-wrap (body params)
 (defun org-babel-fortran-ensure-main-wrap (body params)

+ 0 - 2
lisp/ob-gnuplot.el

@@ -278,6 +278,4 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 
 
 (provide 'ob-gnuplot)
 (provide 'ob-gnuplot)
 
 
-
-
 ;;; ob-gnuplot.el ends here
 ;;; ob-gnuplot.el ends here

+ 0 - 4
lisp/ob-groovy.el

@@ -65,7 +65,6 @@ This function is called by `org-babel-execute-src-block'."
       (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
       (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
 
 
 (defvar org-babel-groovy-wrapper-method
 (defvar org-babel-groovy-wrapper-method
-
   "class Runner extends Script {
   "class Runner extends Script {
     def out = new PrintWriter(new ByteArrayOutputStream())
     def out = new PrintWriter(new ByteArrayOutputStream())
     def run() { %s }
     def run() { %s }
@@ -74,7 +73,6 @@ This function is called by `org-babel-execute-src-block'."
 println(new Runner().run())
 println(new Runner().run())
 ")
 ")
 
 
-
 (defun org-babel-groovy-evaluate
 (defun org-babel-groovy-evaluate
     (session body &optional result-type result-params)
     (session body &optional result-type result-params)
   "Evaluate BODY in external Groovy process.
   "Evaluate BODY in external Groovy process.
@@ -111,6 +109,4 @@ supported in Groovy."
 
 
 (provide 'ob-groovy)
 (provide 'ob-groovy)
 
 
-
-
 ;;; ob-groovy.el ends here
 ;;; ob-groovy.el ends here

+ 3 - 7
lisp/ob-haskell.el

@@ -32,11 +32,9 @@
 
 
 ;;; Requirements:
 ;;; Requirements:
 
 
-;; - haskell-mode :: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
-;;
-;; - inf-haskell :: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
-;;
-;; - (optionally) lhs2tex :: http://people.cs.uu.nl/andres/lhs2tex/
+;; - haskell-mode: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
+;; - inf-haskell: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
+;; - (optionally) lhs2tex: http://people.cs.uu.nl/andres/lhs2tex/
 
 
 ;;; Code:
 ;;; Code:
 (require 'ob)
 (require 'ob)
@@ -215,6 +213,4 @@ constructs (header arguments, no-web syntax etc...) are ignored."
 
 
 (provide 'ob-haskell)
 (provide 'ob-haskell)
 
 
-
-
 ;;; ob-haskell.el ends here
 ;;; ob-haskell.el ends here

+ 2 - 3
lisp/ob-hledger.el

@@ -30,6 +30,8 @@
 ;; probably ~/.hledger.journal (it may not notice your $LEDGER_FILE env var).
 ;; probably ~/.hledger.journal (it may not notice your $LEDGER_FILE env var).
 ;; So make ~/.hledger.journal a symbolic link to the real file if necessary.
 ;; So make ~/.hledger.journal a symbolic link to the real file if necessary.
 
 
+;; TODO Unit tests are more than welcome, too.
+
 ;;; Code:
 ;;; Code:
 (require 'ob)
 (require 'ob)
 
 
@@ -64,7 +66,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-hledger)
 (provide 'ob-hledger)
 
 
-
-
 ;;; ob-hledger.el ends here
 ;;; ob-hledger.el ends here
-;; TODO Unit tests are more than welcome, too.

+ 0 - 3
lisp/ob-io.el

@@ -90,7 +90,6 @@ in BODY as elisp."
 		  raw
 		  raw
 		  (org-babel-script-escape raw)))))))
 		  (org-babel-script-escape raw)))))))
 
 
-
 (defun org-babel-prep-session:io (_session _params)
 (defun org-babel-prep-session:io (_session _params)
   "Prepare SESSION according to the header arguments specified in PARAMS."
   "Prepare SESSION according to the header arguments specified in PARAMS."
   (error "Sessions are not (yet) supported for Io"))
   (error "Sessions are not (yet) supported for Io"))
@@ -103,6 +102,4 @@ supported in Io."
 
 
 (provide 'ob-io)
 (provide 'ob-io)
 
 
-
-
 ;;; ob-io.el ends here
 ;;; ob-io.el ends here

+ 0 - 2
lisp/ob-java.el

@@ -81,6 +81,4 @@ parameters may be used, like javac -verbose"
 
 
 (provide 'ob-java)
 (provide 'ob-java)
 
 
-
-
 ;;; ob-java.el ends here
 ;;; ob-java.el ends here

+ 0 - 2
lisp/ob-js.el

@@ -201,6 +201,4 @@ then create.  Return the initialized session."
 
 
 (provide 'ob-js)
 (provide 'ob-js)
 
 
-
-
 ;;; ob-js.el ends here
 ;;; ob-js.el ends here

+ 3 - 2
lisp/ob-latex.el

@@ -84,7 +84,8 @@
                  (regexp-quote (format "%S" (car pair)))
                  (regexp-quote (format "%S" (car pair)))
                  (if (stringp (cdr pair))
                  (if (stringp (cdr pair))
                      (cdr pair) (format "%S" (cdr pair)))
                      (cdr pair) (format "%S" (cdr pair)))
-                 body))) (org-babel--get-vars params))
+                 body)))
+	(org-babel--get-vars params))
   (org-trim body))
   (org-trim body))
 
 
 (defun org-babel-execute:latex (body params)
 (defun org-babel-execute:latex (body params)
@@ -221,6 +222,6 @@ This function is called by `org-babel-execute-src-block'."
   "Return an error because LaTeX doesn't support sessions."
   "Return an error because LaTeX doesn't support sessions."
   (error "LaTeX does not support sessions"))
   (error "LaTeX does not support sessions"))
 
 
-
 (provide 'ob-latex)
 (provide 'ob-latex)
+
 ;;; ob-latex.el ends here
 ;;; ob-latex.el ends here

+ 0 - 2
lisp/ob-ledger.el

@@ -65,6 +65,4 @@ called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-ledger)
 (provide 'ob-ledger)
 
 
-
-
 ;;; ob-ledger.el ends here
 ;;; ob-ledger.el ends here

+ 0 - 2
lisp/ob-lisp.el

@@ -122,6 +122,4 @@ a property list containing the parameters of the block."
 
 
 (provide 'ob-lisp)
 (provide 'ob-lisp)
 
 
-
-
 ;;; ob-lisp.el ends here
 ;;; ob-lisp.el ends here

+ 2 - 3
lisp/ob-lua.el

@@ -107,7 +107,8 @@ VARS contains resolved variable references."
     (org-babel-comint-in-buffer session
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input)
               (end-of-line 1) (insert var) (comint-send-input)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
     session))
 
 
 (defun org-babel-load-session:lua (session body params)
 (defun org-babel-load-session:lua (session body params)
@@ -397,6 +398,4 @@ fd:close()"
 
 
 (provide 'ob-lua)
 (provide 'ob-lua)
 
 
-
-
 ;;; ob-lua.el ends here
 ;;; ob-lua.el ends here

+ 0 - 2
lisp/ob-makefile.el

@@ -43,6 +43,4 @@ does not support sessions."
 
 
 (provide 'ob-makefile)
 (provide 'ob-makefile)
 
 
-
-
 ;;; ob-makefile.el ends here
 ;;; ob-makefile.el ends here

+ 0 - 2
lisp/ob-matlab.el

@@ -42,6 +42,4 @@
 
 
 (provide 'ob-matlab)
 (provide 'ob-matlab)
 
 
-
-
 ;;; ob-matlab.el ends here
 ;;; ob-matlab.el ends here

+ 0 - 5
lisp/ob-maxima.el

@@ -27,9 +27,7 @@
 ;; Org-Babel support for evaluating maxima entries.
 ;; Org-Babel support for evaluating maxima entries.
 ;;
 ;;
 ;; This differs from most standard languages in that
 ;; This differs from most standard languages in that
-;;
 ;; 1) there is no such thing as a "session" in maxima
 ;; 1) there is no such thing as a "session" in maxima
-;;
 ;; 2) we are adding the "cmdline" header argument
 ;; 2) we are adding the "cmdline" header argument
 
 
 ;;; Code:
 ;;; Code:
@@ -125,9 +123,6 @@ of the same value."
       (concat "[" (mapconcat #'org-babel-maxima-elisp-to-maxima val ", ") "]")
       (concat "[" (mapconcat #'org-babel-maxima-elisp-to-maxima val ", ") "]")
     (format "%s" val)))
     (format "%s" val)))
 
 
-
 (provide 'ob-maxima)
 (provide 'ob-maxima)
 
 
-
-
 ;;; ob-maxima.el ends here
 ;;; ob-maxima.el ends here

+ 1 - 4
lisp/ob-mscgen.el

@@ -68,8 +68,7 @@ mscgen supported formats."
   (let* ((out-file (or (cdr (assq :file params)) "output.png" ))
   (let* ((out-file (or (cdr (assq :file params)) "output.png" ))
          (filetype (or (cdr (assq :filetype params)) "png" )))
          (filetype (or (cdr (assq :filetype params)) "png" )))
     (unless (cdr (assq :file params))
     (unless (cdr (assq :file params))
-      (error "
-ERROR: no output file specified.  Add \":file name.png\" to the src header"))
+      (error "ERROR: no output file specified.  Add \":file name.png\" to the src header"))
     (org-babel-eval (concat "mscgen -T " filetype " -o " out-file) body)
     (org-babel-eval (concat "mscgen -T " filetype " -o " out-file) body)
     nil)) ;; signal that output has already been written to file
     nil)) ;; signal that output has already been written to file
 
 
@@ -79,6 +78,4 @@ ERROR: no output file specified.  Add \":file name.png\" to the src header"))
 
 
 (provide 'ob-mscgen)
 (provide 'ob-mscgen)
 
 
-
-
 ;;; ob-msc.el ends here
 ;;; ob-msc.el ends here

+ 0 - 2
lisp/ob-ocaml.el

@@ -166,6 +166,4 @@ Emacs-lisp table, otherwise return the results as a string."
 
 
 (provide 'ob-ocaml)
 (provide 'ob-ocaml)
 
 
-
-
 ;;; ob-ocaml.el ends here
 ;;; ob-ocaml.el ends here

+ 4 - 4
lisp/ob-octave.el

@@ -136,7 +136,8 @@ specifying a variable of the same value."
     (org-babel-comint-in-buffer session
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input nil t)
               (end-of-line 1) (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
     session))
 
 
 (defun org-babel-matlab-initiate-session (&optional session params)
 (defun org-babel-matlab-initiate-session (&optional session params)
@@ -230,7 +231,8 @@ value of the last statement in BODY, as elisp."
 			 org-babel-octave-eoe-indicator
 			 org-babel-octave-eoe-indicator
 		       org-babel-octave-eoe-output)
 		       org-babel-octave-eoe-output)
 		     t full-body)
 		     t full-body)
-		  (insert full-body) (comint-send-input nil t)))) results)
+		  (insert full-body) (comint-send-input nil t))))
+	 results)
     (pcase result-type
     (pcase result-type
       (`value
       (`value
        (org-babel-octave-import-elisp-from-file tmp-file))
        (org-babel-octave-import-elisp-from-file tmp-file))
@@ -259,6 +261,4 @@ This removes initial blank and comment lines and then calls
 
 
 (provide 'ob-octave)
 (provide 'ob-octave)
 
 
-
-
 ;;; ob-octave.el ends here
 ;;; ob-octave.el ends here

+ 0 - 2
lisp/ob-org.el

@@ -67,6 +67,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-org)
 (provide 'ob-org)
 
 
-
-
 ;;; ob-org.el ends here
 ;;; ob-org.el ends here

+ 0 - 2
lisp/ob-perl.el

@@ -152,6 +152,4 @@ return the value of the last statement in BODY, as elisp."
 
 
 (provide 'ob-perl)
 (provide 'ob-perl)
 
 
-
-
 ;;; ob-perl.el ends here
 ;;; ob-perl.el ends here

+ 0 - 2
lisp/ob-picolisp.el

@@ -182,6 +182,4 @@ then create.  Return the initialized session."
 
 
 (provide 'ob-picolisp)
 (provide 'ob-picolisp)
 
 
-
-
 ;;; ob-picolisp.el ends here
 ;;; ob-picolisp.el ends here

+ 0 - 2
lisp/ob-plantuml.el

@@ -127,6 +127,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-plantuml)
 (provide 'ob-plantuml)
 
 
-
-
 ;;; ob-plantuml.el ends here
 ;;; ob-plantuml.el ends here

+ 2 - 3
lisp/ob-python.el

@@ -104,7 +104,8 @@ VARS contains resolved variable references."
     (org-babel-comint-in-buffer session
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input)
               (end-of-line 1) (insert var) (comint-send-input)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
     session))
 
 
 (defun org-babel-load-session:python (session body params)
 (defun org-babel-load-session:python (session body params)
@@ -382,6 +383,4 @@ __org_babel_python_final))"
 
 
 (provide 'ob-python)
 (provide 'ob-python)
 
 
-
-
 ;;; ob-python.el ends here
 ;;; ob-python.el ends here

+ 2 - 2
lisp/ob-ref.el

@@ -143,7 +143,8 @@ Emacs Lisp representation of the value of the variable."
 				   (org-babel-ref-split-args new-referent))))
 				   (org-babel-ref-split-args new-referent))))
 	      (when (> (length new-header-args) 0)
 	      (when (> (length new-header-args) 0)
 		(setq args (append (org-babel-parse-header-arguments
 		(setq args (append (org-babel-parse-header-arguments
-				    new-header-args) args)))
+				    new-header-args)
+				   args)))
 	      (setq ref new-refere)))
 	      (setq ref new-refere)))
 	  (when (string-match "^\\(.+\\):\\(.+\\)$" ref)
 	  (when (string-match "^\\(.+\\):\\(.+\\)$" ref)
 	    (setq split-file (match-string 1 ref))
 	    (setq split-file (match-string 1 ref))
@@ -240,7 +241,6 @@ to \"0:-1\"."
   "Split ARG-STRING into top-level arguments of balanced parenthesis."
   "Split ARG-STRING into top-level arguments of balanced parenthesis."
   (mapcar #'org-trim (org-babel-balanced-split arg-string 44)))
   (mapcar #'org-trim (org-babel-balanced-split arg-string 44)))
 
 
-
 (provide 'ob-ref)
 (provide 'ob-ref)
 
 
 ;;; ob-ref.el ends here
 ;;; ob-ref.el ends here

+ 2 - 3
lisp/ob-ruby.el

@@ -103,7 +103,8 @@ This function is called by `org-babel-execute-src-block'."
       (mapc (lambda (var)
       (mapc (lambda (var)
               (insert var) (comint-send-input nil t)
               (insert var) (comint-send-input nil t)
               (org-babel-comint-wait-for-output session)
               (org-babel-comint-wait-for-output session)
-              (sit-for .1) (goto-char (point-max))) var-lines))
+              (sit-for .1) (goto-char (point-max)))
+	    var-lines))
     session))
     session))
 
 
 (defun org-babel-load-session:ruby (session body params)
 (defun org-babel-load-session:ruby (session body params)
@@ -263,6 +264,4 @@ return the value of the last statement in BODY, as elisp."
 
 
 (provide 'ob-ruby)
 (provide 'ob-ruby)
 
 
-
-
 ;;; ob-ruby.el ends here
 ;;; ob-ruby.el ends here

+ 0 - 2
lisp/ob-sass.el

@@ -65,6 +65,4 @@ This function is called by `org-babel-execute-src-block'."
 
 
 (provide 'ob-sass)
 (provide 'ob-sass)
 
 
-
-
 ;;; ob-sass.el ends here
 ;;; ob-sass.el ends here

+ 0 - 2
lisp/ob-screen.el

@@ -138,6 +138,4 @@ The terminal should shortly flicker."
 
 
 (provide 'ob-screen)
 (provide 'ob-screen)
 
 
-
-
 ;;; ob-screen.el ends here
 ;;; ob-screen.el ends here

+ 3 - 1
lisp/ob-sed.el

@@ -67,7 +67,8 @@ function is called by `org-babel-execute-src-block'."
          (in-file (cdr (assq :in-file params)))
          (in-file (cdr (assq :in-file params)))
 	 (code-file (let ((file (org-babel-temp-file "sed-")))
 	 (code-file (let ((file (org-babel-temp-file "sed-")))
                       (with-temp-file file
                       (with-temp-file file
-			(insert body)) file))
+			(insert body))
+		      file))
 	 (stdin (let ((stdin (cdr (assq :stdin params))))
 	 (stdin (let ((stdin (cdr (assq :stdin params))))
 		   (when stdin
 		   (when stdin
 		     (let ((tmp (org-babel-temp-file "sed-stdin-"))
 		     (let ((tmp (org-babel-temp-file "sed-stdin-"))
@@ -101,4 +102,5 @@ function is called by `org-babel-execute-src-block'."
       (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
       (cdr (assq :rowname-names params)) (cdr (assq :rownames params))))))
 
 
 (provide 'ob-sed)
 (provide 'ob-sed)
+
 ;;; ob-sed.el ends here
 ;;; ob-sed.el ends here

+ 2 - 3
lisp/ob-shell.el

@@ -96,7 +96,8 @@ This function is called by `org-babel-execute-src-block'."
     (org-babel-comint-in-buffer session
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
       (mapc (lambda (var)
               (insert var) (comint-send-input nil t)
               (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+	    var-lines))
     session))
     session))
 
 
 (defun org-babel-load-session:shell (session body params)
 (defun org-babel-load-session:shell (session body params)
@@ -277,6 +278,4 @@ return the value of the last statement in BODY."
 
 
 (provide 'ob-shell)
 (provide 'ob-shell)
 
 
-
-
 ;;; ob-shell.el ends here
 ;;; ob-shell.el ends here

+ 1 - 0
lisp/ob-shen.el

@@ -75,4 +75,5 @@ This function is called by `org-babel-execute-src-block'."
           (error results))))))
           (error results))))))
 
 
 (provide 'ob-shen)
 (provide 'ob-shen)
+
 ;;; ob-shen.el ends here
 ;;; ob-shen.el ends here

+ 0 - 2
lisp/ob-sql.el

@@ -373,6 +373,4 @@ SET COLSEP '|'
 
 
 (provide 'ob-sql)
 (provide 'ob-sql)
 
 
-
-
 ;;; ob-sql.el ends here
 ;;; ob-sql.el ends here

+ 2 - 3
lisp/ob-sqlite.el

@@ -137,7 +137,8 @@ This function is called by `org-babel-execute-src-block'."
     (mapcar (lambda (row)
     (mapcar (lambda (row)
 	      (if (eq 'hline row)
 	      (if (eq 'hline row)
 		  'hline
 		  'hline
-		(mapcar #'org-babel-string-read row))) result)))
+		(mapcar #'org-babel-string-read row)))
+	    result)))
 
 
 (defun org-babel-sqlite-offset-colnames (table headers-p)
 (defun org-babel-sqlite-offset-colnames (table headers-p)
   "If HEADERS-P is non-nil then offset the first row as column names."
   "If HEADERS-P is non-nil then offset the first row as column names."
@@ -152,6 +153,4 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 
 
 (provide 'ob-sqlite)
 (provide 'ob-sqlite)
 
 
-
-
 ;;; ob-sqlite.el ends here
 ;;; ob-sqlite.el ends here

+ 1 - 0
lisp/ob-stan.el

@@ -82,4 +82,5 @@ Otherwise, write the Stan code directly to the named file."
   (user-error "Stan does not support sessions"))
   (user-error "Stan does not support sessions"))
 
 
 (provide 'ob-stan)
 (provide 'ob-stan)
+
 ;;; ob-stan.el ends here
 ;;; ob-stan.el ends here

+ 2 - 3
lisp/ob-table.el

@@ -62,7 +62,8 @@ If STRING ends in a newline character, then remove the newline
 character and replace it with ellipses."
 character and replace it with ellipses."
   (if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string))
   (if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string))
       (concat (substring string 0 (match-beginning 0))
       (concat (substring string 0 (match-beginning 0))
-	      (when (match-string 1 string) "...")) string))
+	      (when (match-string 1 string) "..."))
+    string))
 
 
 (defmacro org-sbe (source-block &rest variables)
 (defmacro org-sbe (source-block &rest variables)
   "Return the results of calling SOURCE-BLOCK with VARIABLES.
   "Return the results of calling SOURCE-BLOCK with VARIABLES.
@@ -147,6 +148,4 @@ as shown in the example below.
 
 
 (provide 'ob-table)
 (provide 'ob-table)
 
 
-
-
 ;;; ob-table.el ends here
 ;;; ob-table.el ends here

+ 2 - 1
lisp/ob-tangle.el

@@ -544,7 +544,8 @@ which enable the original code blocks to be found."
 			    (save-match-data
 			    (save-match-data
 			      (re-search-forward
 			      (re-search-forward
 			       (concat " " (regexp-quote block-name)
 			       (concat " " (regexp-quote block-name)
-				       " ends here") nil t)
+				       " ends here")
+			       nil t)
 			      (setq end (line-beginning-position))))))))
 			      (setq end (line-beginning-position))))))))
 	(unless (and start (< start mid) (< mid end))
 	(unless (and start (< start mid) (< mid end))
 	  (error "Not in tangled code"))
 	  (error "Not in tangled code"))

+ 2 - 2
lisp/ol-bbdb.el

@@ -446,11 +446,11 @@ or far away in the future."
     (cond
     (cond
      ((= delta 0) " -- today\\&")
      ((= delta 0) " -- today\\&")
      ((= delta 1) " -- tomorrow\\&")
      ((= delta 1) " -- tomorrow\\&")
-     ((< delta org-bbdb-general-anniversary-description-after) (format " -- in %d days\\&" delta))
+     ((< delta org-bbdb-general-anniversary-description-after)
+      (format " -- in %d days\\&" delta))
      ((pcase-let ((`(,month ,day ,year) anniv-date))
      ((pcase-let ((`(,month ,day ,year) anniv-date))
 	(format " -- %d-%02d-%02d\\&" year month day))))))
 	(format " -- %d-%02d-%02d\\&" year month day))))))
 
 
-
 (defun org-bbdb-anniversaries-future (&optional n)
 (defun org-bbdb-anniversaries-future (&optional n)
   "Return list of anniversaries for today and the next n-1 days (default n=7)."
   "Return list of anniversaries for today and the next n-1 days (default n=7)."
   (let ((n (or n 7)))
   (let ((n (or n 7)))

+ 6 - 3
lisp/ol-bibtex.el

@@ -556,7 +556,8 @@ With optional argument OPTIONAL, also prompt for optional fields."
     ;; We construct a regexp that searches for "@entrytype{" followed by the key
     ;; We construct a regexp that searches for "@entrytype{" followed by the key
     (goto-char (point-min))
     (goto-char (point-min))
     (and (re-search-forward (concat "@[a-zA-Z]+[ \t\n]*{[ \t\n]*"
     (and (re-search-forward (concat "@[a-zA-Z]+[ \t\n]*{[ \t\n]*"
-				    (regexp-quote s) "[ \t\n]*,") nil t)
+				    (regexp-quote s) "[ \t\n]*,")
+			    nil t)
 	 (goto-char (match-beginning 0)))
 	 (goto-char (match-beginning 0)))
     (if (and (match-beginning 0) (equal current-prefix-arg '(16)))
     (if (and (match-beginning 0) (equal current-prefix-arg '(16)))
 	;; Use double prefix to indicate that any web link should be browsed
 	;; Use double prefix to indicate that any web link should be browsed
@@ -596,7 +597,8 @@ Headlines are exported using `org-bibtex-headline'."
              (with-temp-file filename
              (with-temp-file filename
                (insert (mapconcat #'identity bibtex-entries "\n")))
                (insert (mapconcat #'identity bibtex-entries "\n")))
              (message "Successfully exported %d BibTeX entries to %s"
              (message "Successfully exported %d BibTeX entries to %s"
-                      (length bibtex-entries) filename) nil))))
+                      (length bibtex-entries) filename)
+	     nil))))
     (when error-point
     (when error-point
       (goto-char error-point)
       (goto-char error-point)
       (message "Bibtex error at %S" (nth 4 (org-heading-components))))))
       (message "Bibtex error at %S" (nth 4 (org-heading-components))))))
@@ -661,7 +663,8 @@ This uses `bibtex-parse-entry'."
 	     (when (and (> (length str) 1)
 	     (when (and (> (length str) 1)
 			(= (aref str 0) (car pair))
 			(= (aref str 0) (car pair))
 			(= (aref str (1- (length str))) (cdr pair)))
 			(= (aref str (1- (length str))) (cdr pair)))
-	       (setf str (substring str 1 (1- (length str)))))) str)))
+	       (setf str (substring str 1 (1- (length str))))))
+	   str)))
     (push (mapcar
     (push (mapcar
            (lambda (pair)
            (lambda (pair)
              (cons (let ((field (funcall keyword (car pair))))
              (cons (let ((field (funcall keyword (car pair))))

+ 0 - 1
lisp/ol-docview.el

@@ -98,7 +98,6 @@ and append it."
 	  "::"
 	  "::"
 	  (read-from-minibuffer "Page:" "1")))
 	  (read-from-minibuffer "Page:" "1")))
 
 
-
 (provide 'ol-docview)
 (provide 'ol-docview)
 
 
 ;;; ol-docview.el ends here
 ;;; ol-docview.el ends here

+ 2 - 2
lisp/ol.el

@@ -920,7 +920,8 @@ Abbreviations are defined in `org-link-abbrev-alist'."
 	 ((string-match "%(\\([^)]+\\))" rpl)
 	 ((string-match "%(\\([^)]+\\))" rpl)
 	  (replace-match
 	  (replace-match
 	   (save-match-data
 	   (save-match-data
-	     (funcall (intern-soft (match-string 1 rpl)) tag)) t t rpl))
+	     (funcall (intern-soft (match-string 1 rpl)) tag))
+	   t t rpl))
 	 ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
 	 ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
 	 ((string-match "%h" rpl)
 	 ((string-match "%h" rpl)
 	  (replace-match (url-hexify-string (or tag "")) t t rpl))
 	  (replace-match (url-hexify-string (or tag "")) t t rpl))
@@ -1902,7 +1903,6 @@ Also refresh fontification if needed."
 
 
 (org-link-make-regexps)
 (org-link-make-regexps)
 
 
-
 (provide 'ol)
 (provide 'ol)
 
 
 ;;; ol.el ends here
 ;;; ol.el ends here

+ 22 - 11
lisp/org-agenda.el

@@ -5301,7 +5301,8 @@ function from a program - use `org-agenda-get-day-entries' instead."
     (when results
     (when results
       (setq results
       (setq results
 	    (mapcar (lambda (i) (replace-regexp-in-string
 	    (mapcar (lambda (i) (replace-regexp-in-string
-				 org-link-bracket-re "\\2" i)) results))
+				 org-link-bracket-re "\\2" i))
+		    results))
       (concat (org-agenda-finalize-entries results) "\n"))))
       (concat (org-agenda-finalize-entries results) "\n"))))
 
 
 ;;; Agenda entry finders
 ;;; Agenda entry finders
@@ -5520,10 +5521,12 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 	       (cond
 	       (cond
 		((eq org-agenda-todo-ignore-scheduled 'future)
 		((eq org-agenda-todo-ignore-scheduled 'future)
 		 (> (org-time-stamp-to-now
 		 (> (org-time-stamp-to-now
-		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		    0))
 		((eq org-agenda-todo-ignore-scheduled 'past)
 		((eq org-agenda-todo-ignore-scheduled 'past)
 		 (<= (org-time-stamp-to-now
 		 (<= (org-time-stamp-to-now
-		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		     0))
 		((numberp org-agenda-todo-ignore-scheduled)
 		((numberp org-agenda-todo-ignore-scheduled)
 		 (org-agenda-todo-custom-ignore-p
 		 (org-agenda-todo-custom-ignore-p
 		  (match-string 1) org-agenda-todo-ignore-scheduled))
 		  (match-string 1) org-agenda-todo-ignore-scheduled))
@@ -5536,10 +5539,12 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 		 (not (org-deadline-close-p (match-string 1))))
 		 (not (org-deadline-close-p (match-string 1))))
 		((eq org-agenda-todo-ignore-deadlines 'future)
 		((eq org-agenda-todo-ignore-deadlines 'future)
 		 (> (org-time-stamp-to-now
 		 (> (org-time-stamp-to-now
-		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		     (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		    0))
 		((eq org-agenda-todo-ignore-deadlines 'past)
 		((eq org-agenda-todo-ignore-deadlines 'past)
 		 (<= (org-time-stamp-to-now
 		 (<= (org-time-stamp-to-now
-		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+		      (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+		     0))
 		((numberp org-agenda-todo-ignore-deadlines)
 		((numberp org-agenda-todo-ignore-deadlines)
 		 (org-agenda-todo-custom-ignore-p
 		 (org-agenda-todo-custom-ignore-p
 		  (match-string 1) org-agenda-todo-ignore-deadlines))
 		  (match-string 1) org-agenda-todo-ignore-deadlines))
@@ -5563,10 +5568,12 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 		     (cond
 		     (cond
 		      ((eq org-agenda-todo-ignore-timestamp 'future)
 		      ((eq org-agenda-todo-ignore-timestamp 'future)
 		       (> (org-time-stamp-to-now
 		       (> (org-time-stamp-to-now
-			   (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+			   (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+			  0))
 		      ((eq org-agenda-todo-ignore-timestamp 'past)
 		      ((eq org-agenda-todo-ignore-timestamp 'past)
 		       (<= (org-time-stamp-to-now
 		       (<= (org-time-stamp-to-now
-			    (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds) 0))
+			    (match-string 1) org-agenda-todo-ignore-time-comparison-use-seconds)
+			   0))
 		      ((numberp org-agenda-todo-ignore-timestamp)
 		      ((numberp org-agenda-todo-ignore-timestamp)
 		       (org-agenda-todo-custom-ignore-p
 		       (org-agenda-todo-custom-ignore-p
 			(match-string 1) org-agenda-todo-ignore-timestamp))
 			(match-string 1) org-agenda-todo-ignore-timestamp))
@@ -7045,7 +7052,8 @@ The optional argument TYPE tells the agenda type."
 		   ;; that isn't there.
 		   ;; that isn't there.
 		   pl
 		   pl
 		   (equal (string-match (concat "\\(\\.*\\)" re "\\( +\\)")
 		   (equal (string-match (concat "\\(\\.*\\)" re "\\( +\\)")
-					x pl) pl))
+					x pl)
+			  pl))
 	  (add-text-properties
 	  (add-text-properties
 	   (or (match-end 1) (match-end 0)) (match-end 0)
 	   (or (match-end 1) (match-end 0)) (match-end 0)
 	   (list 'face (org-get-todo-face (match-string 2 x)))
 	   (list 'face (org-get-todo-face (match-string 2 x)))
@@ -7122,12 +7130,14 @@ The optional argument TYPE tells the agenda type."
 	 (case-fold-search nil))
 	 (case-fold-search nil))
     (when pla
     (when pla
       (when (string-match (concat "\\`[ \t]*" (or (get-text-property 0 'org-todo-regexp a) "")
       (when (string-match (concat "\\`[ \t]*" (or (get-text-property 0 'org-todo-regexp a) "")
-				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") ta)
+				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *")
+			  ta)
 	(setq ta (substring ta (match-end 0))))
 	(setq ta (substring ta (match-end 0))))
       (setq ta (downcase ta)))
       (setq ta (downcase ta)))
     (when plb
     (when plb
       (when (string-match (concat "\\`[ \t]*" (or (get-text-property 0 'org-todo-regexp b) "")
       (when (string-match (concat "\\`[ \t]*" (or (get-text-property 0 'org-todo-regexp b) "")
-				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") tb)
+				  "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *")
+			  tb)
 	(setq tb (substring tb (match-end 0))))
 	(setq tb (substring tb (match-end 0))))
       (setq tb (downcase tb)))
       (setq tb (downcase tb)))
     (cond ((not (or ta tb)) nil)
     (cond ((not (or ta tb)) nil)
@@ -7547,7 +7557,8 @@ When there is already a category filter in place, this command removes the filte
        (cat
        (cat
         (org-agenda-filter-apply
         (org-agenda-filter-apply
          (setq org-agenda-category-filter
          (setq org-agenda-category-filter
-	       (list (concat "+" cat))) 'category))
+	       (list (concat "+" cat)))
+	 'category))
        (t (error "No category at point"))))))
        (t (error "No category at point"))))))
 
 
 (defun org-find-top-headline (&optional pos)
 (defun org-find-top-headline (&optional pos)

+ 6 - 3
lisp/org-clock.el

@@ -722,7 +722,8 @@ If not, show simply the clocked time like 01:50."
   (save-excursion
   (save-excursion
     (let ((end (save-excursion (org-end-of-subtree))))
     (let ((end (save-excursion (org-end-of-subtree))))
       (when (re-search-forward (concat org-clock-string
       (when (re-search-forward (concat org-clock-string
-				       ".*\\]--\\(\\[[^]]+\\]\\)") end t)
+				       ".*\\]--\\(\\[[^]]+\\]\\)")
+			       end t)
 	(org-time-string-to-time (match-string 1))))))
 	(org-time-string-to-time (match-string 1))))))
 
 
 (defun org-clock-update-mode-line (&optional refresh)
 (defun org-clock-update-mode-line (&optional refresh)
@@ -749,7 +750,8 @@ menu\nmouse-2 will jump to task"))
       (setq org-mode-line-string
       (setq org-mode-line-string
 	    (concat (propertize
 	    (concat (propertize
 		     org-clock-task-overrun-text
 		     org-clock-task-overrun-text
-		     'face 'org-mode-line-clock-overrun) org-mode-line-string)))
+		     'face 'org-mode-line-clock-overrun)
+		    org-mode-line-string)))
   (force-mode-line-update))
   (force-mode-line-update))
 
 
 (defun org-clock-get-clocked-time ()
 (defun org-clock-get-clocked-time ()
@@ -894,7 +896,8 @@ If CLOCK-SOUND is non-nil, it overrides `org-clock-sound'."
 	(goto-char (point-min))
 	(goto-char (point-min))
 	(while (re-search-forward org-clock-re nil t)
 	(while (re-search-forward org-clock-re nil t)
 	  (push (cons (copy-marker (match-end 1) t)
 	  (push (cons (copy-marker (match-end 1) t)
-		      (org-time-string-to-time (match-string 1))) clocks))))
+		      (org-time-string-to-time (match-string 1)))
+		clocks))))
     clocks))
     clocks))
 
 
 (defsubst org-is-active-clock (clock)
 (defsubst org-is-active-clock (clock)

+ 1 - 0
lisp/org-duration.el

@@ -448,4 +448,5 @@ with \"H:MM:SS\" format, return `h:mm:ss'.  Otherwise, return
 (org-duration-set-regexps)
 (org-duration-set-regexps)
 
 
 (provide 'org-duration)
 (provide 'org-duration)
+
 ;;; org-duration.el ends here
 ;;; org-duration.el ends here

+ 1 - 1
lisp/org-keys.el

@@ -925,6 +925,6 @@ a-list placed behind the generic `org-babel-key-prefix'.")
   (interactive)
   (interactive)
   (describe-bindings org-babel-key-prefix))
   (describe-bindings org-babel-key-prefix))
 
 
-
 (provide 'org-keys)
 (provide 'org-keys)
+
 ;;; org-keys.el ends here
 ;;; org-keys.el ends here

+ 1 - 1
lisp/org-lint.el

@@ -1257,6 +1257,6 @@ ARG can also be a list of checker names, as symbols, to run."
       (org-lint--display-reports (current-buffer) checkers)
       (org-lint--display-reports (current-buffer) checkers)
       (message "Org linting process completed"))))
       (message "Org linting process completed"))))
 
 
-
 (provide 'org-lint)
 (provide 'org-lint)
+
 ;;; org-lint.el ends here
 ;;; org-lint.el ends here

+ 1 - 1
lisp/org-macro.el

@@ -417,6 +417,6 @@ Any other non-empty string resets the counter to 1."
                    (t 1))
                    (t 1))
              org-macro--counter-table)))
              org-macro--counter-table)))
 
 
-
 (provide 'org-macro)
 (provide 'org-macro)
+
 ;;; org-macro.el ends here
 ;;; org-macro.el ends here

+ 4 - 2
lisp/org-mouse.el

@@ -495,7 +495,8 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
      ["Check Deadlines"
      ["Check Deadlines"
       (if (functionp 'org-check-deadlines-and-todos)
       (if (functionp 'org-check-deadlines-and-todos)
 	  (org-check-deadlines-and-todos org-deadline-warning-days)
 	  (org-check-deadlines-and-todos org-deadline-warning-days)
-	(org-check-deadlines org-deadline-warning-days)) t]
+	(org-check-deadlines org-deadline-warning-days))
+      t]
      ["Check TODOs" org-show-todo-tree t]
      ["Check TODOs" org-show-todo-tree t]
      ("Check Tags"
      ("Check Tags"
       ,@(org-mouse-keyword-menu
       ,@(org-mouse-keyword-menu
@@ -741,7 +742,8 @@ This means, between the beginning of line and the point."
 			       (?$ "($) Formula Parameters")
 			       (?$ "($) Formula Parameters")
 			       (?# "(#) Recalculation: Auto")
 			       (?# "(#) Recalculation: Auto")
 			       (?* "(*) Recalculation: Manual")
 			       (?* "(*) Recalculation: Manual")
-			       (?' "(') Recalculation: None"))) t))))
+			       (?' "(') Recalculation: None")))
+			   t))))
      ((assq :table contextlist)
      ((assq :table contextlist)
       (popup-menu
       (popup-menu
        '(nil
        '(nil

+ 1 - 1
lisp/org-num.el

@@ -466,6 +466,6 @@ NUMBERING is a list of numbers."
     (remove-hook 'after-change-functions #'org-num--verify t)
     (remove-hook 'after-change-functions #'org-num--verify t)
     (remove-hook 'change-major-mode-hook #'org-num--clear t))))
     (remove-hook 'change-major-mode-hook #'org-num--clear t))))
 
 
-
 (provide 'org-num)
 (provide 'org-num)
+
 ;;; org-num.el ends here
 ;;; org-num.el ends here

+ 2 - 1
lisp/org-plot.el

@@ -144,7 +144,8 @@ and dependent variables."
 	 row-vals)
 	 row-vals)
     (when (>= ind 0) ;; collect values of ind col
     (when (>= ind 0) ;; collect values of ind col
       (setf row-vals (mapcar (lambda (row) (setf counter (+ 1 counter))
       (setf row-vals (mapcar (lambda (row) (setf counter (+ 1 counter))
-			       (cons counter (nth ind row))) table)))
+			       (cons counter (nth ind row)))
+			     table)))
     (when (or deps (>= ind 0)) ;; remove non-plotting columns
     (when (or deps (>= ind 0)) ;; remove non-plotting columns
       (setf deps (delq ind deps))
       (setf deps (delq ind deps))
       (setf table (mapcar (lambda (row)
       (setf table (mapcar (lambda (row)

+ 1 - 0
lisp/org-refile.el

@@ -879,4 +879,5 @@ this function appends the default value from
 	   args)))
 	   args)))
 
 
 (provide 'org-refile)
 (provide 'org-refile)
+
 ;;; org-refile.el ends here
 ;;; org-refile.el ends here

+ 4 - 2
lisp/org-table.el

@@ -2608,7 +2608,8 @@ location of point."
 		  ev (if (numberp ev) (number-to-string ev) ev)
 		  ev (if (numberp ev) (number-to-string ev) ev)
 		  ev (if duration (org-table-time-seconds-to-string
 		  ev (if duration (org-table-time-seconds-to-string
 				   (string-to-number ev)
 				   (string-to-number ev)
-				   duration-output-format) ev))
+				   duration-output-format)
+		       ev))
 
 
 	  ;; Use <...> time-stamps so that Calc can handle them.
 	  ;; Use <...> time-stamps so that Calc can handle them.
 	  (setq form
 	  (setq form
@@ -4304,7 +4305,8 @@ extension of the given file name, and finally on the variable
 				     (and (string-match-p fileext f) f))
 				     (and (string-match-p fileext f) f))
 				   formats)))
 				   formats)))
 		       org-table-export-default-format)
 		       org-table-export-default-format)
-		   t t) t t)))
+		   t t)
+		  t t)))
 	  (setq format
 	  (setq format
 		(org-completing-read
 		(org-completing-read
 		 "Format: " formats nil nil deffmt-readable))))
 		 "Format: " formats nil nil deffmt-readable))))

+ 14 - 7
lisp/org.el

@@ -18256,7 +18256,8 @@ and :keyword."
       (when (memq 'org-formula faces)
       (when (memq 'org-formula faces)
 	(push (list :table-special
 	(push (list :table-special
 		    (previous-single-property-change p 'face)
 		    (previous-single-property-change p 'face)
-		    (next-single-property-change p 'face)) clist)))
+		    (next-single-property-change p 'face))
+	      clist)))
      ((org-at-table-p 'any)
      ((org-at-table-p 'any)
       (push (list :table-table) clist)))
       (push (list :table-table) clist)))
     (goto-char p)
     (goto-char p)
@@ -18269,14 +18270,16 @@ and :keyword."
 				  (re-search-backward "[ \t]*\\(#+BEGIN: clocktable\\)" nil t))
 				  (re-search-backward "[ \t]*\\(#+BEGIN: clocktable\\)" nil t))
 			      (match-beginning 1))
 			      (match-beginning 1))
 			 (and (re-search-forward "[ \t]*#\\+END:?" nil t)
 			 (and (re-search-forward "[ \t]*#\\+END:?" nil t)
-			      (match-end 0))) clist))
+			      (match-end 0)))
+		   clist))
 	    ((org-in-src-block-p)
 	    ((org-in-src-block-p)
 	     (push (list :src-block
 	     (push (list :src-block
 			 (and (or (looking-at "[ \t]*\\(#\\+BEGIN_SRC\\)")
 			 (and (or (looking-at "[ \t]*\\(#\\+BEGIN_SRC\\)")
 				  (re-search-backward "[ \t]*\\(#+BEGIN_SRC\\)" nil t))
 				  (re-search-backward "[ \t]*\\(#+BEGIN_SRC\\)" nil t))
 			      (match-beginning 1))
 			      (match-beginning 1))
 			 (and (search-forward "#+END_SRC" nil t)
 			 (and (search-forward "#+END_SRC" nil t)
-			      (match-beginning 0))) clist))))
+			      (match-beginning 0)))
+		   clist))))
     (goto-char p)
     (goto-char p)
 
 
     ;; Now the small context
     ;; Now the small context
@@ -18286,20 +18289,24 @@ and :keyword."
      ((memq 'org-link faces)
      ((memq 'org-link faces)
       (push (list :link
       (push (list :link
 		  (previous-single-property-change p 'face)
 		  (previous-single-property-change p 'face)
-		  (next-single-property-change p 'face)) clist))
+		  (next-single-property-change p 'face))
+	    clist))
      ((memq 'org-special-keyword faces)
      ((memq 'org-special-keyword faces)
       (push (list :keyword
       (push (list :keyword
 		  (previous-single-property-change p 'face)
 		  (previous-single-property-change p 'face)
-		  (next-single-property-change p 'face)) clist))
+		  (next-single-property-change p 'face))
+	    clist))
      ((setq o (cl-some
      ((setq o (cl-some
 	       (lambda (o)
 	       (lambda (o)
 		 (and (eq (overlay-get o 'org-overlay-type) 'org-latex-overlay)
 		 (and (eq (overlay-get o 'org-overlay-type) 'org-latex-overlay)
 		      o))
 		      o))
 	       (overlays-at (point))))
 	       (overlays-at (point))))
       (push (list :latex-fragment
       (push (list :latex-fragment
-		  (overlay-start o) (overlay-end o)) clist)
+		  (overlay-start o) (overlay-end o))
+	    clist)
       (push (list :latex-preview
       (push (list :latex-preview
-		  (overlay-start o) (overlay-end o)) clist))
+		  (overlay-start o) (overlay-end o))
+	    clist))
      ((org-inside-LaTeX-fragment-p)
      ((org-inside-LaTeX-fragment-p)
       ;; FIXME: positions wrong.
       ;; FIXME: positions wrong.
       (push (list :latex-fragment (point) (point)) clist)))
       (push (list :latex-fragment (point) (point)) clist)))

+ 2 - 1
lisp/ox-ascii.el

@@ -1273,7 +1273,8 @@ CONTENTS is nil.  INFO is a plist holding contextual information."
   (org-ascii--justify-element
   (org-ascii--justify-element
    (org-ascii--box-string
    (org-ascii--box-string
     (org-remove-indentation
     (org-remove-indentation
-     (org-element-property :value fixed-width)) info)
+     (org-element-property :value fixed-width))
+    info)
    fixed-width info))
    fixed-width info))
 
 
 
 

+ 2 - 1
lisp/ox-icalendar.el

@@ -367,7 +367,8 @@ A headline is blocked when either
 (defun org-icalendar-use-UTC-date-time-p ()
 (defun org-icalendar-use-UTC-date-time-p ()
   "Non-nil when `org-icalendar-date-time-format' requires UTC time."
   "Non-nil when `org-icalendar-date-time-format' requires UTC time."
   (char-equal (elt org-icalendar-date-time-format
   (char-equal (elt org-icalendar-date-time-format
-		   (1- (length org-icalendar-date-time-format))) ?Z))
+		   (1- (length org-icalendar-date-time-format)))
+	      ?Z))
 
 
 (defvar org-agenda-default-appointment-duration) ; From org-agenda.el.
 (defvar org-agenda-default-appointment-duration) ; From org-agenda.el.
 (defun org-icalendar-convert-timestamp (timestamp keyword &optional end tz)
 (defun org-icalendar-convert-timestamp (timestamp keyword &optional end tz)

+ 2 - 1
lisp/ox-md.el

@@ -455,7 +455,8 @@ INFO is a plist holding contextual information.  See
 			(t (expand-file-name raw-path))))
 			(t (expand-file-name raw-path))))
 	    (caption (org-export-data
 	    (caption (org-export-data
 		      (org-export-get-caption
 		      (org-export-get-caption
-		       (org-export-get-parent-element link)) info)))
+		       (org-export-get-parent-element link))
+		      info)))
 	(format "![img](%s)"
 	(format "![img](%s)"
 		(if (not (org-string-nw-p caption)) path
 		(if (not (org-string-nw-p caption)) path
 		  (format "%s \"%s\"" path caption)))))
 		  (format "%s \"%s\"" path caption)))))

+ 2 - 1
lisp/ox-texinfo.el

@@ -606,7 +606,8 @@ holding export options."
 	 "^@documentencoding \\(AUTO\\)$"
 	 "^@documentencoding \\(AUTO\\)$"
 	 coding
 	 coding
 	 (replace-regexp-in-string
 	 (replace-regexp-in-string
-	  "^@documentlanguage \\(AUTO\\)$" language header t nil 1) t nil 1)))
+	  "^@documentlanguage \\(AUTO\\)$" language header t nil 1)
+	 t nil 1)))
      ;; Additional header options set by #+TEXINFO_HEADER.
      ;; Additional header options set by #+TEXINFO_HEADER.
      (let ((texinfo-header (plist-get info :texinfo-header)))
      (let ((texinfo-header (plist-get info :texinfo-header)))
        (and texinfo-header (org-element-normalize-string texinfo-header)))
        (and texinfo-header (org-element-normalize-string texinfo-header)))

+ 2 - 1
lisp/ox.el

@@ -5241,7 +5241,8 @@ rows (resp. columns)."
       (lambda (row)
       (lambda (row)
 	(when (eq (org-element-property :type row) 'standard)
 	(when (eq (org-element-property :type row) 'standard)
 	  (cl-incf rows)
 	  (cl-incf rows)
-	  (unless first-row (setq first-row row)))) info)
+	  (unless first-row (setq first-row row))))
+      info)
     ;; Set number of columns.
     ;; Set number of columns.
     (org-element-map first-row 'table-cell (lambda (_) (cl-incf columns)) info)
     (org-element-map first-row 'table-cell (lambda (_) (cl-incf columns)) info)
     ;; Return value.
     ;; Return value.