summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-09-29 15:48:48 -0400
committerKyle Meyer <kyle@kyleam.com>2019-09-29 15:49:08 -0400
commitd215c3a8c0b4c027cfc3bad37f38ab23747fefd6 (patch)
tree6e28309a5889f7d60a83dae1dbb44e0638dc2924
parent617559353091588f520bfcceb6b14f4bcfc94ddd (diff)
parente3090573be8754e4bf9851c67e1aba2480cc3873 (diff)
downloadorg-mode-d215c3a8c0b4c027cfc3bad37f38ab23747fefd6.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-C.el4
-rw-r--r--lisp/ob-J.el2
-rw-r--r--lisp/ob-asymptote.el2
-rw-r--r--lisp/ob-awk.el4
-rw-r--r--lisp/ob-core.el2
-rw-r--r--lisp/ob-ebnf.el4
-rw-r--r--lisp/ob-forth.el2
-rw-r--r--lisp/ob-fortran.el6
-rw-r--r--lisp/ob-groovy.el4
-rw-r--r--lisp/ob-io.el4
-rw-r--r--lisp/ob-js.el2
-rw-r--r--lisp/ob-lilypond.el45
-rw-r--r--lisp/ob-lua.el2
-rw-r--r--lisp/ob-picolisp.el4
-rw-r--r--lisp/ob-processing.el2
-rw-r--r--lisp/ob-python.el2
-rw-r--r--lisp/ob-ruby.el2
-rw-r--r--lisp/ob-scheme.el11
-rw-r--r--lisp/ob-shen.el2
-rw-r--r--lisp/ol.el2
-rw-r--r--lisp/org-agenda.el44
-rw-r--r--lisp/org-faces.el6
-rw-r--r--lisp/org-id.el2
-rw-r--r--lisp/org-indent.el2
-rw-r--r--lisp/org-macs.el2
-rw-r--r--lisp/org-mobile.el2
-rw-r--r--lisp/org.el14
-rw-r--r--lisp/ox-beamer.el2
-rw-r--r--lisp/ox-html.el2
-rw-r--r--lisp/ox-latex.el4
-rw-r--r--lisp/ox-man.el4
-rw-r--r--lisp/ox-odt.el4
-rw-r--r--lisp/ox-publish.el2
-rw-r--r--lisp/ox.el2
34 files changed, 100 insertions, 100 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 92d034f..8cab967 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -297,12 +297,12 @@ its header arguments."
(defun org-babel-prep-session:C (_session _params)
"This function does nothing as C is a compiled language with no
-support for sessions"
+support for sessions."
(error "C is a compiled language -- no support for sessions"))
(defun org-babel-load-session:C (_session _body _params)
"This function does nothing as C is a compiled language with no
-support for sessions"
+support for sessions."
(error "C is a compiled language -- no support for sessions"))
;; helper functions
diff --git a/lisp/ob-J.el b/lisp/ob-J.el
index 498cd59..b48562d 100644
--- a/lisp/ob-J.el
+++ b/lisp/ob-J.el
@@ -72,7 +72,7 @@ PROCESSED-PARAMS isn't used yet."
(defun org-babel-execute:J (body params)
"Execute a block of J code BODY.
PARAMS are given by org-babel.
-This function is called by `org-babel-execute-src-block'"
+This function is called by `org-babel-execute-src-block'."
(message "executing J source code block")
(let* ((processed-params (org-babel-process-params params))
(sessionp (cdr (assq :session params)))
diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el
index 667d3e1..3fc0ceb 100644
--- a/lisp/ob-asymptote.el
+++ b/lisp/ob-asymptote.el
@@ -77,7 +77,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-prep-session:asymptote (_session _params)
"Return an error if the :session header argument is set.
-Asymptote does not support sessions"
+Asymptote does not support sessions."
(error "Asymptote does not support sessions"))
(defun org-babel-variable-assignments:asymptote (params)
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 4c0dbbc..0d5f47d 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -48,8 +48,8 @@
body)
(defun org-babel-execute:awk (body params)
- "Execute a block of Awk code with org-babel. This function is
-called by `org-babel-execute-src-block'"
+ "Execute a block of Awk code with org-babel.
+This function is called by `org-babel-execute-src-block'."
(message "executing Awk source code block")
(let* ((result-params (cdr (assq :result-params params)))
(cmd-line (cdr (assq :cmd-line params)))
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 97ec18f..572f979 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2975,7 +2975,7 @@ If NAME specifies a remote location, the remote portion of the
name is removed, since in that case the process will be executing
remotely. The file name is then processed by `expand-file-name'.
Unless second argument NO-QUOTE-P is non-nil, the file name is
-additionally processed by `shell-quote-argument'"
+additionally processed by `shell-quote-argument'."
(let ((f (org-babel-local-file-name (expand-file-name name))))
(if no-quote-p f (shell-quote-argument f))))
diff --git a/lisp/ob-ebnf.el b/lisp/ob-ebnf.el
index 5ed9319..c229228 100644
--- a/lisp/ob-ebnf.el
+++ b/lisp/ob-ebnf.el
@@ -49,8 +49,8 @@
;; Use ebnf-eps-buffer to produce an encapsulated postscript file.
;;
(defun org-babel-execute:ebnf (body params)
- "Execute a block of Ebnf code with org-babel. This function is
-called by `org-babel-execute-src-block'"
+ "Execute a block of Ebnf code with org-babel.
+This function is called by `org-babel-execute-src-block'."
(save-excursion
(let* ((dest-file (cdr (assq :file params)))
(dest-dir (file-name-directory dest-file))
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index 2d61de3..5d4fe30 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -42,7 +42,7 @@
(defun org-babel-execute:forth (body params)
"Execute a block of Forth code with org-babel.
-This function is called by `org-babel-execute-src-block'"
+This function is called by `org-babel-execute-src-block'."
(if (string= "none" (cdr (assq :session params)))
(error "Non-session evaluation not supported for Forth code blocks")
(let ((all-results (org-babel-forth-session-execute body params)))
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index f1285f6..1431eb4 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -45,7 +45,7 @@
executable.")
(defun org-babel-execute:fortran (body params)
- "This function should only be called by `org-babel-execute:fortran'"
+ "This function should only be called by `org-babel-execute:fortran'."
(let* ((tmp-src-file (org-babel-temp-file "fortran-src-" ".F90"))
(tmp-bin-file (org-babel-temp-file "fortran-bin-" org-babel-exeext))
(cmdline (cdr (assq :cmdline params)))
@@ -114,12 +114,12 @@ its header arguments."
(defun org-babel-prep-session:fortran (_session _params)
"This function does nothing as fortran is a compiled language with no
-support for sessions"
+support for sessions."
(error "Fortran is a compiled languages -- no support for sessions"))
(defun org-babel-load-session:fortran (_session _body _params)
"This function does nothing as fortran is a compiled language with no
-support for sessions"
+support for sessions."
(error "Fortran is a compiled languages -- no support for sessions"))
;; helper functions
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index fe3a072..a22e21d 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -45,8 +45,8 @@ parameters may be used, like groovy -v"
:type 'string)
(defun org-babel-execute:groovy (body params)
- "Execute a block of Groovy code with org-babel. This function is
-called by `org-babel-execute-src-block'"
+ "Execute a block of Groovy code with org-babel.
+This function is called by `org-babel-execute-src-block'."
(message "executing Groovy source code block")
(let* ((processed-params (org-babel-process-params params))
(session (org-babel-groovy-initiate-session (nth 0 processed-params)))
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index b0d5b51..9817c64 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -41,8 +41,8 @@
"Name of the command to use for executing Io code.")
(defun org-babel-execute:io (body params)
- "Execute a block of Io code with org-babel. This function is
-called by `org-babel-execute-src-block'"
+ "Execute a block of Io code with org-babel.
+This function is called by `org-babel-execute-src-block'."
(message "executing Io source code block")
(let* ((processed-params (org-babel-process-params params))
(session (org-babel-io-initiate-session (nth 0 processed-params)))
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 7b83c3e..dd53ef6 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -70,7 +70,7 @@
(defun org-babel-execute:js (body params)
"Execute a block of Javascript code with org-babel.
-This function is called by `org-babel-execute-src-block'"
+This function is called by `org-babel-execute-src-block'."
(let* ((org-babel-js-cmd (or (cdr (assq :cmd params)) org-babel-js-cmd))
(session (cdr (assq :session params)))
(result-type (cdr (assq :result-type params)))
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index c795d9c..4538ed5 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -43,20 +43,20 @@
(defvar org-babel-default-header-args:lilypond '()
"Default header arguments for lilypond code blocks.
NOTE: The arguments are determined at lilypond compile time.
-See (org-babel-lilypond-set-header-args)")
+See `org-babel-lilypond-set-header-args'.")
(defvar org-babel-lilypond-compile-post-tangle t
"Following the org-babel-tangle (C-c C-v t) command,
org-babel-lilypond-compile-post-tangle determines whether ob-lilypond should
automatically attempt to compile the resultant tangled file.
If the value is nil, no automated compilation takes place.
-Default value is t")
+Default value is t.")
(defvar org-babel-lilypond-display-pdf-post-tangle t
"Following a successful LilyPond compilation
org-babel-lilypond-display-pdf-post-tangle determines whether to automate the
drawing / redrawing of the resultant pdf. If the value is nil,
-the pdf is not automatically redrawn. Default value is t")
+the pdf is not automatically redrawn. Default value is t.")
(defvar org-babel-lilypond-play-midi-post-tangle t
"Following a successful LilyPond compilation
@@ -152,7 +152,7 @@ Depending on whether we are in arrange mode either:
(defun org-babel-lilypond-tangle ()
"ob-lilypond specific tangle, attempts to invoke
=ly-execute-tangled-ly= if tangle is successful. Also passes
-specific arguments to =org-babel-tangle="
+specific arguments to =org-babel-tangle=."
(interactive)
(if (org-babel-tangle nil "yes" "lilypond")
(org-babel-lilypond-execute-tangled-ly) nil))
@@ -189,7 +189,7 @@ specific arguments to =org-babel-tangle="
(defun org-babel-lilypond-execute-tangled-ly ()
"Compile result of block tangle with lilypond.
-If error in compilation, attempt to mark the error in lilypond org file"
+If error in compilation, attempt to mark the error in lilypond org file."
(when org-babel-lilypond-compile-post-tangle
(let ((org-babel-lilypond-tangled-file (org-babel-lilypond-switch-extension
(buffer-file-name) ".lilypond"))
@@ -212,8 +212,8 @@ If error in compilation, attempt to mark the error in lilypond org file"
(org-babel-lilypond-attempt-to-play-midi org-babel-lilypond-temp-file)))))
(defun org-babel-lilypond-compile-lilyfile (file-name &optional test)
- "Compile lilypond file and check for compile errors
-FILE-NAME is full path to lilypond (.ly) file"
+ "Compile lilypond file and check for compile errors.
+FILE-NAME is full path to lilypond (.ly) file."
(message "Compiling LilyPond...")
(let ((arg-1 org-babel-lilypond-ly-command) ;program
(arg-2 nil) ;infile
@@ -239,7 +239,7 @@ This is performed by parsing the *lilypond* buffer
containing the output message from the compilation.
FILE-NAME is full path to lilypond file.
If TEST is t just return nil if no error found, and pass
-nil as file-name since it is unused in this context"
+nil as file-name since it is unused in this context."
(let ((is-error (search-forward "error:" nil t)))
(if test
is-error
@@ -248,7 +248,7 @@ nil as file-name since it is unused in this context"
(defun org-babel-lilypond-process-compile-error (file-name)
"Process the compilation error that has occurred.
-FILE-NAME is full path to lilypond file"
+FILE-NAME is full path to lilypond file."
(let ((line-num (org-babel-lilypond-parse-line-num)))
(let ((error-lines (org-babel-lilypond-parse-error-line file-name line-num)))
(org-babel-lilypond-mark-error-line file-name error-lines)
@@ -257,7 +257,7 @@ FILE-NAME is full path to lilypond file"
(defun org-babel-lilypond-mark-error-line (file-name line)
"Mark the erroneous lines in the lilypond org buffer.
FILE-NAME is full path to lilypond file.
-LINE is the erroneous line"
+LINE is the erroneous line."
(switch-to-buffer-other-window
(concat (file-name-nondirectory
(org-babel-lilypond-switch-extension file-name ".org"))))
@@ -288,9 +288,9 @@ LINE is the erroneous line"
(and (numberp num) num)))))
(defun org-babel-lilypond-parse-error-line (file-name lineNo)
- "Extract the erroneous line from the tangled .ly file
+ "Extract the erroneous line from the tangled .ly file.
FILE-NAME is full path to lilypond file.
-LINENO is the number of the erroneous line"
+LINENO is the number of the erroneous line."
(with-temp-buffer
(insert-file-contents (org-babel-lilypond-switch-extension file-name ".ly")
nil nil nil t)
@@ -302,9 +302,9 @@ LINENO is the number of the erroneous line"
nil)))
(defun org-babel-lilypond-attempt-to-open-pdf (file-name &optional test)
- "Attempt to display the generated pdf file
-FILE-NAME is full path to lilypond file
-If TEST is non-nil, the shell command is returned and is not run"
+ "Attempt to display the generated pdf file.
+FILE-NAME is full path to lilypond file.
+If TEST is non-nil, the shell command is returned and is not run."
(when org-babel-lilypond-display-pdf-post-tangle
(let ((pdf-file (org-babel-lilypond-switch-extension file-name ".pdf")))
(if (file-exists-p pdf-file)
@@ -320,9 +320,9 @@ If TEST is non-nil, the shell command is returned and is not run"
(message "No pdf file generated so can't display!")))))
(defun org-babel-lilypond-attempt-to-play-midi (file-name &optional test)
- "Attempt to play the generated MIDI file
-FILE-NAME is full path to lilypond file
-If TEST is non-nil, the shell command is returned and is not run"
+ "Attempt to play the generated MIDI file.
+FILE-NAME is full path to lilypond file.
+If TEST is non-nil, the shell command is returned and is not run."
(when org-babel-lilypond-play-midi-post-tangle
(let ((midi-file (org-babel-lilypond-switch-extension file-name ".midi")))
(if (file-exists-p midi-file)
@@ -385,14 +385,13 @@ If TEST is non-nil, the shell command is returned and is not run"
(if org-babel-lilypond-arrange-mode "ENABLED." "DISABLED."))))
(defun org-babel-lilypond-switch-extension (file-name ext)
- "Utility command to swap current FILE-NAME extension with EXT"
+ "Utility command to swap current FILE-NAME extension with EXT."
(concat (file-name-sans-extension
file-name) ext))
(defun org-babel-lilypond-get-header-args (mode)
- "Default arguments to use when evaluating a lilypond
-source block. These depend upon whether we are in arrange
-mode i.e. ARRANGE-MODE is t"
+ "Default arguments to use when evaluating a lilypond source block.
+These depend upon whether we are in Arrange mode i.e. MODE is t."
(cond (mode
'((:tangle . "yes")
(:noweb . "yes")
@@ -405,7 +404,7 @@ mode i.e. ARRANGE-MODE is t"
(defun org-babel-lilypond-set-header-args (mode)
"Set org-babel-default-header-args:lilypond
-dependent on ORG-BABEL-LILYPOND-ARRANGE-MODE"
+dependent on ORG-BABEL-LILYPOND-ARRANGE-MODE."
(setq org-babel-default-header-args:lilypond
(org-babel-lilypond-get-header-args mode)))
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index 70d328e..9a66505 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -100,7 +100,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-prep-session:lua (session params)
"Prepare SESSION according to the header arguments in PARAMS.
-VARS contains resolved variable references"
+VARS contains resolved variable references."
(let* ((session (org-babel-lua-initiate-session session))
(var-lines
(org-babel-variable-assignments:lua params)))
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index c0f0125..4f70252 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -94,8 +94,8 @@
body)))
(defun org-babel-execute:picolisp (body params)
- "Execute a block of Picolisp code with org-babel. This function is
- called by `org-babel-execute-src-block'"
+ "Execute a block of Picolisp code with org-babel.
+This function is called by `org-babel-execute-src-block'."
(message "executing Picolisp source code block")
(let* (
;; Name of the session or "none".
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index 97ab88c..7bb9fa1 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -135,7 +135,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-prep-session:processing (_session _params)
"Return an error if the :session header argument is set.
-Processing does not support sessions"
+Processing does not support sessions."
(error "Processing does not support sessions"))
(defun org-babel-variable-assignments:processing (params)
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index d4ee230..c36bf2d 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -97,7 +97,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-prep-session:python (session params)
"Prepare SESSION according to the header arguments in PARAMS.
-VARS contains resolved variable references"
+VARS contains resolved variable references."
(let* ((session (org-babel-python-initiate-session session))
(var-lines
(org-babel-variable-assignments:python params)))
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 32af8c5..be76727 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -215,7 +215,7 @@ return the value of the last statement in BODY, as elisp."
(let ((eoe-string (format "puts \"%s\"" org-babel-ruby-eoe-indicator)))
;; Force the session to be ready before the actual session
;; code is run. There is some problem in comint that will
- ;; sometimes show the prompt after the the input has already
+ ;; sometimes show the prompt after the input has already
;; been inserted and that throws off the extraction of the
;; result for Babel.
(org-babel-comint-with-output
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index ceef8e3..251ed52 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -131,7 +131,7 @@ org-babel-scheme-execute-with-geiser will use a temporary session."
(name)))
(defmacro org-babel-scheme-capture-current-message (&rest body)
- "Capture current message in both interactive and noninteractive mode"
+ "Capture current message in both interactive and noninteractive mode."
`(if noninteractive
(let ((original-message (symbol-function 'message))
(current-message nil))
@@ -147,10 +147,11 @@ org-babel-scheme-execute-with-geiser will use a temporary session."
(current-message))))
(defun org-babel-scheme-execute-with-geiser (code output impl repl)
- "Execute code in specified REPL. If the REPL doesn't exist, create it
-using the given scheme implementation.
+ "Execute code in specified REPL.
+If the REPL doesn't exist, create it using the given scheme
+implementation.
-Returns the output of executing the code if the output parameter
+Returns the output of executing the code if the OUTPUT parameter
is true; otherwise returns the last value."
(let ((result nil))
(with-temp-buffer
@@ -198,7 +199,7 @@ Emacs-lisp table, otherwise return the results as a string."
(defun org-babel-execute:scheme (body params)
"Execute a block of Scheme code with org-babel.
-This function is called by `org-babel-execute-src-block'"
+This function is called by `org-babel-execute-src-block'."
(let* ((source-buffer (current-buffer))
(source-buffer-name (replace-regexp-in-string ;; zap surrounding *
"^ ?\\*\\([^*]+\\)\\*" "\\1"
diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el
index af3bd2b..f2daa67 100644
--- a/lisp/ob-shen.el
+++ b/lisp/ob-shen.el
@@ -61,7 +61,7 @@
(defun org-babel-execute:shen (body params)
"Execute a block of Shen code with org-babel.
-This function is called by `org-babel-execute-src-block'"
+This function is called by `org-babel-execute-src-block'."
(require 'inf-shen)
(let* ((result-params (cdr (assq :result-params params)))
(full-body (org-babel-expand-body:shen body params)))
diff --git a/lisp/ol.el b/lisp/ol.el
index a2fb3a8..207e40e 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -221,7 +221,7 @@ links created by planner."
:type '(choice (const nil) (function))
:safe #'null)
-(defcustom org-link-doi-server-url "http://dx.doi.org/"
+(defcustom org-link-doi-server-url "https://doi.org/"
"The URL of the DOI server."
:group 'org-link-follow
:version "24.3"
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a4ad649..97ee648 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -269,7 +269,7 @@ you can \"misuse\" it to also add other text to the header."
"List of types searched for when creating the daily/weekly agenda.
This variable is a list of symbols that controls the types of
items that appear in the daily/weekly agenda. Allowed symbols in this
-list are are
+list are
:timestamp List items containing a date stamp or date range matching
the selected date. This includes sexp entries in angular
@@ -1230,7 +1230,7 @@ These days get the special face `org-agenda-date-weekend' in the agenda."
(defcustom org-agenda-move-date-from-past-immediately-to-today t
"Non-nil means jump to today when moving a past date forward in time.
-When using S-right in the agenda to move a a date forward, and the date
+When using S-right in the agenda to move a date forward, and the date
stamp currently points to the past, the first key press will move it
to today. When nil, just move one day forward even if the date stays
in the past."
@@ -1503,7 +1503,7 @@ The third item is a string which will be placed right after the
times that have a grid line.
The fourth item is a string placed after the grid times. This
-will align with agenda items"
+will align with agenda items."
:group 'org-agenda-time-grid
:type
'(list
@@ -1547,18 +1547,18 @@ This is a list of symbols which will be used in sequence to determine
if an entry should be listed before another entry. The following
symbols are recognized:
-time-up Put entries with time-of-day indications first, early first
-time-down Put entries with time-of-day indications first, late first
-timestamp-up Sort by any timestamp, early first
-timestamp-down Sort by any timestamp, late first
-scheduled-up Sort by scheduled timestamp, early first
-scheduled-down Sort by scheduled timestamp, late first
-deadline-up Sort by deadline timestamp, early first
-deadline-down Sort by deadline timestamp, late first
-ts-up Sort by active timestamp, early first
-ts-down Sort by active timestamp, late first
-tsia-up Sort by inactive timestamp, early first
-tsia-down Sort by inactive timestamp, late first
+time-up Put entries with time-of-day indications first, early first.
+time-down Put entries with time-of-day indications first, late first.
+timestamp-up Sort by any timestamp, early first.
+timestamp-down Sort by any timestamp, late first.
+scheduled-up Sort by scheduled timestamp, early first.
+scheduled-down Sort by scheduled timestamp, late first.
+deadline-up Sort by deadline timestamp, early first.
+deadline-down Sort by deadline timestamp, late first.
+ts-up Sort by active timestamp, early first.
+ts-down Sort by active timestamp, late first.
+tsia-up Sort by inactive timestamp, early first.
+tsia-down Sort by inactive timestamp, late first.
category-keep Keep the default order of categories, corresponding to the
sequence in `org-agenda-files'.
category-up Sort alphabetically by category, A-Z.
@@ -1573,10 +1573,10 @@ effort-up Sort numerically by estimated effort, high effort last.
effort-down Sort numerically by estimated effort, high effort first.
user-defined-up Sort according to `org-agenda-cmp-user-defined', high last.
user-defined-down Sort according to `org-agenda-cmp-user-defined', high first.
-habit-up Put entries that are habits first
-habit-down Put entries that are habits last
-alpha-up Sort headlines alphabetically
-alpha-down Sort headlines alphabetically, reversed
+habit-up Put entries that are habits first.
+habit-down Put entries that are habits last.
+alpha-up Sort headlines alphabetically.
+alpha-down Sort headlines alphabetically, reversed.
The different possibilities will be tried in sequence, and testing stops
if one comparison returns a \"not-equal\". For example, the default
@@ -8159,7 +8159,7 @@ Negative selection means regexp must not match for selection of an entry."
(defun org-agenda-forward-block (&optional backward)
"Move forward by one agenda block.
-When optional argument BACKWARD is set, go backward"
+When optional argument BACKWARD is set, go backward."
(interactive)
(cond ((not (derived-mode-p 'org-agenda-mode))
(user-error
@@ -9191,7 +9191,7 @@ The new content of the line will be NEWHEAD (as modified by
If FIXFACE is non-nil, the face of each item is modified according to
the new TODO state.
If JUST-THIS is non-nil, change just the current line, not all.
-If FORCE-TAGS is non nil, the car of it returns the new tags."
+If FORCE-TAGS is non-nil, the car of it returns the new tags."
(let* ((inhibit-read-only t)
(line (org-current-line))
(org-agenda-buffer (current-buffer))
@@ -10504,7 +10504,7 @@ to override `appt-message-warning-time'."
(message "Added %d event%s for today" cnt (if (> cnt 1) "s" "")))))
(defun org-agenda-today-p (date)
- "Non nil when DATE means today.
+ "Non-nil when DATE means today.
DATE is either a list of the form (month day year) or a number of
days as returned by `calendar-absolute-from-gregorian' or
`org-today'. This function considers `org-extend-today-until'
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index b792598..a97d4dc 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -408,7 +408,7 @@ For source-blocks `org-src-block-faces' takes precedence."
:group 'org-faces)
(defface org-verbatim '((t (:inherit shadow)))
- "Face for fixed-with text like code snippets"
+ "Face for fixed-with text like code snippets."
:group 'org-faces
:version "22.1")
@@ -608,8 +608,8 @@ If it is less than 8, the level-1 face gets re-used for level N+1 etc."
(defcustom org-cycle-level-faces t
"Non-nil means level styles cycle after level `org-n-level-faces'.
Then so level org-n-level-faces+1 is styled like level 1.
-If nil, then all levels >=org-n-level-faces are styled like
-level org-n-level-faces"
+If nil, then all levels >= org-n-level-faces are styled like
+level org-n-level-faces."
:group 'org-appearance
:group 'org-faces
:version "24.1"
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 2f7af35..653baf9 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -264,7 +264,7 @@ Create an ID if necessary."
"Get the ID property of the entry at point-or-marker POM.
If POM is nil, refer to the entry at point.
If the entry does not have an ID, the function returns nil.
-However, when CREATE is non nil, create an ID if none is present already.
+However, when CREATE is non-nil, create an ID if none is present already.
PREFIX will be passed through to `org-id-new'.
In any case, the ID of the entry is returned."
(org-with-point-at pom
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 15814e0..a69293a 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -299,7 +299,7 @@ LEVEL is the current level of heading. INDENTATION is the
expected indentation when wrapping line.
When optional argument HEADING is non-nil, assume line is at
-a heading. Moreover, if is is `inlinetask', the first star will
+a heading. Moreover, if it is `inlinetask', the first star will
have `org-warning' face."
(let* ((line (aref (pcase heading
(`nil org-indent--text-line-prefixes)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 10b339e..3cc6810 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -632,7 +632,7 @@ program is needed for, so that the error message can be more informative."
(defvar org-inlinetask-min-level) ; defined in org-inlinetask.el
(defun org-get-limited-outline-regexp ()
"Return outline-regexp with limited number of levels.
-The number of levels is controlled by `org-inlinetask-min-level'"
+The number of levels is controlled by `org-inlinetask-min-level'."
(cond ((not (derived-mode-p 'org-mode))
outline-regexp)
((not (featurep 'org-inlinetask))
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 8418993..26a3f57 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -56,7 +56,7 @@ In addition to this, the list may also contain the following symbols:
`org-agenda-text-search-extra-files'
Include the files given in the variable
- `org-agenda-text-search-extra-files'"
+ `org-agenda-text-search-extra-files'."
:group 'org-mobile
:type '(list :greedy t
(option (const :tag "org-agenda-files" org-agenda-files))
diff --git a/lisp/org.el b/lisp/org.el
index cb83bef..bcbed60 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2787,7 +2787,7 @@ When nil, only the minibuffer will be available."
(defcustom org-extend-today-until 0
"The hour when your day really ends. Must be an integer.
This has influence for the following applications:
-- When switching the agenda to \"today\". It it is still earlier than
+- When switching the agenda to \"today\". If it is still earlier than
the time given here, the day recognized as TODAY is actually yesterday.
- When a date is read from the user and it is still before the time given
here, the current date and time will be assumed to be yesterday, 23:59.
@@ -3108,7 +3108,7 @@ and the properties ending in \"_ALL\" when they are used as descriptor
for valid values of a property.
Note for programmers:
-When querying an entry with `org-entry-get', you can control if inheritance
+When querying an entry with `org-entry-get', you can control if inheritance
should be used. By default, `org-entry-get' looks only at the local
properties. You can request inheritance by setting the inherit argument
to t (to force inheritance) or to `selective' (to respect the setting
@@ -3699,7 +3699,7 @@ org-block-begin-line and org-block-end-line faces."
(defcustom org-highlight-latex-and-related nil
"Non-nil means highlight LaTeX related syntax in the buffer.
-When non nil, the value should be a list containing any of the
+When non-nil, the value should be a list containing any of the
following symbols:
`native' Highlight LaTeX snippets and environments natively.
`latex' Highlight LaTeX snippets and environments.
@@ -8356,7 +8356,7 @@ sub-tree if optional argument INHERIT is non-nil."
'org-stats stats)))))))
(defun org-refresh-effort-properties ()
- "Refresh effort properties"
+ "Refresh effort properties."
(org-refresh-properties
org-effort-property
'((effort . identity)
@@ -10318,7 +10318,7 @@ not relevant for the behavior, but it makes things more visible.
Note that toggling the tag with tags commands will not change the property
and therefore not influence behavior!
-This can be t, meaning the tag ORDERED should be used, It can also be a
+This can be t, meaning the tag ORDERED should be used. It can also be a
string to select a different tag for this task."
:group 'org-todo
:type '(choice
@@ -12904,7 +12904,7 @@ but in some other way.")
Being in this list makes sure that they are offered for completion.")
(defun org--valid-property-p (property)
- "Non nil when string PROPERTY is a valid property name."
+ "Non-nil when string PROPERTY is a valid property name."
(not
(or (equal property "")
(string-match-p "\\s-" property))))
@@ -17442,7 +17442,7 @@ individual commands for more information."
This does one of the following:
- switch a timestamp at point one day into the future
-- on a headline, switch to the next TODO keyword.
+- on a headline, switch to the next TODO keyword
- on an item, switch entire list to the next bullet type
- on a property line, switch to the next allowed value
- on a clocktable definition line, move time block into the future
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 7811dd6..0de5e47 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -326,7 +326,7 @@ INFO is a plist used as a communication channel.
The value is either the label specified in \"BEAMER_opt\"
property, the custom ID, if there is one and
-`:latex-prefer-user-labels' property has a non nil value, or
+`:latex-prefer-user-labels' property has a non-nil value, or
a unique internal label. This function assumes HEADLINE will be
treated as a frame."
(cond
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 7570063..882f82d 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1160,7 +1160,7 @@ checkboxes. The other two use the `off' checkbox for `trans'.")
(defcustom org-html-checkbox-type 'ascii
"The type of checkboxes to use for HTML export.
-See `org-html-checkbox-types' for for the values used for each
+See `org-html-checkbox-types' for the values used for each
option."
:group 'org-export-html
:version "24.4"
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 77aac78..b5fa727 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1247,7 +1247,7 @@ calling `org-latex-compile'."
;;; Internal Functions
(defun org-latex--caption-above-p (element info)
- "Non nil when caption is expected to be located above ELEMENT.
+ "Non-nil when caption is expected to be located above ELEMENT.
INFO is a plist holding contextual information."
(let ((above (plist-get info :latex-caption-above)))
(if (symbolp above) above
@@ -3307,7 +3307,7 @@ property."
(above? (org-latex--caption-above-p table info)))
(when (plist-get attr :rmlines)
;; When the "rmlines" attribute is provided, remove all hlines
- ;; but the the one separating heading from the table body.
+ ;; but the one separating heading from the table body.
(let ((n 0) (pos 0))
(while (and (< (length output) pos)
(setq pos (string-match "^\\\\hline\n?" output pos)))
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index 950eadd..00698fc 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -159,7 +159,7 @@ When nil, no transformation is made."
;; Src blocks
(defcustom org-man-source-highlight nil
- "Use GNU source highlight to embellish source blocks "
+ "Use GNU source highlight to embellish source blocks."
:group 'org-export-man
:version "24.4"
:package-version '(Org . "8.0")
@@ -1042,7 +1042,7 @@ holding contextual information."
(defun org-man-verse-block (_verse-block contents _info)
"Transcode a VERSE-BLOCK element from Org to Man.
-CONTENTS is verse block contents. INFO is a plist holding
+CONTENTS is verse block contents. INFO is a plist holding
contextual information."
(format ".RS\n.ft I\n%s\n.ft\n.RE" contents))
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 3251736..be59192 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -2174,7 +2174,7 @@ SHORT-CAPTION are strings."
;;;; Links :: Inline Images
(defun org-odt--copy-image-file (path)
- "Returns the internal name of the file"
+ "Return the internal name of the file"
(let* ((image-type (file-name-extension path))
(media-type (format "image/%s" image-type))
(target-dir "Images/")
@@ -2379,7 +2379,7 @@ used as a communication channel."
(concat equation "<text:tab/>" label))))))
(defun org-odt--copy-formula-file (src-file)
- "Returns the internal name of the file"
+ "Return the internal name of the file"
(let* ((target-dir (format "Formula-%04d/"
(cl-incf org-odt-embedded-formulas-count)))
(target-file (concat target-dir "content.xml")))
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 8928301..dd25f0d 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -909,7 +909,7 @@ PROJECT is the current project."
(defun org-publish-sitemap-default (title list)
"Default site map, as a string.
-TITLE is the the title of the site map. LIST is an internal
+TITLE is the title of the site map. LIST is an internal
representation for the files to include, as returned by
`org-list-to-lisp'. PROJECT is the current project."
(concat "#+TITLE: " title "\n\n"
diff --git a/lisp/ox.el b/lisp/ox.el
index 1b579f5..554b93c 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -805,7 +805,7 @@ also be set with the OPTIONS keyword, e.g. \"timestamp:nil\"."
:safe #'booleanp)
(defcustom org-export-with-timestamps t
- "Non nil means allow timestamps in export.
+ "Non-nil means allow timestamps in export.
It can be set to any of the following values:
t export all timestamps.