Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108

diff --cc etc/HELLO
index e12a901,25c2f5f..821159b
--- 1/etc/HELLO
--- 2/etc/HELLO
+++ b/etc/HELLO
@@@ -1,12 -1,12 +1,12 @@@
  This is a list of ways to say hello in various languages.
  
  Non-ASCII examples:
-   Europe: \e,A!\e(BHola!, Hyv\e,Add\e(B p\e,Ad\e(Biv\e,Add\e(B, Gr\e,A|_\e(B Gott, Bon\e,Cu\e(Bu, Dobr\e,B}\e(B den, Tere p\e,Ad\e(Bevast
-           Cze\e,B6f\e(B!, \e,FCei\\e(B \e,Fsar\e(B, \e,L7T`PRabRcYbU\e(B!, \e$,1J2J0J;J0J@JOJ=J1J0\e(B
+   Europe: \e,A!\e(BHola!, Gr\e,A|_\e(B Gott, Hyv\e,Add\e(B p\e,Ad\e(Biv\e,Add\e(B, Tere \e,Au\e(Bhtust, Bon\e,Cu\e(Bu
+           Cze\e,B6f\e(B!, Dobr\e,B}\e(B den, \e,L7T`PRabRcYbU\e(B!, \e,FCei\\e(B \e,Fsar\e(B, \e$,1J2J0J;J0J@JOJ=J1J0\e(B
    Africa: \e$(3!A!,!>\e(B
    Middle/Near East: \e,Hylem\e(B, \e(38R\e(47d\e(3T!JSa\e(4W\e(3W\e(B
 -  South Asia: \e4\e$,4!8v#")\e0\e$,15h\e1\e4\e$,4!hv#")\e0\e$,15n\e1\e4\e$,4!zv#!)v#")v#"D\e0\e$,15x6-5d6'\e1\e(B, \e4\e$,44Kv#4z\e0\e$,1?(\e1\e4\e$,44hv#4zv#4\7f\e0\e$,1?.\e1\e4\e$,44qv#4{v#3Q\e0\e$,1?8?M>u?>\e1\e4\e$,44av#4z\e0\e$,1?0\e1\e(B, \e4\e$,46<\e0\e$,1@H\e1\e4\e$,46A\e0\e$,1@N\e1\e4\e$,46Kv#6Vv#6)v#6M\e0\e$,1@X@m@5@^\e1\e4\e$,46Cv#6W\e0\e$,1@P@"\e1\e(B, \e4\e$,4*U\e0\e$,1<U\e1\e4\e$,4*M\e0\e$,1<C\e1\e4\e$,4*Hv#)b\e0\e$,1<5<m\e1\e4\e$,4*H\e0\e$,1<5\e1\e4\e$,4*Qv#)b\e0\e$,1<N<m\e1\e(B, \e4\e$(7"7\e0"7\e1\e4$P\e0"!#C"Q\e1!;\e4"Er'"S\e0"E"S\e1\e4"G\e0"G\e1!;\e4"7\e0"7\e1\e4"2r'"[\e0"2"[\e1!;\e4"Dr'"[\e0"D"[\e1\e4"#\e0"#\e1\e4"G\e0"G\e1!>\e(B
 -  South East Asia: \e(1JP:R-\e04U\e1\e(B, \e,TJ\e0GQ\e1J\e04U\e1$\e0CQ\e1:\e(B, Ch\e,1`\e(Bo b\e,1U\e(Bn
 +  South Asia: \e$,15h5n5x6-5d6'\e(B, \e$,1?(?.?8?M>u?>?0\e(B, \e$,1@H@N@X@m@5@^@P@"\e(B, \e$,1<U<C<5<m<5<N<m\e(B, \e$(7"7"!#C"Q!;"E"S"G!;"7"2"[!;"D"["#"G!>\e(B
 +  South East Asia: \e(1JP:R-4U\e(B, \e,TJGQJ4U$CQ:\e(B, Ch\e,1`\e(Bo b\e,1U\e(Bn
    East Asia: \e$ADc:C\e(B, \e$(0*/=(\e(B, \e$B$3$s$K$A$O\e(B, \e$(C>H3gGO<<?d\e(B
    Misc: E\e,C6\e(Bo\e,C~\e(Ban\e,Cx\e(Bo \e,Cf\e(Biu\e,C<\e(Ba\e,C}\e(Bde, \e$,2(3(1('('(5\e(B, \e$,1x \e(B p \e$,1x(\e(B world \e$,1s"\e(B hello p  \e$,2!a\e(B
    CJK variety: GB(\e$AT*Fx\e(B,\e$A?*7"\e(B), BIG5(\e$(0&x86\e(B,\e$(0DeBv\e(B), JIS(\e$B855$\e(B,\e$B3+H/\e(B), KSC(\e$(Cj*Q(\e(B,\e$(CKR[!\e(B)

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/gnus/rfc2047.el
Simple merge

diff --cc lisp/international/quail.el
Simple merge

diff --cc lisp/mail/sendmail.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/term/mac-win.el
index 382a4d8,20a6597..ec6c7fb
--- 1/lisp/term/mac-win.el
--- 2/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1337,14 -1287,19 +1337,19 @@@ correspoinding TextEncodingBase value.
                     (find-coding-systems-string string)))
        (setq coding-system
            (coding-system-change-eol-conversion coding-system 'mac))
-       (when (and (eq system-type 'darwin)
-                (eq coding-system 'japanese-shift-jis-mac))
-       (setq encoding mac-text-encoding-mac-japanese-basic-variant)
-       (setq string (subst-char-in-string ?\\ ?\x80 string))
-       (subst-char-in-string ?\¥ ?\x5c string t))
-       (setq data (mac-code-convert-string
-                 (encode-coding-string string coding-system)
-                 (or encoding coding-system) nil)))
+       (let ((str string))
+       (when (and (eq system-type 'darwin)
+                  (eq coding-system 'japanese-shift-jis-mac))
+         (setq encoding mac-text-encoding-mac-japanese-basic-variant)
+         (setq str (subst-char-in-string ?\\ ?\x80 str))
 -        (subst-char-in-string ?\\e(J\\e(B ?\x5c str t)
++        (subst-char-in-string ?\¥ ?\x5c str t)
+         ;; ASCII-only?
+         (if (string-match "\\`[\x00-\x7f]*\\'" str)
+             (setq str nil)))
+       (and str
+            (setq data (mac-code-convert-string
+                        (encode-coding-string str coding-system)
+                        (or encoding coding-system) nil)))))
      (or data (encode-coding-string string (if (eq (byteorder) ?B)
                                              'utf-16be-mac
                                            'utf-16le-mac)))))

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/casefiddle.c
Simple merge

diff --cc src/coding.c
index d897722,1603b44..3efce13
--- 1/src/coding.c
--- 2/src/coding.c
+++ b/src/coding.c
@@@ -7455,13 -6650,16 +7455,14 @@@ detect_coding_system (src, src_chars, s
    return (highest ? XCAR (val) : val);
  }
  
 +
  DEFUN ("detect-coding-region", Fdetect_coding_region, Sdetect_coding_region,
         2, 3, 0,
 -       doc: /* Detect how the byte sequence in the region is encoded.
 -Return a list of possible coding systems used on decoding a byte
 -sequence containing the bytes in the region between START and END when
 -the coding system `undecided' is specified.  The list is ordered by
 -priority decided in the current language environment.
 +       doc: /* Detect coding system of the text in the region between START and END.
 +Return a list of possible coding systems ordered by priority.
  
- If only ASCII characters are found, it returns a list of single element
+ If only ASCII characters are found (except for such ISO-2022 control
+ characters ISO-2022 as ESC), it returns a list of single element
  `undecided' or its subsidiary coding system according to a detected
  end-of-line format.
  
@@@ -7494,10 -6700,14 +7495,11 @@@ highest priority.  */
  
  DEFUN ("detect-coding-string", Fdetect_coding_string, Sdetect_coding_string,
         1, 2, 0,
 -       doc: /* Detect how the byte sequence in STRING is encoded.
 -Return a list of possible coding systems used on decoding a byte
 -sequence containing the bytes in STRING when the coding system
 -`undecided' is specified.  The list is ordered by priority decided in
 -the current language environment.
 +       doc: /* Detect coding system of the text in STRING.
 +Return a list of possible coding systems ordered by priority.
  
- If only ASCII characters are found, it returns a list of single element
+ If only ASCII characters are found (except for such ISO-2022 control
+ characters ISO-2022 as ESC), it returns a list of single element
  `undecided' or its subsidiary coding system according to a detected
  end-of-line format.
  

diff --cc src/editfns.c
index 362d8fe,2c392df..2fcacc1
--- 1/src/editfns.c
--- 2/src/editfns.c
+++ b/src/editfns.c
@@@ -2982,7 -2897,7 +2982,7 @@@ It returns the number of characters cha
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
    end_pos = XINT (end);
-   modify_region (current_buffer, pos, end_pos);
 -  modify_region (current_buffer, pos, XINT (end), 0);
++  modify_region (current_buffer, pos, end_pos, 0);
  
    cnt = 0;
    for (; pos < end_pos; )

diff --cc src/fns.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/marker.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge