summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f5d770d256b..f631e1c3c2c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-25 Dave Love <fx@gnu.org>
+
+ * coding.c (encode_eol): Add null statement after label.
+
2000-05-25 Eli Zaretskii <eliz@is.elta.co.il>
* w16select.c (Fw16_set_clipboard_data): Fix the change from
diff --git a/src/coding.c b/src/coding.c
index a46f2692562..b40c973fd00 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2759,6 +2759,7 @@ encode_eol (coding, source, destination, src_bytes, dst_bytes)
}
src_base = src;
label_end_of_loop:
+ ;
}
else
{
@@ -6181,6 +6182,7 @@ See also the function `find-operation-coding-system'.");
"Coding system to use with system messages.");
Vlocale_coding_system = Qnil;
+ /* The eol mnemonics are reset in startup.el system-dependently. */
DEFVAR_LISP ("eol-mnemonic-unix", &eol_mnemonic_unix,
"*String displayed in mode line for UNIX-like (LF) end-of-line format.");
eol_mnemonic_unix = build_string (":");
@@ -6269,3 +6271,4 @@ emacs_strerror (error_number)
}
#endif /* emacs */
+(encode_eol):