Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 4 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index e341a71f576..5682fc015ad 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1449,7 +1449,7 @@ decode_coding_utf_8 (struct coding_system *coding)
 }
 
 
-static bool
+bool
 encode_coding_utf_8 (struct coding_system *coding)
 {
   bool multibytep = coding->dst_multibyte;
@@ -3611,7 +3611,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
               || CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS)
             goto invalid_code;
           /* This is a graphic character, we fall down ... */
-
+          FALLTHROUGH;
         case ISO_graphic_plane_1:
           if (charset_id_1 < 0)
             goto invalid_code;
@@ -3646,6 +3646,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
         case ISO_single_shift_2_7:
           if (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS))
             goto invalid_code;
+          FALLTHROUGH;
         case ISO_single_shift_2:
           if (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SINGLE_SHIFT))
             goto invalid_code;
@@ -3797,6 +3798,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
                 {
                 case ']':       /* end of the current direction */
                   coding->mode &= ~CODING_MODE_DIRECTION;
+                  break;
 
                 case '0':       /* end of the current direction */
                 case '1':       /* start of left-to-right direction */