summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2019-10-20 12:12:27 +0200
committerKyle Meyer <kyle@kyleam.com>2019-10-27 15:54:59 -0400
commit9c611fd8ac3483576a5c5871f05aecad1afafa5c (patch)
tree9d12a35b2f98c4b8fea267169dab42582124ee7a
parente3090573be8754e4bf9851c67e1aba2480cc3873 (diff)
downloadorg-mode-9c611fd8ac3483576a5c5871f05aecad1afafa5c.tar.gz
Backport commit 41ba8231e from Emacs
* lisp/ob-scheme.el (org-babel-scheme-get-buffer-impl): * lisp/ob-shell.el (org-babel--variable-assignments:sh-generic) (org-babel--variable-assignments:bash_array) (org-babel--variable-assignments:bash_assoc) (org-babel--variable-assignments:bash): * lisp/org-clock.el (org-day-of-week): (table--put-cell-valign-property): Fix typos. * lisp/ob-core.el (org-babel-named-src-block-regexp-for-name) (org-babel-named-data-regexp-for-name): Doc fix. (org-babel-src-block-names, org-babel-result-names): Fix typos. lisp/*.el: Fix typos and improve some docstrings 41ba8231ef072571e1a6feabc15d113e5cf57556 Juanma Barranquero Sun Oct 20 12:12:27 2019 +0200
-rw-r--r--lisp/ob-core.el8
-rw-r--r--lisp/ob-scheme.el2
-rw-r--r--lisp/ob-shell.el8
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/ox.el2
5 files changed, 11 insertions, 11 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 6f4101f..9a9409e 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -526,7 +526,7 @@ to raise errors for all languages.")
"Hook for functions to be called after `org-babel-execute-src-block'")
(defun org-babel-named-src-block-regexp-for-name (&optional name)
- "This generates a regexp used to match a source block named NAME.
+ "Generate a regexp used to match a source block named NAME.
If NAME is nil, match any name. Matched name is then put in
match group 9. Other match groups are defined in
`org-babel-src-block-regexp'."
@@ -537,7 +537,7 @@ match group 9. Other match groups are defined in
(substring org-babel-src-block-regexp 1)))
(defun org-babel-named-data-regexp-for-name (name)
- "This generates a regexp used to match data named NAME."
+ "Generate a regexp used to match data named NAME."
(concat org-babel-name-regexp (regexp-quote name) "[ \t]*$"))
(defun org-babel--normalize-body (datum)
@@ -1789,7 +1789,7 @@ to `org-babel-named-src-block-regexp'."
(ignore-errors (org-next-block 1 nil regexp))))))
(defun org-babel-src-block-names (&optional file)
- "Returns the names of source blocks in FILE or the current buffer."
+ "Return the names of source blocks in FILE or the current buffer."
(with-current-buffer (if file (find-file-noselect file) (current-buffer))
(org-with-point-at 1
(let ((regexp "^[ \t]*#\\+begin_src ")
@@ -1834,7 +1834,7 @@ buffer or nil if no such result exists."
(throw :found (line-beginning-position)))))))))
(defun org-babel-result-names (&optional file)
- "Returns the names of results in FILE or the current buffer."
+ "Return the names of results in FILE or the current buffer."
(save-excursion
(when file (find-file file)) (goto-char (point-min))
(let ((case-fold-search t) names)
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index 251ed52..21d9fad 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -102,7 +102,7 @@
(puthash session-name buffer org-babel-scheme-repl-map))
(defun org-babel-scheme-get-buffer-impl (buffer)
- "Returns the scheme implementation geiser associates with the buffer."
+ "Return the scheme implementation geiser associates with the buffer."
(with-current-buffer (set-buffer buffer)
geiser-impl--implementation))
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 66c28f7..88342ba 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -112,12 +112,12 @@ This function is called by `org-babel-execute-src-block'."
;;; Helper functions
(defun org-babel--variable-assignments:sh-generic
(varname values &optional sep hline)
- "Returns a list of statements declaring the values as a generic variable."
+ "Return a list of statements declaring the values as a generic variable."
(format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline)))
(defun org-babel--variable-assignments:bash_array
(varname values &optional sep hline)
- "Returns a list of statements declaring the values as a bash array."
+ "Return a list of statements declaring the values as a bash array."
(format "unset %s\ndeclare -a %s=( %s )"
varname varname
(mapconcat
@@ -127,7 +127,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel--variable-assignments:bash_assoc
(varname values &optional sep hline)
- "Returns a list of statements declaring the values as bash associative array."
+ "Return a list of statements declaring the values as bash associative array."
(format "unset %s\ndeclare -A %s\n%s"
varname varname
(mapconcat
@@ -140,7 +140,7 @@ This function is called by `org-babel-execute-src-block'."
"\n")))
(defun org-babel--variable-assignments:bash (varname values &optional sep hline)
- "Represents the parameters as useful Bash shell variables."
+ "Represent the parameters as useful Bash shell variables."
(pcase values
(`((,_ ,_ . ,_) . ,_) ;two-dimensional array
(org-babel--variable-assignments:bash_assoc varname values sep hline))
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index d0548d0..1761f69 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2054,7 +2054,7 @@ in the buffer and update it."
(org-update-dblock))
(defun org-day-of-week (day month year)
- "Returns the day of the week as an integer."
+ "Return the day of the week as an integer."
(nth 6
(decode-time
(date-to-time
diff --git a/lisp/ox.el b/lisp/ox.el
index ec9527f..c02a6c4 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4757,7 +4757,7 @@ code."
;;;; For Tables
;;
-;; `org-export-table-has-special-column-p' and and
+;; `org-export-table-has-special-column-p' and
;; `org-export-table-row-is-special-p' are predicates used to look for
;; meta-information about the table structure.
;;