Merge from origin/emacs-26

7668717d6f Merge from Gnulib
9e4d523427 * lisp/epg.el (epg-start-sign): Replace obsolete functions.
26c58f31a8 Small fix for erc-logging-enabled
34b41e3bc6 Quieten semantic normal usage
e25f961e37 Avoid irrelevant hyperlink in doc string of 'epa-pinentry-...
ec2636513c * doc/misc/tramp.texi (Remote processes): Mention gdb rest...
918a052a42 Query background for gnome terminal version 3.22 (Bug#29716)
1dfc27576a Make pixel-wise scrolling less laggy
f92264fc2a Fix child frame placement issues (bug#29953)
a5f718c4c5 ; * doc/lispref/text.texi (Change Hooks): Fix last change.
e876f5f9fb Describe the precise interaction of complex primitives wit...
3a22097cf6 Fix valgrind report in call-interactively
d5f1c87bfe * src/editfns.c (Fsave_excursion): Doc fix.  (Bug#30001)
b8d74c4578 Fix mark-defun when there's no spaces between successive d...
a377c652b5 Fix Dired display and operations on file names with raw bytes
d9d6e8a04c ; Comments related to src/termcap.c
f8a07fa6b1 Improve documentation of 'gdb-many-windows'
f82400798e Fix failures in smerge-mode on MS-Windows

1 files changed, 16 insertions, 3 deletions

diff --git a/src/coding.c b/src/coding.c
index da625403441..901f806e44b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7437,10 +7437,23 @@ decode_coding (struct coding_system *coding)
 
           while (nbytes-- > 0)
             {
-              int c = *src++;
+              int c;
 
-              if (c & 0x80)
-                c = BYTE8_TO_CHAR (c);
+              /* Copy raw bytes in their 2-byte forms from multibyte
+                 text as single characters.  */
+              if (coding->src_multibyte
+                  && CHAR_BYTE8_HEAD_P (*src) && nbytes > 0)
+                {
+                  c = STRING_CHAR_ADVANCE (src);
+                  nbytes--;
+                }
+              else
+                {
+                  c = *src++;
+
+                  if (c & 0x80)
+                    c = BYTE8_TO_CHAR (c);
+                }
               coding->charbuf[coding->charbuf_used++] = c;
             }
           produce_chars (coding, Qnil, 1);