CVS update by michaels xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 07/08/06 16:51:08

  Modified:    xemacs/src ChangeLog file-coding.c
Log:
2007-07-31  Mike Sperber  <mike at xemacs.org>

	* file-coding.c (undecided_convert): Kludge to prevent infinite
	recursion.
	* file-coding.c (detected_coding_system): Change default from
	raw-text to binary.

Revision  Changes    Path
1.1079    +7 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1078
retrieving revision 1.1079
diff -u -p -r1.1078 -r1.1079
--- ChangeLog	2007/08/04 20:00:20	1.1078
+++ ChangeLog	2007/08/06 14:50:39	1.1079
@@ -1,3 +1,10 @@
+2007-07-31  Mike Sperber  <mike at xemacs.org>
+
+	* file-coding.c (undecided_convert): Kludge to prevent infinite
+	recursion.
+	* file-coding.c (detected_coding_system): Change default from
+	raw-text to binary.
+
 2007-08-04  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* charset.h:



1.58      +4 -1      XEmacs/xemacs/src/file-coding.c

Index: file-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- file-coding.c	2007/07/22 22:04:13	1.57
+++ file-coding.c	2007/08/06 14:50:48	1.58
@@ -3520,7 +3520,7 @@ detected_coding_system (struct detection
 	    }
 	}
       if (NILP (retval))
-	retval = Fget_coding_system (Qraw_text);
+	retval = Fget_coding_system (Qbinary);
       return retval;
     }
   else
@@ -3869,6 +3869,9 @@ undecided_convert (struct coding_stream 
 		     random result when doing subprocess detection. */
 		  detect_coding_type (data->st, src, n);
 		  data->actual = detected_coding_system (data->st);
+		  /* kludge to prevent infinite recursion */
+		  if (XCODING_SYSTEM(data->actual)->methods->enumtype == undecided_coding_system)
+		    data->actual = Fget_coding_system (Qbinary);
 		}
 	    }
 	  /* We need to set the detected coding system if we actually have