Merge branch 'master' into next

6 files changed, 13 insertions, 13 deletions

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 572f979..b1b071d 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -527,7 +527,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'."
@@ -538,7 +538,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)
@@ -1785,7 +1785,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 ")
@@ -1830,7 +1830,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 a6eb49e..df4ba62 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2070,7 +2070,7 @@ in the buffer and update it."
 (org-dynamic-block-define "clocktable" #'org-clock-report)
 
 (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/org.el b/lisp/org.el
index 4d88af5..9942940 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16777,9 +16777,9 @@ boundaries."
 	      (let ((file (if (equal "attachment" linktype)
                               (progn
                                 (require 'org-attach)
-                                (org-attach-expand path))
+				(ignore-errors (org-attach-expand path)))
                             (expand-file-name path))))
-		(when (file-exists-p file)
+		(when (and file (file-exists-p file))
 		  (let ((width
 			 ;; Apply `org-image-actual-width' specifications.
 			 (cond
diff --git a/lisp/ox.el b/lisp/ox.el
index 554b93c..5b4134e 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4801,7 +4801,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.
 ;;