summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-02-18 16:33:04 -0500
committerKyle Meyer <kyle@kyleam.com>2018-02-18 16:33:04 -0500
commit47908228e7ac705b24af75d1934c44cbcfb8bae1 (patch)
treeade007719931943a056498f9a2beb3a2585e3b98
parentdd12f2722ca31fd0f7f0a4e071bf8421cdd4665d (diff)
parentec8590d5e29bbdc5d58c623e8bac5e40eb68b27d (diff)
downloadorg-mode-47908228e7ac705b24af75d1934c44cbcfb8bae1.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi4
-rw-r--r--etc/ORG-NEWS2
-rw-r--r--lisp/ob-calc.el2
-rw-r--r--lisp/ob-core.el6
-rw-r--r--lisp/ob-org.el2
-rw-r--r--lisp/ob-picolisp.el2
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/org-eww.el6
-rw-r--r--lisp/org-protocol.el2
-rw-r--r--lisp/ox-html.el2
-rw-r--r--lisp/ox-latex.el2
-rw-r--r--lisp/ox-odt.el5
-rw-r--r--lisp/ox-texinfo.el2
13 files changed, 19 insertions, 20 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 9b4a4de..d0dfa31 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6733,7 +6733,7 @@ applying it to another one.
@vindex org-clock-idle-time
By customizing the variable @code{org-clock-idle-time} to some integer, such
as 10 or 15, Emacs can alert you when you get back to your computer after
-being idle for that many minutes@footnote{On computers using Mac OS X,
+being idle for that many minutes@footnote{On computers using macOS,
idleness is based on actual user idleness, not just Emacs' idle time. For
X11, you can install a utility program @file{x11idle.c}, available in the
@code{contrib/scripts} directory of the Org git distribution, or install the
@@ -13058,7 +13058,7 @@ of these examples works:
@subsubheading Embedding clickable images
For clickable images, provide a link whose description is another link to an
-image file. For example, to embed a image @file{org-mode-unicorn.png} which
+image file. For example, to embed an image @file{org-mode-unicorn.png} which
when clicked jumps to @uref{https://orgmode.org} website, do the following
@example
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 0c71efa..bd1e6f9 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -387,7 +387,7 @@ directories in published site-maps.
**** Scheme: support for tables
**** Scheme: new variable: ~org-babel-scheme-null-to~
-This new custom option allows to use a empty list or null symbol to
+This new custom option allows you to use an empty list or null symbol to
format the table output, initially assigned to ~hlines~.
**** Scheme: new header ~:prologue~
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 19479a6..387cba2 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -37,7 +37,7 @@
(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-default-header-args:calc nil
- "Default arguments for evaluating an calc source block.")
+ "Default arguments for evaluating a calc source block.")
(defun org-babel-expand-body:calc (body _params)
"Expand BODY according to PARAMS, return the expanded body." body)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index ecf610b..6af10dc 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -360,7 +360,7 @@ a window into the `org-babel-get-src-block-info' function."
;;;###autoload
(defun org-babel-expand-src-block-maybe ()
"Conditionally expand a source block.
-Detect if this is context for a org-babel src-block and if so
+Detect if this is context for an org-babel src-block and if so
then run `org-babel-expand-src-block'."
(interactive)
(org-babel-when-in-src-block
@@ -369,7 +369,7 @@ then run `org-babel-expand-src-block'."
;;;###autoload
(defun org-babel-load-in-session-maybe ()
"Conditionally load a source block in a session.
-Detect if this is context for a org-babel src-block and if so
+Detect if this is context for an org-babel src-block and if so
then run `org-babel-load-in-session'."
(interactive)
(org-babel-when-in-src-block
@@ -380,7 +380,7 @@ then run `org-babel-load-in-session'."
;;;###autoload
(defun org-babel-pop-to-session-maybe ()
"Conditionally pop to a session.
-Detect if this is context for a org-babel src-block and if so
+Detect if this is context for an org-babel src-block and if so
then run `org-babel-switch-to-session'."
(interactive)
(org-babel-when-in-src-block
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 631a845..7a495fa 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -34,7 +34,7 @@
(defvar org-babel-default-header-args:org
'((:results . "raw silent") (:exports . "code"))
- "Default arguments for evaluating a org source block.")
+ "Default arguments for evaluating an org source block.")
(defvar org-babel-org-default-header
"#+TITLE: default empty header\n"
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index 4833289..cc2c8a8 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -35,7 +35,7 @@
;; (http://picolisp.com/5000/-2.html). PicoLisp is included in some
;; GNU/Linux Distributions, and can be downloaded here:
;; http://software-lab.de/down.html. It ships with a picolisp-mode and
-;; a inferior-picolisp-mode for Emacs (to be found in the /lib/el/
+;; an inferior-picolisp-mode for Emacs (to be found in the /lib/el/
;; directory).
;; Although it might seem more natural to use Emacs Lisp for most
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 2dc776e..8e73342 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1366,7 +1366,7 @@ the default behavior."
;;;###autoload
(defun org-clock-in-last (&optional arg)
"Clock in the last closed clocked item.
-When already clocking in, send an warning.
+When already clocking in, send a warning.
With a universal prefix argument, select the task you want to
clock in from the last clocked in tasks.
With two universal prefix arguments, start clocking using the
diff --git a/lisp/org-eww.el b/lisp/org-eww.el
index 46ebccb..1b6112a 100644
--- a/lisp/org-eww.el
+++ b/lisp/org-eww.el
@@ -25,9 +25,9 @@
;;; Commentary:
;; When this module is active `org-store-link' (often on key C-c l) in
-;; a eww buffer stores a link to the current url of the eww buffer.
+;; an EWW buffer stores a link to the current url of the eww buffer.
-;; In an eww buffer function `org-eww-copy-for-org-mode' kills either
+;; In an EWW buffer function `org-eww-copy-for-org-mode' kills either
;; a region or the whole buffer if no region is set and transforms the
;; text on the fly so that it can be pasted into an Org buffer with
;; hot links.
@@ -58,7 +58,7 @@
;; Store Org-link in eww-mode buffer
(org-link-set-parameters "eww" :follow #'eww :store #'org-eww-store-link)
(defun org-eww-store-link ()
- "Store a link to the url of a Eww buffer."
+ "Store a link to the url of an EWW buffer."
(when (eq major-mode 'eww-mode)
(org-store-link-props
:type "eww"
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index a0e2e42..33957ee 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -663,7 +663,7 @@ to deal with new-style links.")
;;; Org specific functions:
(defun org-protocol-create-for-org ()
- "Create a Org protocol project for the current file's project.
+ "Create an Org protocol project for the current file's project.
The visited file needs to be part of a publishing project in
`org-publish-project-alist' for this to work. The function
delegates most of the work to `org-protocol-create'."
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index e1606c4..e32083c 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2697,7 +2697,7 @@ holding contextual information."
(defun org-html-format-inlinetask-default-function
(todo todo-type priority text tags contents info)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-html-format-inlinetask-function' for details."
(format "<div class=\"inlinetask\">\n<b>%s</b>%s\n%s</div>"
(org-html-format-headline-default-function
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index e612b32..5aaaf99 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -2124,7 +2124,7 @@ holding contextual information."
(defun org-latex-format-inlinetask-default-function
(todo _todo-type priority title tags contents _info)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-latex-format-inlinetask-function' for details."
(let ((full-title
(concat (when todo (format "\\textbf{\\textsf{\\textsc{%s}}} " todo))
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index d1b7fc6..a1145a9 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -600,8 +600,7 @@ allow document of a given class (irrespective of its source
format) to be converted to any of the export formats associated
with that class.
-See default setting of this variable for an typical
-configuration."
+See default setting of this variable for a typical configuration."
:group 'org-export-odt
:version "24.1"
:type
@@ -1938,7 +1937,7 @@ holding contextual information."
(defun org-odt-format-inlinetask-default-function
(todo todo-type priority name tags contents)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-odt-format-inlinetask-function' for details."
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
"Text_20_body"
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 38c7d70..ee28fad 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -949,7 +949,7 @@ holding contextual information."
(defun org-texinfo-format-inlinetask-default-function
(todo _todo-type priority title tags contents)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-texinfo-format-inlinetask-function' for details."
(let ((full-title
(concat (when todo (format "@strong{%s} " todo))