CVS update by aidan xemacs/lisp ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/11/15 16:24:32

  Modified:    xemacs/lisp ChangeLog code-files.el
Log:
Eliminate clean build build-failures on Mule

Revision  Changes    Path
1.860     +10 -0     XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -p -r1.859 -r1.860
--- ChangeLog	2007/11/14 19:41:04	1.859
+++ ChangeLog	2007/11/15 15:24:20	1.860
@@ -1,3 +1,13 @@
+2007-11-15  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* code-files.el (write-region):
+	Call #'find-coding-system on the (possible) coding system argument
+	before checking it with #'coding-system-p; the latter function
+	gives false results when passed coding system names as symbols. 
+
+	Preserve the old order of determination of the coding system
+	better.
+
 2007-11-14  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* unicode.el (unicode-error-default-translation-table): 



1.24      +7 -2      XEmacs/xemacs/lisp/code-files.el

Index: code-files.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-files.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- code-files.el	2007/11/14 18:51:31	1.23
+++ code-files.el	2007/11/15 15:24:24	1.24
@@ -559,14 +559,19 @@ See also `write-region-pre-hook' and `wr
                'write-region-pre-hook
                start end filename append visit lockname
                coding-system-or-mustbenew)
-              coding-system
+              (if (and coding-system-or-mustbenew
+		       (coding-system-p
+			(find-coding-system coding-system-or-mustbenew)))
+		  coding-system-or-mustbenew)
               buffer-file-coding-system
               (find-file-coding-system-for-write-from-filename filename)))
     (if (consp hook-result)
         ;; One of the `write-region-pre-hook' functions wrote the file. 
         hook-result
       ;; The hooks didn't do the work; do it ourselves.
-      (setq mustbenew (unless (coding-system-p coding-system-or-mustbenew)
+      (setq hook-result (find-coding-system hook-result)
+	    mustbenew (unless (coding-system-p
+			       (find-coding-system coding-system-or-mustbenew))
                         coding-system-or-mustbenew)
             coding-system (cond ((coding-system-p hook-result) hook-result)
                                 ((null mustbenew) coding-system-or-mustbenew))