aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorGlenn Morris2018-02-17 07:50:28 -0800
committerGlenn Morris2018-02-17 07:50:28 -0800
commit4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch)
tree6c0a7893b3aab0166b35938338fa289c3a01df74 /src/coding.c
parentcb3863370cbe574810f796726faa39ba0de0a429 (diff)
parente5a29330aae4491fd384bacaff6f453c6434d322 (diff)
downloademacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz
emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes f21f8e6 Document 'desktop-files-not-to-save' d8917eb Improve documentation of Profiling features b228839 Improve indexing of "performance" in ELisp manual ab67b3e Minor change in Emacs manual's VC chapter c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3... 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles 35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c
index 901f806e44b..a16142a9b41 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -252,7 +252,7 @@ decode_coding_XXXX (struct coding_system *coding)
252 CODING_RESULT_XXX indicating how the encoding finished. 252 CODING_RESULT_XXX indicating how the encoding finished.
253 253
254 DST_BYTES zero means that source area and destination area are 254 DST_BYTES zero means that source area and destination area are
255 overlapped, which means that we can produce a encoded text until it 255 overlapped, which means that we can produce an encoded text until it
256 reaches at the head of not-yet-encoded source text. 256 reaches at the head of not-yet-encoded source text.
257 257
258 Below is a template of these functions. */ 258 Below is a template of these functions. */
@@ -3973,7 +3973,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
3973 /* Reset the invocation and designation status to the safest 3973 /* Reset the invocation and designation status to the safest
3974 one; i.e. designate ASCII to the graphic register 0, and 3974 one; i.e. designate ASCII to the graphic register 0, and
3975 invoke that register to the graphic plane 0. This typically 3975 invoke that register to the graphic plane 0. This typically
3976 helps the case that an designation sequence for ASCII "ESC ( 3976 helps the case that a designation sequence for ASCII "ESC (
3977 B" is somehow broken (e.g. broken by a newline). */ 3977 B" is somehow broken (e.g. broken by a newline). */
3978 CODING_ISO_INVOCATION (coding, 0) = 0; 3978 CODING_ISO_INVOCATION (coding, 0) = 0;
3979 CODING_ISO_DESIGNATION (coding, 0) = charset_ascii; 3979 CODING_ISO_DESIGNATION (coding, 0) = charset_ascii;