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-26 23:24:13 -04:00
parent c21dceb66d 1f3722c6b5
commit d9d5594c24
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-table.el
View File

@ -78,7 +78,8 @@ So this `org-sbe' construct
is the equivalent of the following source code block:
#+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) :results silent
#+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) \\
:results silent
results
#+end_src

5
lisp/org-agenda.el
View File

@ -1232,7 +1232,8 @@ For example, 9:30am would become 09:30 rather than 9:30."
":" minute ampm)))
(defun org-agenda-time-of-day-to-ampm-maybe (time)
"Conditionally convert TIME to AM/PM format based on `org-agenda-timegrid-use-ampm'."
"Conditionally convert TIME to AM/PM format.
This is based on `org-agenda-timegrid-use-ampm'."
(if org-agenda-timegrid-use-ampm
(org-agenda-time-of-day-to-ampm time)
time))
@ -4592,7 +4593,7 @@ is active."
'org-todo-regexp org-todo-regexp
'org-complex-heading-regexp org-complex-heading-regexp
'mouse-face 'highlight
'help-echo (format "mouse-2 or RET jump to location")))
'help-echo "mouse-2 or RET jump to location"))
(full-words org-agenda-search-view-force-full-words)
(org-agenda-text-search-extra-files org-agenda-text-search-extra-files)
regexp rtn rtnall files file pos inherited-tags

15
lisp/org-protocol.el
View File

@ -178,11 +178,11 @@ Possible properties are:
:working-suffix - the replacement for online-suffix
:base-url - the base URL, e.g. https://www.example.com/project/
Last slash required.
:working-directory - the local working directory. This is, what base-url will
be replaced with.
:redirects - A list of cons cells, each of which maps a regular
expression to match to a path relative to
:working-directory.
:working-directory - the local working directory. This is what
base-url will be replaced with.
:redirects - A list of cons cells, each of which maps a
regular expression to match to a path relative
to `:working-directory'.
Example:
@ -216,8 +216,9 @@ Example:
does not include any suffix properties, allowing local source
file to be opened as found by OpenGrok.
Consider using the interactive functions `org-protocol-create' and
`org-protocol-create-for-org' to help you filling this variable with valid contents."
Consider using the interactive functions `org-protocol-create'
and `org-protocol-create-for-org' to help you filling this
variable with valid contents."
:group 'org-protocol
:type 'alist)