[elpa] externals/org a246a13 3/3: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit a246a131873e566afe243ab98b59a806b31019b8
Merge: 72af213 d2deb18
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 lisp/ob-sql.el     |  4 ++--
 lisp/org-compat.el |  6 +++---
 lisp/org-list.el   |  2 +-
 lisp/org.el        | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 6eae5bb..ee19946 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -208,8 +208,8 @@ Otherwise, use Emacs' standard conversion function."
   "Return database connection parameter NAME.
 Given a parameter NAME, if :dbconnection is defined in PARAMS
 then look for the parameter into the corresponding connection
-defined in `sql-connection-alist`, otherwise look into PARAMS.
-Look `sql-connection-alist` (part of SQL mode) for how to define
+defined in `sql-connection-alist', otherwise look into PARAMS.
+See `sql-connection-alist' (part of SQL mode) for how to define
 database connections."
   (if (assq :dbconnection params)
       (let* ((dbconnection (cdr (assq :dbconnection params)))
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 68834fb..4ee847b 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -215,9 +215,9 @@ This is a floating point number if the size is too large 
for an integer."
 Case is significant."
     (string< s1 s2)))
 
-;; The time- functions below translate nil to `current-time' and
-;; accept an integer as of Emacs 25.  `decode-time' and
-;; `format-time-string' accept nil on Emacs 24 but don't accept an
+;; The time- functions below translate nil to 'current-time' and
+;; accept an integer as of Emacs 25.  'decode-time' and
+;; 'format-time-string' accept nil on Emacs 24 but don't accept an
 ;; integer until Emacs 25.
 (if (< emacs-major-version 25)
     (let ((convert
diff --git a/lisp/org-list.el b/lisp/org-list.el
index d2ce129..2bd9dc4 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -3348,7 +3348,7 @@ Valid parameters are:
     (when (and backend (symbolp backend) (not (org-export-get-backend 
backend)))
       (user-error "Unknown :backend value"))
     (unless backend (require 'ox-org))
-    ;; When`:raw' property has a non-nil value, turn all objects back
+    ;; When ':raw' property has a non-nil value, turn all objects back
     ;; into Org syntax.
     (when (and backend (plist-get params :raw))
       (org-element-map data org-element-all-objects
diff --git a/lisp/org.el b/lisp/org.el
index ce68f46..d6d9c4f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19840,15 +19840,15 @@ When BLOCK-REGEXP is non-nil, use this regexp to find 
blocks."
 ;; example-block) don't accept comments.  Usual Emacs comment commands
 ;; cannot cope with those requirements.  Therefore, Org replaces them.
 
-;; Org still relies on `comment-dwim', but cannot trust
-;; `comment-only-p'.  So, `comment-region-function' and
-;; `uncomment-region-function' both point
-;; to`org-comment-or-uncomment-region'.  Eventually,
-;; `org-insert-comment' takes care of insertion of comments at the
+;; Org still relies on 'comment-dwim', but cannot trust
+;; 'comment-only-p'.  So, 'comment-region-function' and
+;; 'uncomment-region-function' both point
+;; to 'org-comment-or-uncomment-region'.  Eventually,
+;; 'org-insert-comment' takes care of insertion of comments at the
 ;; beginning of line.
 
-;; `org-setup-comments-handling' install comments related variables
-;; during `org-mode' initialization.
+;; 'org-setup-comments-handling' install comments related variables
+;; during 'org-mode' initialization.
 
 (defun org-setup-comments-handling ()
   (interactive)