summaryrefslogtreecommitdiff
path: root/src/coding.h
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-02-08 09:20:40 -0800
committerGlenn Morris <rgm@gnu.org>2019-02-08 09:20:40 -0800
commit0f9940505f87de74c86de17e8a7bf793d9d8dda4 (patch)
tree0215c1cc88041710fc32a2d17818e8c66c490ca7 /src/coding.h
parent4f138318d3553162ccc6d0e4554456a65324ec25 (diff)
parent0cd7b526a14ead6cbe78df481a2fd975252bb9ac (diff)
downloademacs-0f9940505f87de74c86de17e8a7bf793d9d8dda4.tar.gz
Merge from origin/emacs-26
0cd7b52 (origin/emacs-26) Minor improvements to do strings in callproc.c b8c7017 Improve documentation of 'date-to-time' and 'parse-time-string' 46095a7 Fix downloading of URLs that end in a slash 3b60a0a * doc/misc/eww.texi (Basics): Fix eww keybindings. (Bug#34291) 8e22025 Fix process-thread docstring 459b669 Fix failures of vc-find-revision with non-ASCII file names e9ff190 * doc/lispref/tips.texi (Documentation Tips): Fix quotes. (B... 3e49a08 ; * src/coding.h (struct coding_system): Fix a typo in a comm... b657286 Add documentation for tabulated-list functions in the elisp m... 6e0f67b Fix URL in ucs-normalize.el ce3ae1f * etc/PROBLEMS: Amend entry for profiler bug #34235 to mentio... # Conflicts: # doc/lispref/os.texi
Diffstat (limited to 'src/coding.h')
-rw-r--r--src/coding.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.h b/src/coding.h
index 337ec46315e..58e12d6176a 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -450,7 +450,7 @@ struct coding_system
unsigned char *safe_charsets;
- /* How may heading bytes we can skip for decoding. This is set to
+ /* How many heading bytes we can skip for decoding. This is set to
-1 in setup_coding_system, and updated by detect_coding. So,
when this is equal to the byte length of the text being
converted, we can skip the actual conversion process except for