tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'km/from-emacs-master'

This commit is contained in:
Kyle Meyer 2021-09-12 23:35:16 -04:00
parent 72af213be8 d2deb188a6
commit a246a13187
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob-sql.el
View File

@ -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)))

6
lisp/org-compat.el
View File

@ -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

2
lisp/org-list.el
View File

@ -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

14
lisp/org.el
View File

@ -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)