[elpa] externals/org 369eb27: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 369eb2739787b9b24399c803be31e4e793113dd1
Merge: 26773a4 862048d
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'maint'
---
 lisp/ob-sql.el       | 5 ++++-
 lisp/org-footnote.el | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 902194a..b9dd72b 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -245,11 +245,14 @@ This function is called by `org-babel-execute-src-block'."
                                   (org-babel-process-file-name in-file)
                                   (org-babel-process-file-name out-file)))
                    ((postgresql postgres) (format
-                                           "%spsql --set=\"ON_ERROR_STOP=1\" 
%s -A -P \
+                                           "%s%s --set=\"ON_ERROR_STOP=1\" %s 
-A -P \
 footer=off -F \"\t\"  %s -f %s -o %s %s"
                                            (if dbpassword
                                                (format "PGPASSWORD=%s " 
dbpassword)
                                              "")
+                                            (or (bound-and-true-p
+                                                 sql-postgres-program)
+                                                "psql")
                                            (if colnames-p "" "-t")
                                            (org-babel-sql-dbstring-postgresql
                                             dbhost dbport dbuser database)
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 47ad4aa..6769663 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -37,6 +37,7 @@
 (declare-function org-at-comment-p "org" ())
 (declare-function org-at-heading-p "org" (&optional ignored))
 (declare-function org-back-over-empty-lines "org" ())
+(declare-function org-end-of-meta-data "org" (&optional full))
 (declare-function org-edit-footnote-reference "org-src" ())
 (declare-function org-element-at-point "org-element" ())
 (declare-function org-element-class "org-element" (datum &optional parent))