From: Miles Bader <miles@gnu.org>
Date: Tue, 5 Sep 2006 02:54:22 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~751
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af6ea8ad8d62810d901561ae4a56d89f22ebacf0;p=emacs.git

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
---

af6ea8ad8d62810d901561ae4a56d89f22ebacf0
diff --cc etc/HELLO
index e12a901e548,25c2f5f0802..821159be4bf
--- a/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: ,A!(BHola!, Hyv,Add(B p,Ad(Biv,Add(B, Gr,A|_(B Gott, Bon,Cu(Bu, Dobr,B}(B den, Tere p,Ad(Bevast
-           Cze,B6f(B!, ,FCei\(B ,Fsar(B, ,L7T`PRabRcYbU(B!, $,1J2J0J;J0J@JOJ=J1J0(B
+   Europe: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu
+           Cze,B6f(B!, Dobr,B}(B den, ,L7T`PRabRcYbU(B!, ,FCei\(B ,Fsar(B, $,1J2J0J;J0J@JOJ=J1J0(B
    Africa: $(3!A!,!>(B
    Middle/Near East: ,Hylem(B, (38R(47d(3T!JSa(4W(3W(B
 -  South Asia: 4$,4!8v#")0$,15h14$,4!hv#")0$,15n14$,4!zv#!)v#")v#"D0$,15x6-5d6'1(B, 4$,44Kv#4z0$,1?(14$,44hv#4zv#40$,1?.14$,44qv#4{v#3Q0$,1?8?M>u?>14$,44av#4z0$,1?01(B, 4$,46<0$,1@H14$,46A0$,1@N14$,46Kv#6Vv#6)v#6M0$,1@X@m@5@^14$,46Cv#6W0$,1@P@"1(B, 4$,4*U0$,1<U14$,4*M0$,1<C14$,4*Hv#)b0$,1<5<m14$,4*H0$,1<514$,4*Qv#)b0$,1<N<m1(B, 4$(7"70"714$P0"!#C"Q1!;4"Er'"S0"E"S14"G0"G1!;4"70"714"2r'"[0"2"[1!;4"Dr'"[0"D"[14"#0"#14"G0"G1!>(B
 -  South East Asia: (1JP:R-04U1(B, ,TJ0GQ1J04U1$0CQ1:(B, Ch,1`(Bo b,1U(Bn
 +  South Asia: $,15h5n5x6-5d6'(B, $,1?(?.?8?M>u?>?0(B, $,1@H@N@X@m@5@^@P@"(B, $,1<U<C<5<m<5<N<m(B, $(7"7"!#C"Q!;"E"S"G!;"7"2"[!;"D"["#"G!>(B
 +  South East Asia: (1JP:R-4U(B, ,TJGQJ4U$CQ:(B, Ch,1`(Bo b,1U(Bn
    East Asia: $ADc:C(B, $(0*/=((B, $B$3$s$K$A$O(B, $(C>H3gGO<<?d(B
    Misc: E,C6(Bo,C~(Ban,Cx(Bo ,Cf(Biu,C<(Ba,C}(Bde, $,2(3(1('('(5(B, $,1x (B p $,1x((B world $,1s"(B hello p  $,2!a(B
    CJK variety: GB($AT*Fx(B,$A?*7"(B), BIG5($(0&x86(B,$(0DeBv(B), JIS($B855$(B,$B3+H/(B), KSC($(Cj*Q((B,$(CKR[!(B)
diff --cc lisp/term/mac-win.el
index 382a4d8736f,20a65976a5c..ec6c7fbf410
--- a/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 ?\(J\(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/coding.c
index d8977227ec9,1603b44e098..3efce130b85
--- a/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 362d8fe1dae,2c392df564e..2fcacc16901
--- a/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; )