From ddcccbc012a5a279e037f15ce9dd13dfb77f1a0e Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 23 Sep 2020 13:35:55 +0200 Subject: [PATCH 1/2] Backport commit 78eacf31e from Emacs ; Fix many typos in symbols in docs and comments 78eacf31e8fe182801ad1943fac717b75fcf286b Stefan Kangas Fri Oct 2 13:29:45 2020 +0200 --- lisp/ol-bibtex.el | 2 +- lisp/org-num.el | 2 +- lisp/org.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ol-bibtex.el b/lisp/ol-bibtex.el index 18ee95e5a..e8f246e7f 100644 --- a/lisp/ol-bibtex.el +++ b/lisp/ol-bibtex.el @@ -317,7 +317,7 @@ is non-nil." "Controls whether inherited tags are converted to bibtex keywords. It is relevant only if `org-bibtex-tags-are-keywords' is non-nil. 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 :version "26.1" :package-version '(Org . "8.3") diff --git a/lisp/org-num.el b/lisp/org-num.el index a5b044e0d..167db18ed 100644 --- a/lisp/org-num.el +++ b/lisp/org-num.el @@ -131,7 +131,7 @@ For example, add \"ARCHIVE\" to this list to avoid numbering archived sub-trees. 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." :group 'org-appearance :package-version '(Org . "9.3") diff --git a/lisp/org.el b/lisp/org.el index bd67e5423..9450308f8 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1933,7 +1933,7 @@ taken from the (otherwise obsolete) variable `org-todo-interpretation'." (choice :tag "Interpretation" ;;Quick and dirty way to see - ;;`org-todo-interpretations'. This takes the + ;;`org-todo-interpretation'. This takes the ;;place of item arguments :convert-widget (lambda (widget) From 9a6689f9ce1cc33a3435381c9bc94f5e42b39bdf Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 1 Oct 2020 15:24:21 +0200 Subject: [PATCH 2/2] Backport commit c6fa0ad31 from Emacs ; Prefer https to http in many URLs c6fa0ad315e38167cb81a4d8c143cc53ad783cc3 Stefan Kangas Thu Oct 1 15:28:15 2020 +0200 --- lisp/ob-plantuml.el | 2 +- lisp/ob-ruby.el | 4 ++-- lisp/ob-sass.el | 2 +- lisp/ob-stan.el | 2 +- lisp/org-table.el | 4 ++-- lisp/ox.el | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 4d10a68f4..e692bf7cd 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -26,7 +26,7 @@ ;; Org-Babel support for evaluating plantuml script. ;; ;; 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: diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 44017dcf7..669c2eabf 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -30,10 +30,10 @@ ;; - ruby and irb executables :: http://www.ruby-lang.org/ ;; ;; - 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 -;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el +;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el ;;; Code: (require 'ob) diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el index 706005d5b..33d8ef7e4 100644 --- a/lisp/ob-sass.el +++ b/lisp/ob-sass.el @@ -35,7 +35,7 @@ ;;; 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: (require 'ob) diff --git a/lisp/ob-stan.el b/lisp/ob-stan.el index 7a9fb56da..00aa8fb28 100644 --- a/lisp/ob-stan.el +++ b/lisp/ob-stan.el @@ -41,7 +41,7 @@ ;; For more information and usage examples, visit ;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html ;; -;; [1] http://mc-stan.org/ +;; [1] https://mc-stan.org/ ;;; Code: (require 'ob) diff --git a/lisp/org-table.el b/lisp/org-table.el index a3c49874c..112b1e171 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -6203,7 +6203,7 @@ which will prompt for the width." ;; Here are two examples of different styles. ;; 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 ;; - orgtbl-ascii-draw (the default ascii) ;; - 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 characters, for a smooth display. Bars appear as grids (to the 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. (orgtbl-ascii-draw value min max width " \u258F\u258E\u258D\u258C\u258B\u258A\u2589")) diff --git a/lisp/ox.el b/lisp/ox.el index 9852cfd21..6dd2cd4a0 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -5377,7 +5377,7 @@ transcoding it." (apostrophe :utf-8 "’" :html "’")) ("da" ;; 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! (primary-opening :utf-8 "»" :html "»" :latex ">>" :texinfo "@guillemetright{}") @@ -5482,7 +5482,7 @@ transcoding it." :texinfo "@guillemetright{}") (apostrophe :utf-8 "’" :html "’")) ("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/ (primary-opening :utf-8 "«" :html "«" :latex "{}<<" :texinfo "@guillemetleft{}")