ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' into master

This commit is contained in:
Kyle Meyer 2020-10-04 15:08:40 -04:00
parent 0a854e4ca0 9a6689f9ce
commit 10e0e306a1
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ob-plantuml.el
View File

@ -26,7 +26,7 @@
;; Org-Babel support for evaluating plantuml script. ;; Org-Babel support for evaluating plantuml script.
;; ;;
;; Inspired by Ian Yang's org-export-blocks-format-plantuml ;; Inspired by Ian Yang's org-export-blocks-format-plantuml
;; http://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el ;; https://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el
;;; Requirements: ;;; Requirements:

4
lisp/ob-ruby.el
View File

@ -30,10 +30,10 @@
;; - ruby and irb executables :: http://www.ruby-lang.org/ ;; - ruby and irb executables :: http://www.ruby-lang.org/
;; ;;
;; - ruby-mode :: Can be installed through ELPA, or from ;; - ruby-mode :: Can be installed through ELPA, or from
;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el ;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
;; ;;
;; - inf-ruby mode :: Can be installed through ELPA, or from ;; - inf-ruby mode :: Can be installed through ELPA, or from
;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el ;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
;;; Code: ;;; Code:
(require 'ob) (require 'ob)

2
lisp/ob-sass.el
View File

@ -35,7 +35,7 @@
;;; Requirements: ;;; Requirements:
;; - sass-mode :: http://github.com/nex3/haml/blob/master/extra/sass-mode.el ;; - sass-mode :: https://github.com/nex3/haml/blob/master/extra/sass-mode.el
;;; Code: ;;; Code:
(require 'ob) (require 'ob)

2
lisp/ob-stan.el
View File

@ -41,7 +41,7 @@
;; For more information and usage examples, visit ;; For more information and usage examples, visit
;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html ;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html
;; ;;
;; [1] http://mc-stan.org/ ;; [1] https://mc-stan.org/
;;; Code: ;;; Code:
(require 'ob) (require 'ob)

2
lisp/ol-bibtex.el
View File

@ -317,7 +317,7 @@ is non-nil."
"Controls whether inherited tags are converted to bibtex keywords. "Controls whether inherited tags are converted to bibtex keywords.
It is relevant only if `org-bibtex-tags-are-keywords' is non-nil. It is relevant only if `org-bibtex-tags-are-keywords' is non-nil.
Tag inheritance itself is controlled by `org-use-tag-inheritance' Tag inheritance itself is controlled by `org-use-tag-inheritance'
and `org-exclude-tags-from-inheritance'." and `org-tags-exclude-from-inheritance'."
:group 'org-bibtex :group 'org-bibtex
:version "26.1" :version "26.1"
:package-version '(Org . "8.3") :package-version '(Org . "8.3")

2
lisp/org-num.el
View File

@ -131,7 +131,7 @@ For example, add \"ARCHIVE\" to this list to avoid numbering
archived sub-trees. archived sub-trees.
Tag in this list prevent numbering the whole sub-tree, Tag in this list prevent numbering the whole sub-tree,
irrespective to `org-use-tags-inheritance', or other means to irrespective to `org-use-tag-inheritance', or other means to
control tag inheritance." control tag inheritance."
:group 'org-appearance :group 'org-appearance
:package-version '(Org . "9.3") :package-version '(Org . "9.3")

4
lisp/org-table.el
View File

@ -6203,7 +6203,7 @@ which will prompt for the width."
;; Here are two examples of different styles. ;; Here are two examples of different styles.
;; Unicode block characters are used to give a smooth effect. ;; Unicode block characters are used to give a smooth effect.
;; See http://en.wikipedia.org/wiki/Block_Elements ;; See https://en.wikipedia.org/wiki/Block_Elements
;; Use one of those drawing functions ;; Use one of those drawing functions
;; - orgtbl-ascii-draw (the default ascii) ;; - orgtbl-ascii-draw (the default ascii)
;; - orgtbl-uc-draw-grid (unicode with a grid effect) ;; - orgtbl-uc-draw-grid (unicode with a grid effect)
@ -6217,7 +6217,7 @@ which will prompt for the width."
It is a variant of orgtbl-ascii-draw with Unicode block It is a variant of orgtbl-ascii-draw with Unicode block
characters, for a smooth display. Bars appear as grids (to the characters, for a smooth display. Bars appear as grids (to the
extent the font allows)." extent the font allows)."
;; http://en.wikipedia.org/wiki/Block_Elements ;; https://en.wikipedia.org/wiki/Block_Elements
;; best viewed with the "DejaVu Sans Mono" font. ;; best viewed with the "DejaVu Sans Mono" font.
(orgtbl-ascii-draw value min max width (orgtbl-ascii-draw value min max width
" \u258F\u258E\u258D\u258C\u258B\u258A\u2589")) " \u258F\u258E\u258D\u258C\u258B\u258A\u2589"))

2
lisp/org.el
View File

@ -1933,7 +1933,7 @@ taken from the (otherwise obsolete) variable `org-todo-interpretation'."
(choice (choice
:tag "Interpretation" :tag "Interpretation"
;;Quick and dirty way to see ;;Quick and dirty way to see
;;`org-todo-interpretations'. This takes the ;;`org-todo-interpretation'. This takes the
;;place of item arguments ;;place of item arguments
:convert-widget :convert-widget
(lambda (widget) (lambda (widget)

4
lisp/ox.el
View File

@ -5377,7 +5377,7 @@ transcoding it."
(apostrophe :utf-8 "’" :html "’")) (apostrophe :utf-8 "’" :html "’"))
("da" ("da"
;; one may use: »...«, "...", ›...‹, or '...'. ;; one may use: »...«, "...", ›...‹, or '...'.
;; http://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/ ;; https://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/
;; LaTeX quotes require Babel! ;; LaTeX quotes require Babel!
(primary-opening (primary-opening
:utf-8 "»" :html "»" :latex ">>" :texinfo "@guillemetright{}") :utf-8 "»" :html "»" :latex ">>" :texinfo "@guillemetright{}")
@ -5482,7 +5482,7 @@ transcoding it."
:texinfo "@guillemetright{}") :texinfo "@guillemetright{}")
(apostrophe :utf-8 "’" :html "’")) (apostrophe :utf-8 "’" :html "’"))
("ru" ("ru"
;; http://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5 ;; https://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5
;; http://www.artlebedev.ru/kovodstvo/sections/104/ ;; http://www.artlebedev.ru/kovodstvo/sections/104/
(primary-opening :utf-8 "«" :html "&laquo;" :latex "{}<<" (primary-opening :utf-8 "«" :html "&laquo;" :latex "{}<<"
:texinfo "@guillemetleft{}") :texinfo "@guillemetleft{}")