Merge branch 'bugfix'

doc/org-manual.org

@@ -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= ::
 
@@ -19462,7 +19462,7 @@ 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
+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=).
@@ -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,

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/.

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)

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:\".")

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.
 

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

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
 

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'

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

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))
+    ;; 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))
+        (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)

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.