[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b4c6ab8: Merge from origin/emacs-28
|
From: |
Stefan Kangas |
|
Subject: |
master b4c6ab8: Merge from origin/emacs-28 |
|
Date: |
Sat, 13 Nov 2021 01:17:13 -0500 (EST) |
branch: master
commit b4c6ab8cb67be4d5b3e0041981968c6cce4afe89
Merge: a500835 42d4e24
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
42d4e24ff3 ; Fix typos
0d0125daae Improve documentation of 'decode-coding-region'
---
ChangeLog.3 | 10 +++++-----
doc/lispref/nonascii.texi | 26 ++++++++++++++++++++++----
doc/misc/ChangeLog.1 | 2 +-
doc/misc/efaq-w32.texi | 2 +-
doc/misc/flymake.texi | 4 ++--
doc/misc/org.org | 2 +-
etc/PROBLEMS | 2 +-
lisp/ChangeLog.12 | 2 +-
lisp/cedet/ChangeLog.1 | 2 +-
lisp/env.el | 2 +-
lisp/erc/erc-services.el | 2 +-
lisp/mh-e/ChangeLog.1 | 4 ++--
lisp/progmodes/flymake.el | 4 ++--
lisp/progmodes/xref.el | 2 +-
lisp/xdg.el | 4 ++--
src/ChangeLog.11 | 4 ++--
src/coding.c | 9 +++++----
test/lisp/mh-e/mh-utils-tests.el | 2 +-
18 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/ChangeLog.3 b/ChangeLog.3
index 9ec19e9..ad65969 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -48398,10 +48398,10 @@
Impl. json-pretty-print with replace-region-contents + minimization
* lisp/json.el (json-pretty-print): Use the new
- replace-region-contents. Add prefix arg for minimzation.
- (json-pretty-print-buffer): Add prefix arg for minimzation.
- (json-pretty-print-buffer-ordered): Add prefix arg for minimzation.
- (json-pretty-print-ordered): Add prefix arg for minimzation.
+ replace-region-contents. Add prefix arg for minimization.
+ (json-pretty-print-buffer): Add prefix arg for minimization.
+ (json-pretty-print-buffer-ordered): Add prefix arg for minimization.
+ (json-pretty-print-ordered): Add prefix arg for minimization.
2019-02-08 Tassilo Horn <tsdh@gnu.org>
@@ -122196,7 +122196,7 @@
2012-08-15 Tom Tromey <tromey@redhat.com>
- This parameterizes the GC a bit to make it thread-ready.
+ This parametrizes the GC a bit to make it thread-ready.
The basic idea is that whenever a thread "exits lisp" -- that is,
releases the global lock in favor of another thread -- it must save
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 6980920..24117b50 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1048,9 +1048,9 @@ Alternativnyj, and KOI8.
Every coding system specifies a particular set of character code
conversions, but the coding system @code{undecided} is special: it
leaves the choice unspecified, to be chosen heuristically for each
-file, based on the file's data. The coding system @code{prefer-utf-8}
-is like @code{undecided}, but it prefers to choose @code{utf-8} when
-possible.
+file or string, based on the file's or string's data, when they are
+decoded or encoded. The coding system @code{prefer-utf-8} is like
+@code{undecided}, but it prefers to choose @code{utf-8} when possible.
In general, a coding system doesn't guarantee roundtrip identity:
decoding a byte sequence using a coding system, then encoding the
@@ -1921,9 +1921,24 @@ length of the decoded text. If that buffer is a unibyte
buffer
the decoded text (@pxref{Text Representations}) is inserted into the
buffer as individual bytes.
+@cindex @code{charset}, text property on buffer text
This command puts a @code{charset} text property on the decoded text.
The value of the property states the character set used to decode the
original text.
+
+@cindex undecided coding-system, when decoding
+This command detects the encoding of the text if necessary. If
+@var{coding-system} is @code{undecided}, the command detects the
+encoding of the text based on the byte sequences it finds in the text,
+and also detects the type of end-of-line convention used by the text
+(@pxref{Lisp and Coding Systems, eol type}). If @var{coding-system}
+is @code{undecided-@var{eol-type}}, where @var{eol-type} is
+@code{unix}, @code{dos}, or @code{mac}, then the command detects only
+the encoding of the text. Any @var{coding-system} that doesn't
+specify @var{eol-type}, as in @code{utf-8}, causes the command to
+detect the end-of-line convention; specify the encoding completely, as
+in @code{utf-8-unix}, if the EOL convention used by the text is known
+in advance, to prevent any automatic detection.
@end deffn
@defun decode-coding-string string coding-system &optional nocopy buffer
@@ -1936,13 +1951,16 @@ trivial. To make explicit decoding useful, the
contents of
values, but a multibyte string is also acceptable (assuming it
contains 8-bit bytes in their multibyte form).
+This function detects the encoding of the string if needed, like
+@code{decode-coding-region} does.
+
If optional argument @var{buffer} specifies a buffer, the decoded text
is inserted in that buffer after point (point does not move). In this
case, the return value is the length of the decoded text. If that
buffer is a unibyte buffer, the internal representation of the decoded
text is inserted into it as individual bytes.
-@cindex @code{charset}, text property
+@cindex @code{charset}, text property on strings
This function puts a @code{charset} text property on the decoded text.
The value of the property states the character set used to decode the
original text:
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index c050e5d..be2a7ca 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -5965,7 +5965,7 @@
names when publishing to the source directory.
(Clean view): Document `org-indent-mode'.
(Clocking work time): Add documentation for the
- new :timetamp option when creating a clock report.
+ new :timestamp option when creating a clock report.
(Paragraphs): Fix many typos.
(Plain lists): Remove duplicate explanation about the
`C-c *' command.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index ba1077d..a5b5251 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -628,7 +628,7 @@ REGEDIT4
@node Swap Caps 98
@subsubsection Windows 95/98/ME
-Microsoft has a tool called keyremap that is part of their Kernel Toys add ons
+Microsoft has a tool called keyremap that is part of their Kernel Toys add-ons
for Windows 95. The tool has also been confirmed to work on Windows 98.
@node Make Emacs like a Windows app
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 309bed7..f741ee5 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -218,7 +218,7 @@ can use the variables @code{flymake-mode-line-format} and
@cindex disabled backends
@cindex backends, disabled
-As Flymake supports multiple simutaneously active external backends,
+As Flymake supports multiple simultaneously active external backends,
is becomes useful to monitor their status. For example, some backends
may take longer than others to respond or complete, and some may
decide to @emph{disable} themselves if they are not suitable for the
@@ -343,7 +343,7 @@ The following sections discuss each approach in detail.
To customize the appearance of error types, the user must set
properties on the symbols associated with each diagnostic type.
-The three standard diagnostic keyowrd symbols -- @code{:error},
+The three standard diagnostic keyword symbols -- @code{:error},
@code{:warning} and @code{:note} -- have pre-configured appearances.
However a backend may define more (@pxref{Backend functions}).
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 17fd2dc..df2724d 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16556,7 +16556,7 @@ identifying a reference in the bibliography.
- Each key starts with the character =@=.
- Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
- a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving informations useful or
necessary
+ a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or
necessary
fo the comprehension of the citation but not included in the
reference.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 9bd06ca..f506881 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2767,7 +2767,7 @@ its path available to Emacs. Errors such as:
Error: Internal native compiler error failed to compile
indicate Emacs can't find the library in running time. One can set
-the "LIBRARY_PATH" environment variable in the early initalization
+the "LIBRARY_PATH" environment variable in the early initialization
file; for example:
(setenv "LIBRARY_PATH"
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 5d42457..d841a75 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -182,7 +182,7 @@
2007-04-19 Glenn Morris <rgm@gnu.org>
- * calendar/todo-mode.el: Fix typo: "threshhold" -> "threshold".
+ * calendar/todo-mode.el: Fix typo for "threshold".
2007-04-18 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index fb3dcd2..0fe5573 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -1705,7 +1705,7 @@
2012-07-29 Paul Eggert <eggert@cs.ucla.edu>
- inaccessable -> inaccessible spelling fix (Bug#10052)
+ "inaccessible" spelling fix (Bug#10052)
* semantic/wisent/comp.el (wisent-inaccessible-symbols):
Rename from wisent-inaccessable-symbols, fixing a misspelling.
Caller changed.
diff --git a/lisp/env.el b/lisp/env.el
index 2f7cd9d..fc48059 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -220,7 +220,7 @@ in the environment list of the selected frame."
;;;###autoload
(defmacro with-environment-variables (variables &rest body)
- "Set VARIABLES in the environent and execute BODY.
+ "Set VARIABLES in the environment and execute BODY.
VARIABLES is a list of variable settings of the form (VAR VALUE),
where VAR is the name of the variable (a string) and VALUE
is its value (also a string).
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index adb3f52..5e4cef5 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -492,7 +492,7 @@ Returns t if the message could be sent, nil otherwise."
Identification will either use NICK or the current nick if not
provided, and some password obtained through
`erc-nickserv-get-password' (which see). If no password can be
-found, an error is reported trough `erc-error'.
+found, an error is reported through `erc-error'.
Interactively, the user will be prompted for NICK, an empty
string meaning to default to the current nick.
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index b0fdd02..e87bb34 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -10471,7 +10471,7 @@
mh-header-subject-font-lock instead of regexp for subject headers,
which may go multiple lines.
(mh-header-subject-font-lock): New function.
- Fix typos (hightlight -> highlight).
+ Fix typos ("highlight").
2001-12-04 Eric Ding <ericding@alum.mit.edu>
@@ -10881,7 +10881,7 @@
loop in emacs20 font-locking.
(mh-header-field-font-lock): Preventive fix with similar change.
- * mh-comp.el (mh-reply-show-message-p): Typo. diplayed -> displayed.
+ * mh-comp.el (mh-reply-show-message-p): Fix typo for "displayed".
* MH-E-NEWS: Same.
* mh-e.el (mh-folder-tool-bar-map): Bug fix. I had
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 403925c..4f9506c 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -332,7 +332,7 @@ retrieval with `flymake-diagnostic-data'.
If LOCUS is a buffer BEG and END should be buffer positions
inside it. If LOCUS designates a file, BEG and END should be a
cons (LINE . COL) indicating a file position. In this second
-case, END may be ommited in which case the region is computed
+case, END may be omitted in which case the region is computed
using `flymake-diag-region' if the diagnostic is appended to an
actual buffer.
@@ -870,7 +870,7 @@ and other buffers."
(dolist (d diags) (setf (flymake--diag-backend d) backend))
(save-restriction
(widen)
- ;; First, clean up. Remove diagnostics from bookeeping lists and
+ ;; First, clean up. Remove diagnostics from bookkeeping lists and
;; their overlays from buffers.
;;
(cond
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 26188bb..edb98aa 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1028,7 +1028,7 @@ GROUP is a string for decoration purposes and XREF is an
(run-hooks 'xref-after-update-hook))
(defun xref--group-name-for-display (group project-root)
- "Return GROUP formatted in the prefered style.
+ "Return GROUP formatted in the preferred style.
The style is determined by the value of `xref-file-name-display'.
If GROUP looks like a file name, its value is formatted according
diff --git a/lisp/xdg.el b/lisp/xdg.el
index 05fc3d7..6055898 100644
--- a/lisp/xdg.el
+++ b/lisp/xdg.el
@@ -121,7 +121,7 @@ According to the XDG Base Directory Specification version
\"$XDG_CONFIG_DIRS defines the preference-ordered set of base
directories to search for configuration files in addition to
the $XDG_CONFIG_HOME base directory. The directories in
- $XDG_CONFIG_DIRS should be seperated with a colon ':'.
+ $XDG_CONFIG_DIRS should be separated with a colon ':'.
\"If $XDG_CONFIG_DIRS is either not set or empty, a value equal to
/etc/xdg should be used.\""
@@ -139,7 +139,7 @@ According to the XDG Base Directory Specification version
\"$XDG_DATA_DIRS defines the preference-ordered set of base
directories to search for data files in addition to the
$XDG_DATA_HOME base directory. The directories in
- $XDG_DATA_DIRS should be seperated with a colon ':'.
+ $XDG_DATA_DIRS should be separated with a colon ':'.
\"If $XDG_DATA_DIRS is either not set or empty, a value equal
to /usr/local/share/:/usr/share/ should be used.\""
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 41c35ba..cf5e7b7 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -22399,7 +22399,7 @@
* Makefile.in (${lispsource}international/charprop.el):
Delete this target.
- * search.c (boyer_moore): Fix incorrect synching of the trunk and
+ * search.c (boyer_moore): Fix incorrect syncing of the trunk and
emacs-unicode-2.
2008-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -23177,7 +23177,7 @@
2008-02-01 Kenichi Handa <handa@ni.aist.go.jp>
* xfaces.c (face_for_overlay_string): Call lookup_face with
- correct arguments (fix of synching with the trunk).
+ correct arguments (fix of syncing with the trunk).
2008-02-01 Kenichi Handa <handa@m17n.org>
diff --git a/src/coding.c b/src/coding.c
index 7030a53..02dccf5 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9455,11 +9455,12 @@ code_convert_region (Lisp_Object start, Lisp_Object end,
DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region,
3, 4, "r\nzCoding system: ",
doc: /* Decode the current region from the specified coding system.
+Interactively, prompt for the coding system to decode the region.
-What's meant by \"decoding\" is transforming bytes into text
-(characters). If, for instance, you have a region that contains data
-that represents the two bytes #xc2 #xa9, after calling this function
-with the utf-8 coding system, the region will contain the single
+\"Decoding\" means transforming bytes into readable text (characters).
+If, for instance, you have a region that contains data that represents
+the two bytes #xc2 #xa9, after calling this function with the utf-8
+coding system, the region will contain the single
character ?\\N{COPYRIGHT SIGN}.
When called from a program, takes four arguments:
diff --git a/test/lisp/mh-e/mh-utils-tests.el b/test/lisp/mh-e/mh-utils-tests.el
index ed97923..d9a26e5 100644
--- a/test/lisp/mh-e/mh-utils-tests.el
+++ b/test/lisp/mh-e/mh-utils-tests.el
@@ -152,7 +152,7 @@ select which."
(defun mh-test-utils-setup ()
"Set dynamically bound variables needed by mock and/or variants.
Call `mh-variant-set' to look through the directories named by
-envionment variable `TEST_MH_PATH' (default: `mh-path' and `mh-sys-path')
+environment variable `TEST_MH_PATH' (default: `mh-path' and `mh-sys-path')
to find the MH variant to use, if any.
Return the name of the root of the created directory tree, if any."
(when (getenv "TEST_MH_PATH")