From: Miles Bader <miles@gnu.org>
Date: Wed, 10 May 2006 20:42:41 +0000 (+0000)
Subject: Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60
X-Git-Tag: emacs-pretest-23.0.90~8295^2~961
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3bcf2b084a0dd1ff0399480d57b87e01cfe061dc;p=emacs.git

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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 259-273)

   - Update from CVS
   - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
   - Merge from gnus--rel--5.10
   - Rename "field-at-point" to "field-at-pos"
   - (comint-insert-input): Remove redundant calls to setq and goto-char

 * gnus--rel--5.10  (patch 99-100)

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

3bcf2b084a0dd1ff0399480d57b87e01cfe061dc
diff --cc lisp/arc-mode.el
index d699a78f8e8,96b41eca88d..9da83f1a635
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@@ -1349,19 -1330,19 +1353,20 @@@ This doesn't recover lost files, it jus
          files
  	visual)
      (while (and (< (+ p 29) (point-max))
 -		(= (char-after p) ?\C-z)
 -		(> (char-after (1+ p)) 0))
 +		(= (byte-after p) ?\C-z)
 +		(> (byte-after (1+ p)) 0))
        (let* ((namefld (buffer-substring (+ p 2) (+ p 2 13)))
  	     (fnlen   (or (string-match "\0" namefld) 13))
 -	     (efnname (substring namefld 0 fnlen))
 +	     (efnname (decode-coding-string (substring namefld 0 fnlen)
 +					    archive-file-name-coding-system))
-              (csize   (archive-l-e (+ p 15) 4))
+ 	     ;; Convert to float to avoid overflow for very large files.
+              (csize   (archive-l-e (+ p 15) 4 'float))
               (moddate (archive-l-e (+ p 19) 2))
               (modtime (archive-l-e (+ p 21) 2))
-              (ucsize  (archive-l-e (+ p 25) 4))
+              (ucsize  (archive-l-e (+ p 25) 4 'float))
  	     (fiddle  (string= efnname (upcase efnname)))
               (ifnname (if fiddle (downcase efnname) efnname))
-              (text    (format "  %8d  %-11s  %-8s  %s"
+              (text    (format "  %8.0f  %-11s  %-8s  %s"
                                ucsize
                                (archive-dosdate moddate)
                                (archive-dostime modtime)
@@@ -1415,13 -1397,14 +1420,14 @@@
  	visual)
      (while (progn (goto-char p)		;beginning of a base header.
  		  (looking-at "\\(.\\|\n\\)\\(.\\|\n\\)-l[hz][0-9ds]-"))
 -      (let* ((hsize   (char-after p))	;size of the base header (level 0 and 1)
 +      (let* ((hsize   (byte-after p))	;size of the base header (level 0 and 1)
- 	     (csize   (archive-l-e (+ p 7) 4)) ;size of a compressed file to follow (level 0 and 2),
+ 	     ;; Convert to float to avoid overflow for very large files.
+ 	     (csize   (archive-l-e (+ p 7) 4 'float)) ;size of a compressed file to follow (level 0 and 2),
  					;size of extended headers + the compressed file to follow (level 1).
-              (ucsize  (archive-l-e (+ p 11) 4))	;size of an uncompressed file.
+              (ucsize  (archive-l-e (+ p 11) 4 'float))	;size of an uncompressed file.
  	     (time1   (archive-l-e (+ p 15) 2))	;date/time (MSDOS format in level 0, 1 headers
  	     (time2   (archive-l-e (+ p 17) 2))	;and UNIX format in level 2 header.)
 -	     (hdrlvl  (char-after (+ p 20))) ;header level
 +	     (hdrlvl  (byte-after (+ p 20))) ;header level
  	     thsize		;total header size (base + extensions)
  	     fnlen efnname fiddle ifnname width p2
  	     neh	;beginning of next extension header (level 1 and 2)
@@@ -1726,11 -1716,12 +1733,12 @@@
        (let* ((next    (1+ (archive-l-e (+ p 6) 4)))
               (moddate (archive-l-e (+ p 14) 2))
               (modtime (archive-l-e (+ p 16) 2))
-              (ucsize  (archive-l-e (+ p 20) 4))
+ 	     ;; Convert to float to avoid overflow for very large files.
+              (ucsize  (archive-l-e (+ p 20) 4 'float))
  	     (namefld (buffer-substring (+ p 38) (+ p 38 13)))
 -	     (dirtype (char-after (+ p 4)))
 -	     (lfnlen  (if (= dirtype 2) (char-after (+ p 56)) 0))
 -	     (ldirlen (if (= dirtype 2) (char-after (+ p 57)) 0))
 +	     (dirtype (byte-after (+ p 4)))
 +	     (lfnlen  (if (= dirtype 2) (byte-after (+ p 56)) 0))
 +	     (ldirlen (if (= dirtype 2) (byte-after (+ p 57)) 0))
  	     (fnlen   (or (string-match "\0" namefld) 13))
  	     (efnname (let ((str
  			     (concat
diff --cc lisp/term/mac-win.el
index fa8934aec9e,6adbdd11274..b97a3a9ec3a
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1128,6 -1130,107 +1130,17 @@@ correspoinding TextEncodingBase value.
  (mac-add-charset-info "mac-dingbats" 34)
  (mac-add-charset-info "iso10646-1" 126) ; for ATSUI
  
 -(cp-make-coding-system
 - mac-centraleurroman
 - [?\,AD(B ?\$,1  (B ?\$,1 !(B ?\,AI(B ?\$,1 $(B ?\,AV(B ?\,A\(B ?\,Aa(B ?\$,1 %(B ?\$,1 ,(B ?\,Ad(B ?\$,1 -(B ?\$,1 &(B ?\$,1 '(B ?\,Ai(B ?\$,1!9(B
 -  ?\$,1!:(B ?\$,1 .(B ?\,Am(B ?\$,1 /(B ?\$,1 2(B ?\$,1 3(B ?\$,1 6(B ?\,As(B ?\$,1 7(B ?\,At(B ?\,Av(B ?\,Au(B ?\,Az(B ?\$,1 :(B ?\$,1 ;(B ?\,A|(B
 -  ?\$,1s (B ?\,A0(B ?\$,1 8(B ?\,A#(B ?\,A'(B ?\$,1s"(B ?\,A6(B ?\,A_(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1 9(B ?\,A((B ?\$,1y (B ?\$,1 C(B ?\$,1 N(B
 -  ?\$,1 O(B ?\$,1 J(B ?\$,1y$(B ?\$,1y%(B ?\$,1 K(B ?\$,1 V(B ?\$,1x"(B ?\$,1x1(B ?\$,1 b(B ?\$,1 [(B ?\$,1 \(B ?\$,1 ](B ?\$,1 ^(B ?\$,1 Y(B ?\$,1 Z(B ?\$,1 e(B
 -  ?\$,1 f(B ?\$,1 c(B ?\,A,(B ?\$,1x:(B ?\$,1 d(B ?\$,1 g(B ?\$,1x&(B ?\,A+(B ?\,A;(B ?\$,1s&(B ?\,A (B ?\$,1 h(B ?\$,1 p(B ?\,AU(B ?\$,1 q(B ?\$,1 l(B
 -  ?\$,1rs(B ?\$,1rt(B ?\$,1r|(B ?\$,1r}(B ?\$,1rx(B ?\$,1ry(B ?\,Aw(B ?\$,2"*(B ?\$,1 m(B ?\$,1 t(B ?\$,1 u(B ?\$,1 x(B ?\$,1s9(B ?\$,1s:(B ?\$,1 y(B ?\$,1 v(B
 -  ?\$,1 w(B ?\$,1! (B ?\$,1rz(B ?\$,1r~(B ?\$,1!!(B ?\$,1 z(B ?\$,1 {(B ?\,AA(B ?\$,1!$(B ?\$,1!%(B ?\,AM(B ?\$,1!=(B ?\$,1!>(B ?\$,1!*(B ?\,AS(B ?\,AT(B
 -  ?\$,1!+(B ?\$,1!.(B ?\,AZ(B ?\$,1!/(B ?\$,1!0(B ?\$,1!1(B ?\$,1!2(B ?\$,1!3(B ?\,A](B ?\,A}(B ?\$,1 W(B ?\$,1!;(B ?\$,1 a(B ?\$,1!<(B ?\$,1 B(B ?\$,1$g(B]
 - "Mac Central European Roman Encoding (MIME:x-mac-centraleurroman).")
 -(coding-system-put 'mac-centraleurroman 'mime-charset 'x-mac-centraleurroman)
 -
 -(cp-make-coding-system
 - mac-cyrillic
 - [?\$,1(0(B ?\$,1(1(B ?\$,1(2(B ?\$,1(3(B ?\$,1(4(B ?\$,1(5(B ?\$,1(6(B ?\$,1(7(B ?\$,1(8(B ?\$,1(9(B ?\$,1(:(B ?\$,1(;(B ?\$,1(<(B ?\$,1(=(B ?\$,1(>(B ?\$,1(?(B
 -  ?\$,1(@(B ?\$,1(A(B ?\$,1(B(B ?\$,1(C(B ?\$,1(D(B ?\$,1(E(B ?\$,1(F(B ?\$,1(G(B ?\$,1(H(B ?\$,1(I(B ?\$,1(J(B ?\$,1(K(B ?\$,1(L(B ?\$,1(M(B ?\$,1(N(B ?\$,1(O(B
 -  ?\$,1s (B ?\,A0(B ?\$,1)P(B ?\,A#(B ?\,A'(B ?\$,1s"(B ?\,A6(B ?\$,1(&(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1("(B ?\$,1(r(B ?\$,1y (B ?\$,1(#(B ?\$,1(s(B
 -  ?\$,1x>(B ?\,A1(B ?\$,1y$(B ?\$,1y%(B ?\$,1(v(B ?\,A5(B ?\$,1)Q(B ?\$,1(((B ?\$,1($(B ?\$,1(t(B ?\$,1('(B ?\$,1(w(B ?\$,1()(B ?\$,1(y(B ?\$,1(*(B ?\$,1(z(B
 -  ?\$,1(x(B ?\$,1(%(B ?\,A,(B ?\$,1x:(B ?\$,1!R(B ?\$,1xh(B ?\$,1x&(B ?\,A+(B ?\,A;(B ?\$,1s&(B ?\,A (B ?\$,1(+(B ?\$,1({(B ?\$,1(,(B ?\$,1(|(B ?\$,1(u(B
 -  ?\$,1rs(B ?\$,1rt(B ?\$,1r|(B ?\$,1r}(B ?\$,1rx(B ?\$,1ry(B ?\,Aw(B ?\$,1r~(B ?\$,1(.(B ?\$,1(~(B ?\$,1(/(B ?\$,1((B ?\$,1uV(B ?\$,1(!(B ?\$,1(q(B ?\$,1(o(B
 -  ?\$,1(P(B ?\$,1(Q(B ?\$,1(R(B ?\$,1(S(B ?\$,1(T(B ?\$,1(U(B ?\$,1(V(B ?\$,1(W(B ?\$,1(X(B ?\$,1(Y(B ?\$,1(Z(B ?\$,1([(B ?\$,1(\(B ?\$,1(](B ?\$,1(^(B ?\$,1(_(B
 -  ?\$,1(`(B ?\$,1(a(B ?\$,1(b(B ?\$,1(c(B ?\$,1(d(B ?\$,1(e(B ?\$,1(f(B ?\$,1(g(B ?\$,1(h(B ?\$,1(i(B ?\$,1(j(B ?\$,1(k(B ?\$,1(l(B ?\$,1(m(B ?\$,1(n(B ?\$,1tL(B]
 - "Mac Cyrillic Encoding (MIME:x-mac-cyrillic).")
 -(coding-system-put 'mac-cyrillic 'mime-charset 'x-mac-cyrillic)
 -
 -(let
 -    ((encoding-vector
 -      (vconcat
 -       (make-vector 32 nil)
 -       ;; mac-symbol (32..126) -> emacs-mule mapping
 -       [?\  ?\! ?\$,1x (B ?\# ?\$,1x#(B ?\% ?\& ?\$,1x-(B ?\( ?\) ?\$,1x7(B ?\+ ?\, ?\$,1x2(B ?\. ?\/
 -	?\0 ?\1 ?\2 ?\3 ?\4 ?\5 ?\6 ?\7 ?\8 ?\9 ?\: ?\; ?\< ?\= ?\> ?\?
 -	?\$,1xe(B ?\$,1&q(B ?\$,1&r(B ?\$,1''(B ?\$,1&t(B ?\$,1&u(B ?\$,1'&(B ?\$,1&s(B ?\$,1&w(B ?\$,1&y(B ?\$,1'Q(B ?\$,1&z(B ?\$,1&{(B ?\$,1&|(B ?\$,1&}(B ?\$,1&(B
 -	?\$,1' (B ?\$,1&x(B ?\$,1'!(B ?\$,1'#(B ?\$,1'$(B ?\$,1'%(B ?\$,1'B(B ?\$,1')(B ?\$,1&~(B ?\$,1'((B ?\$,1&v(B ?\[ ?\$,1xT(B ?\] ?\$,1ye(B ?\_
 -	?\$,3bE(B ?\$,1'1(B ?\$,1'2(B ?\$,1'G(B ?\$,1'4(B ?\$,1'5(B ?\$,1'F(B ?\$,1'3(B ?\$,1'7(B ?\$,1'9(B ?\$,1'U(B ?\$,1':(B ?\$,1';(B ?\$,1'<(B ?\$,1'=(B ?\$,1'?(B
 -	?\$,1'@(B ?\$,1'8(B ?\$,1'A(B ?\$,1'C(B ?\$,1'D(B ?\$,1'E(B ?\$,1'V(B ?\$,1'I(B ?\$,1'>(B ?\$,1'H(B ?\$,1'6(B ?\{ ?\| ?\} ?\$,1x\(B]
 -       (make-vector (- 160 127) nil)
 -       ;; mac-symbol (160..254) -> emacs-mule mapping
 -       ;; Mapping of the following characters are changed from the
 -       ;; original one:
 -       ;; 0xE2	0x00AE+0xF87F -> 0x00AE # REGISTERED SIGN, alternate: sans serif
 -       ;; 0xE3	0x00A9+0xF87F -> 0x00A9	# COPYRIGHT SIGN, alternate: sans serif
 -       ;; 0xE4	0x2122+0xF87F -> 0x2122	# TRADE MARK SIGN, alternate: sans serif
 -       [?\$,1tL(B ?\$,1'R(B ?\$,1s2(B ?\$,1y$(B ?\$,1sD(B ?\$,1x>(B ?\$,1!R(B ?\$,2#c(B ?\$,2#f(B ?\$,2#e(B ?\$,2#`(B ?\$,1vt(B ?\$,1vp(B ?\$,1vq(B ?\$,1vr(B ?\$,1vs(B
 -	?\,A0(B ?\,A1(B ?\$,1s3(B ?\$,1y%(B ?\,AW(B ?\$,1x=(B ?\$,1x"(B ?\$,1s"(B ?\,Aw(B ?\$,1y (B ?\$,1y!(B ?\$,1xh(B ?\$,1s&(B ?\$,1|p(B ?\$,1|O(B ?\$,1w5(B
 -	?\$,1uu(B ?\$,1uQ(B ?\$,1u\(B ?\$,1uX(B ?\$,1yW(B ?\$,1yU(B ?\$,1x%(B ?\$,1xI(B ?\$,1xJ(B ?\$,1yC(B ?\$,1yG(B ?\$,1yD(B ?\$,1yB(B ?\$,1yF(B ?\$,1x((B ?\$,1x)(B
 -	?\$,1x@(B ?\$,1x'(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1x/(B ?\$,1x:(B ?\$,1z%(B ?\,A,(B ?\$,1xG(B ?\$,1xH(B ?\$,1wT(B ?\$,1wP(B ?\$,1wQ(B ?\$,1wR(B ?\$,1wS(B
 -	?\$,2"*(B ?\$,2=H(B ?\,A.(B ?\,A)(B ?\$,1ub(B ?\$,1x1(B ?\$,1|;(B ?\$,1|<(B ?\$,1|=(B ?\$,1|A(B ?\$,1|B(B ?\$,1|C(B ?\$,1|G(B ?\$,1|H(B ?\$,1|I(B ?\$,1|J(B
 -	?\$,3b_(B ?\$,2=I(B ?\$,1xK(B ?\$,1{ (B ?\$,1|N(B ?\$,1{!(B ?\$,1|>(B ?\$,1|?(B ?\$,1|@(B ?\$,1|D(B ?\$,1|E(B ?\$,1|F(B ?\$,1|K(B ?\$,1|L(B ?\$,1|M(B
 -	nil]))
 -     translation-table)
 -  (setq translation-table
 -	(make-translation-table-from-vector encoding-vector))
 -;;  (define-translation-table 'mac-symbol-decoder translation-table)
 -  (define-translation-table 'mac-symbol-encoder
 -    (char-table-extra-slot translation-table 0)))
 -
 -(let
 -    ((encoding-vector
 -      (vconcat
 -       (make-vector 32 nil)
 -       ;; mac-dingbats (32..126) -> emacs-mule mapping
 -       [?\  ?\$,2%A(B ?\$,2%B(B ?\$,2%C(B ?\$,2%D(B ?\$,2"n(B ?\$,2%F(B ?\$,2%G(B ?\$,2%H(B ?\$,2%I(B ?\$,2"{(B ?\$,2"~(B ?\$,2%L(B ?\$,2%M(B ?\$,2%N(B ?\$,2%O(B
 -	?\$,2%P(B ?\$,2%Q(B ?\$,2%R(B ?\$,2%S(B ?\$,2%T(B ?\$,2%U(B ?\$,2%V(B ?\$,2%W(B ?\$,2%X(B ?\$,2%Y(B ?\$,2%Z(B ?\$,2%[(B ?\$,2%\(B ?\$,2%](B ?\$,2%^(B ?\$,2%_(B
 -	?\$,2%`(B ?\$,2%a(B ?\$,2%b(B ?\$,2%c(B ?\$,2%d(B ?\$,2%e(B ?\$,2%f(B ?\$,2%g(B ?\$,2"e(B ?\$,2%i(B ?\$,2%j(B ?\$,2%k(B ?\$,2%l(B ?\$,2%m(B ?\$,2%n(B ?\$,2%o(B
 -	?\$,2%p(B ?\$,2%q(B ?\$,2%r(B ?\$,2%s(B ?\$,2%t(B ?\$,2%u(B ?\$,2%v(B ?\$,2%w(B ?\$,2%x(B ?\$,2%y(B ?\$,2%z(B ?\$,2%{(B ?\$,2%|(B ?\$,2%}(B ?\$,2%~(B ?\$,2%(B
 -	?\$,2& (B ?\$,2&!(B ?\$,2&"(B ?\$,2&#(B ?\$,2&$(B ?\$,2&%(B ?\$,2&&(B ?\$,2&'(B ?\$,2&((B ?\$,2&)(B ?\$,2&*(B ?\$,2&+(B ?\$,2"/(B ?\$,2&-(B ?\$,2!`(B ?\$,2&/(B
 -	?\$,2&0(B ?\$,2&1(B ?\$,2&2(B ?\$,2!r(B ?\$,2!|(B ?\$,2"&(B ?\$,2&6(B ?\$,2"7(B ?\$,2&8(B ?\$,2&9(B ?\$,2&:(B ?\$,2&;(B ?\$,2&<(B ?\$,2&=(B ?\$,2&>(B
 -       nil
 -       ;; mac-dingbats (128..141) -> emacs-mule mapping
 -       ?\$,2&H(B ?\$,2&I(B ?\$,2&J(B ?\$,2&K(B ?\$,2&L(B ?\$,2&M(B ?\$,2&N(B ?\$,2&O(B ?\$,2&P(B ?\$,2&Q(B ?\$,2&R(B ?\$,2&S(B ?\$,2&T(B ?\$,2&U(B]
 -       (make-vector (- 161 142) nil)
 -       ;; mac-dingbats (161..239) -> emacs-mule mapping
 -       [?\$,2&A(B ?\$,2&B(B ?\$,2&C(B ?\$,2&D(B ?\$,2&E(B ?\$,2&F(B ?\$,2&G(B ?\$,2#c(B ?\$,2#f(B ?\$,2#e(B ?\$,2#`(B ?\$,1~@(B ?\$,1~A(B ?\$,1~B(B ?\$,1~C(B
 -	?\$,1~D(B ?\$,1~E(B ?\$,1~F(B ?\$,1~G(B ?\$,1~H(B ?\$,1~I(B ?\$,2&V(B ?\$,2&W(B ?\$,2&X(B ?\$,2&Y(B ?\$,2&Z(B ?\$,2&[(B ?\$,2&\(B ?\$,2&](B ?\$,2&^(B ?\$,2&_(B
 -	?\$,2&`(B ?\$,2&a(B ?\$,2&b(B ?\$,2&c(B ?\$,2&d(B ?\$,2&e(B ?\$,2&f(B ?\$,2&g(B ?\$,2&h(B ?\$,2&i(B ?\$,2&j(B ?\$,2&k(B ?\$,2&l(B ?\$,2&m(B ?\$,2&n(B ?\$,2&o(B
 -	?\$,2&p(B ?\$,2&q(B ?\$,2&r(B ?\$,2&s(B ?\$,2&t(B ?\$,1vr(B ?\$,1vt(B ?\$,1vu(B ?\$,2&x(B ?\$,2&y(B ?\$,2&z(B ?\$,2&{(B ?\$,2&|(B ?\$,2&}(B ?\$,2&~(B ?\$,2&(B
 -	?\$,2' (B ?\$,2'!(B ?\$,2'"(B ?\$,2'#(B ?\$,2'$(B ?\$,2'%(B ?\$,2'&(B ?\$,2''(B ?\$,2'((B ?\$,2')(B ?\$,2'*(B ?\$,2'+(B ?\$,2',(B ?\$,2'-(B ?\$,2'.(B ?\$,2'/(B
 -	nil
 -       ;; mac-dingbats (241..254) -> emacs-mule mapping
 -	?\$,2'1(B ?\$,2'2(B ?\$,2'3(B ?\$,2'4(B ?\$,2'5(B ?\$,2'6(B ?\$,2'7(B ?\$,2'8(B ?\$,2'9(B ?\$,2':(B ?\$,2';(B ?\$,2'<(B ?\$,2'=(B ?\$,2'>(B
 -	nil]))
 -     translation-table)
 -  (setq translation-table
 -	(make-translation-table-from-vector encoding-vector))
 -;;  (define-translation-table 'mac-dingbats-decoder translation-table)
 -  (define-translation-table 'mac-dingbats-encoder
 -    (char-table-extra-slot translation-table 0)))
 -
+ (defconst mac-system-coding-system
+   (let ((base (or (cdr (assq mac-system-script-code
+ 			     mac-script-code-coding-systems))
+ 		  'mac-roman)))
+     (if (eq system-type 'darwin)
+ 	base
+       (coding-system-change-eol-conversion base 'mac)))
+   "Coding system derived from the system script code.")
+ 
+ (set-selection-coding-system mac-system-coding-system)
+ 
  
  ;;;; Keyboard layout/language change events
  (defun mac-handle-language-change (event)
diff --cc src/process.c
index 8e4a0d22160,cfc39235c9a..4e2717577cd
--- a/src/process.c
+++ b/src/process.c
@@@ -5064,9 -5065,13 +5066,13 @@@ read_process_output (proc, channel
  	  if (NILP (p->encode_coding_system)
  	      && proc_encode_coding_system[XINT (p->outfd)])
  	    {
 -	      p->encode_coding_system = coding->symbol;
 -	      setup_coding_system (coding->symbol,
 +	      p->encode_coding_system = Vlast_coding_system_used;
 +	      setup_coding_system (p->encode_coding_system,
  				   proc_encode_coding_system[XINT (p->outfd)]);
+ 	      if (proc_encode_coding_system[XINT (p->outfd)]->eol_type
+ 		  == CODING_EOL_UNDECIDED)
+ 		proc_encode_coding_system[XINT (p->outfd)]->eol_type
+ 		  = system_eol_type;
  	    }
  	}
  
@@@ -5173,19 -5176,21 +5179,23 @@@
  	  if (NILP (p->encode_coding_system)
  	      && proc_encode_coding_system[XINT (p->outfd)])
  	    {
 -	      p->encode_coding_system = coding->symbol;
 -	      setup_coding_system (coding->symbol,
 +	      p->encode_coding_system = Vlast_coding_system_used;
 +	      setup_coding_system (p->encode_coding_system,
  				   proc_encode_coding_system[XINT (p->outfd)]);
+ 	      if (proc_encode_coding_system[XINT (p->outfd)]->eol_type
+ 		  == CODING_EOL_UNDECIDED)
+ 		proc_encode_coding_system[XINT (p->outfd)]->eol_type
+ 		  = system_eol_type;
  	    }
  	}
 -      carryover = nbytes - coding->consumed;
 -      if (SCHARS (p->decoding_buf) < carryover)
 -	p->decoding_buf = make_uninit_string (carryover);
 -      bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
 -	     carryover);
 -      XSETINT (p->decoding_carryover, carryover);
 +      if (coding->carryover_bytes > 0)
 +	{
 +	  if (SCHARS (p->decoding_buf) < coding->carryover_bytes)
 +	    p->decoding_buf = make_uninit_string (coding->carryover_bytes);
 +	  bcopy (coding->carryover, SDATA (p->decoding_buf),
 +		 coding->carryover_bytes);
 +	  XSETINT (p->decoding_carryover, coding->carryover_bytes);
 +	}
        /* Adjust the multibyteness of TEXT to that of the buffer.  */
        if (NILP (current_buffer->enable_multibyte_characters)
  	  != ! STRING_MULTIBYTE (text))
diff --cc src/xfaces.c
index 3a066ee12c3,a5c5a21f585..5596d5dc613
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@@ -7254,7 -7071,17 +7254,17 @@@ realize_default_face (f
    xassert (lface_fully_specified_p (XVECTOR (lface)->contents));
    check_lface (lface);
    bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs);
 -  face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);
 +  face = realize_face (c, attrs, DEFAULT_FACE_ID);
+ 
+ #ifdef HAVE_WINDOW_SYSTEM
+ #ifdef HAVE_X_WINDOWS  
+   if (face->font != FRAME_FONT (f))
+     /* As the font specified for the frame was not acceptable as a
+        font for the default face (perhaps because auto-scaled fonts
+        are rejected), we must adjust the frame font.  */
+     x_set_font (f, build_string (face->font_name), Qnil);
+ #endif	/* HAVE_X_WINDOWS */
+ #endif	/* HAVE_WINDOW_SYSTEM */
    return 1;
  }