[elpa] externals/org d3d84ff6b9: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit d3d84ff6b9a959bb28b554d653ad596af04755e4
Merge: 2a4fdffac1 ec63072247
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 doc/org-manual.org    | 26 +++++++++++++-------------
 etc/ORG-NEWS          | 12 ++++++------
 lisp/ob-sql.el        |  2 +-
 lisp/ol.el            |  2 +-
 lisp/org-agenda.el    |  2 +-
 lisp/org-element.el   |  2 +-
 lisp/org-fold-core.el |  2 +-
 lisp/org-persist.el   |  2 +-
 lisp/org-src.el       |  2 +-
 lisp/org.el           |  9 ++++++---
 lisp/ox-latex.el      |  2 +-
 11 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 83410fb010..6cf51ebcac 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -27,7 +27,7 @@ Authoring Org files is best supported by Emacs, but you can 
view,
 understand, and change them with any text editor.
 
 As an authoring tool, Org helps you write structured documents and
-provides exporting facilities. Org files can also be used for literate
+provides exporting facilities.  Org files can also be used for literate
 programming and reproducible research.  As a TODO lists manager, Org
 helps you organize your tasks in a flexible way, from daily needs to
 detailed project-planning, allowing logging, multiple views on your
@@ -3359,7 +3359,7 @@ Here is the full set of built-in link types:
 
 - =gnus=, =rmail=, =mhe= ::
 
-  Link to messages or folders from a given Emacs' MUA.
+  Link to messages or folders from a given Emacs MUA.
 
 - =help= ::
 
@@ -16586,7 +16586,7 @@ BACKEND is the export backend being used, as a symbol."
    (lambda ()
      (delete-region (point) (line-beginning-position 2))
      ;; We need to tell `org-map-entries' to not skip over heading at
-     ;; point. Otherwise, it would continue from _next_ heading. See
+     ;; point.  Otherwise, it would continue from _next_ heading.  See
      ;; the docstring of `org-map-entries' for details.
      (setq org-map-continue-from (point)))))
 
@@ -17696,7 +17696,7 @@ Org currently includes the following export processors:
   - bibtex :: this export processor uses BibTeX, the historical
     bibliographic processor used with LaTeX, thus allowing the use of
     data and style files compatible with this processor (including a
-    large number of publishers' styles). It only supports LaTeX's
+    large number of publishers' styles).  It only supports LaTeX's
     =\cite= and =\nocite= commands.
 
   - natbib :: as with the =bibtex= processor, but using the LaTeX
@@ -17741,15 +17741,15 @@ your LaTeX installation, it won't export to anything 
but PDF.
 #+vindex: org-cite-biblatex-options
 #+texinfo: @noindent
 specifies the =biblatex= export processor with the default =numeric=
-style and the =bibtex= backend. Always define the style first and then
+style and the =bibtex= backend.  Always define the style first and then
 the rest of load-time options for the =biblatex=
-package. Alternatively, you can use the ~key=val,key=val~ format for
+package.  Alternatively, you can use the ~key=val,key=val~ format for
 the options as documented in the =biblatex= package documentation:
 
 : #+cite_export: biblatex backend=bibtex,style=numeric
 
 The ~org-cite-biblatex-options~ variable in your Emacs configuration
-uses this format. It will only export to PDF, since it relies on the
+uses this format.  It will only export to PDF, since it relies on the
 ~biblatex~ processor of your LaTeX installation.
 
 ** Bibliography printing
@@ -19460,10 +19460,10 @@ the tangled file's executable permission.
 The =tangle-mode= header argument specifies what permissions to set
 for tangled files by ~set-file-modes~.  Permissions are given by an
 octal value, which can be provided calling the ~identity~ function on
-an elisp octal value. For instance, to create a read-only file one may
-use =:tangle-mode (identity #o444)=. To reduce the verbosity required,
-an octal shorthand is defined, =oXXX= (=o= for octal). Using this, our
-read-only example is =:tangle-mode o444=. Omitting the =o= prefix will
+an elisp octal value.  For instance, to create a read-only file one may
+use =:tangle-mode (identity #o444)=.  To reduce the verbosity required,
+a octal shorthand is defined, =oXXX= (=o= for octal).  Using this, our
+read-only example is =:tangle-mode o444=.  Omitting the =o= prefix will
 cause the argument to be interpreted as an integer, which can lead to
 unexpected results (=444= is the same as =o674=).
 Two other shorthands are recognized, ls-style strings like
@@ -19472,7 +19472,7 @@ Note that chmod-style permissions are based on
 ~org-babel-tangle-default-file-mode~, which is =#o544= by default.
 
 When =:tangle-mode= and =:shebang= are both specified, the give
-=:tangle-mode= will override the permissions from =:shebang=. When
+=:tangle-mode= will override the permissions from =:shebang=.  When
 multiple source code blocks tangle to a single file with conflicting
 =:tangle-mode= header arguments, Org's behavior is undefined.
 
@@ -23236,7 +23236,7 @@ than 30 stars.  This is a hard-coded limitation of 
~lmax~ in
 2003, not the beginning of time.
 
 [fn:29] On computers using macOS, idleness is based on actual user
-idleness, not just Emacs' idle time.  For X11, you can install a
+idleness, not just Emacs's idle time.  For X11, you can install a
 utility program =x11idle.c=, available in the =org-contrib/=
 repository, or install the xprintidle package and set it to the
 variable ~org-clock-x11idle-program-name~ if you are running Debian,
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 27b02fa0e2..8a2a1ec0e6 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -707,7 +707,7 @@ The old name is obsolete.
 
 ** New and changed options
 
-# Chanes deadling with changing default values of customizations,
+# Changes dealing with changing default values of customizations,
 # adding new customizations, or changing the interpretation of the
 # existing customizations.
 
@@ -770,7 +770,7 @@ This new hook runs when a note has been stored.
 Sorting of agenda items, tables, menus, headlines, etc can now be
 controlled using a new custom option ~org-sort-function~.
 
-By default, Org mode sorts things according to the operation system
+By default, Org mode sorts things according to the operating system
 language.  However, language sorting rules may or may not produce good
 results depending on the use case.  For example, multi-language
 documents may be sorted weirdly when sorting rules for system language
@@ -840,8 +840,8 @@ Org-Org (=ox-org=) export.  The default value is ~t~.
 
 *** New option ~org-babel-comint-fallback-regexp-threshold~
 
-Org babel is often using Emacs' interactive REPL feature to implement
-:session functionality in code blocks. However, Emacs' REPLs use
+Org babel is often using Emacs's interactive REPL feature to implement
+:session functionality in code blocks.  However, Emacs's REPLs use
 heuristics to detect which lines in the REPL buffer correspond to
 output and which lines are user prompts.
 
@@ -2137,7 +2137,7 @@ When ~org-latex-src-block-backend~ is set to ~engraved~,
 =engrave-faces-latex= from 
[[http://elpa.gnu.org/packages/engrave-faces.html][engrave-faces]] is used to 
transcode source
 blocks to LaTeX. This requires the =fvextra=, =float=, and (by
 default, but not necessarily) =tcolorbox= LaTeX packages be
-installed. It uses Emacs' font-lock information, and so tends to
+installed. It uses Emacs's font-lock information, and so tends to
 produce results superior to Minted or Listings.
 *** Support for =#+include=-ing URLs
 
@@ -8328,7 +8328,7 @@ that Calc formulas can operate on them.
 
 **** org-ctags.el (Paul Sexton)
 
-     Targets like =<<my target>>= can now be found by Emacs' etag
+     Targets like =<<my target>>= can now be found by Emacs's etag
      functionality, and Org-mode links can be used to link to
      etags, also in non-Org-mode files.  For details, see the file
      /org-ctags.el/.
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index e51eed1bc3..d7bcaa0973 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -218,7 +218,7 @@ Pass nil to omit that arg."
   "Convert FILE to OS standard file name.
 If in Cygwin environment, uses Cygwin specific function to
 convert the file name.  In a Windows-NT environment, do nothing.
-Otherwise, use Emacs' standard conversion function."
+Otherwise, use Emacs's standard conversion function."
   (cond ((fboundp 'cygwin-convert-file-name-to-windows)
         (format "%S" (cygwin-convert-file-name-to-windows file)))
        ((string= "windows-nt" system-type) file)
diff --git a/lisp/ol.el b/lisp/ol.el
index 8860f4ace0..52ea62d69d 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -542,7 +542,7 @@ original string length.")
 (defvar-local org-target-link-regexps nil
   "List of regular expressions matching radio targets in plain text.
 This list is non-nil, when a single regexp would be too long to match
-all the possible targets, exceeding Emacs' regexp length limit.")
+all the possible targets, exceeding Emacs's regexp length limit.")
 
 (defvar org-link-types-re nil
   "Matches a link that has a url-like prefix like \"http:\".")
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8513e70d79..85ba43b782 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2230,7 +2230,7 @@ This is an internal flag indicating either temporary or 
extended
 agenda restriction.  Specifically, it is set to t if the agenda
 is restricted to an entire file, and is set to the corresponding
 buffer if the agenda is restricted to a part of a file, e.g. a
-region or a substree.  In the latter case,
+region or a subtree.  In the latter case,
 `org-agenda-restrict-begin' and `org-agenda-restrict-end' are set
 to the beginning and the end of the part.
 
diff --git a/lisp/org-element.el b/lisp/org-element.el
index d6ad9824ae..ed6e0c6ea8 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7979,7 +7979,7 @@ the cache."
     (unless (memq granularity '( headline headline+inlinetask
                                  greater-element element))
       (error "Unsupported granularity: %S" granularity))
-    ;; Make TO-POS marker.  Otherwise, buffer edits may garble the the
+    ;; Make TO-POS marker.  Otherwise, buffer edits may garble the
     ;; process.
     (unless (markerp to-pos)
       (let ((mk (make-marker)))
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 4eb875aff2..db8e8078b2 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -172,7 +172,7 @@
 
 ;; The isearch behavior is controlled on per-folding-spec basis by
 ;; setting `isearch-open' and `isearch-ignore' folding spec
-;; properties.  The the docstring of `org-fold-core--specs' for more details.
+;; properties.  See the docstring of `org-fold-core--specs' for more details.
 
 ;;; Handling edits inside folded text
 
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 6b14c05ecb..7ff6c07310 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -459,7 +459,7 @@ FORMAT and ARGS are passed to `message'."
   ;; With all this in mind, we ensure `write-region-inhibit-fsync' is
   ;; set.
   ;;
-  ;; To read more about this, see the comments in Emacs' fileio.c, in
+  ;; To read more about this, see the comments in Emacs's fileio.c, in
   ;; particular the large comment block in init_fileio.
   (let ((write-region-inhibit-fsync t)
         ;; We set UTF-8 here and in `org-persist--read-elisp-file'
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 03159d5d30..6f229c2382 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -663,7 +663,7 @@ Leave point in edit buffer."
 (defvar org-src-fontify-natively) ; Defined in org.el
 (defun org-src-font-lock-fontify-block (lang start end)
   "Fontify code block between START and END using LANG's syntax.
-This function is called by Emacs' automatic fontification, as long
+This function is called by Emacs's automatic fontification, as long
 as `org-src-fontify-natively' is non-nil."
   (let ((modified (buffer-modified-p)) native-tab-width)
     (remove-text-properties start end '(face nil))
diff --git a/lisp/org.el b/lisp/org.el
index f017745ae4..362f0c1582 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3796,7 +3796,7 @@ You need to reload Org or to restart Emacs after setting 
this.")
   "Alist of characters and faces to emphasize text.
 Text starting and ending with a special character will be emphasized,
 for example *bold*, _underlined_ and /italic/.  This variable sets the
-the face to be used by font-lock for highlighting in Org buffers.
+face to be used by font-lock for highlighting in Org buffers.
 Marker characters must be one of */_=~+.
 
 You need to reload Org or to restart Emacs after customizing this."
@@ -20821,8 +20821,11 @@ end."
     (when (and (not (eq org-yank-image-save-method 'attach))
                (not (file-directory-p org-yank-image-save-method)))
       (make-directory org-yank-image-save-method t))
-    (with-temp-file absname
-      (insert data))
+    ;; DATA is a raw image.  Tell Emacs to write it raw, without
+    ;; trying to auto-detect the coding system.
+    (let ((coding-system-for-write 'emacs-internal))
+      (with-temp-file absname
+        (insert data)))
     (if (null (eq org-yank-image-save-method 'attach))
         (setq link (org-link-make-string (concat "file:" (file-relative-name 
absname))))
       (require 'org-attach)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index fcb0e20dc7..79df1fe119 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -993,7 +993,7 @@ The most comprehensive option can be set with,
 
 which causes source code to be run through
 `engrave-faces-latex-buffer', which generates colorings using
-Emacs' font-lock information.  This requires the Emacs package
+Emacs's font-lock information.  This requires the Emacs package
 engrave-faces (available from GNU ELPA), and the LaTeX package
 fvextra be installed.