diff lisp/w3/mule-sysdp.el @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 9ee227acff29
children 441bb1e64a06
line wrap: on
line diff
--- a/lisp/w3/mule-sysdp.el	Mon Aug 13 08:48:43 2007 +0200
+++ b/lisp/w3/mule-sysdp.el	Mon Aug 13 08:49:20 2007 +0200
@@ -1,8 +1,8 @@
 ;;; mule-sysdp.el --- consolidate MULE-version dependencies in one file.
 
-;; Copyright (C) 1996 William Perry
+;; Copyright (c) 1996, 1997 William Perry
 
-;; Author: William Perry <wmperry@aventail.com>
+;; Author: William Perry <wmperry@cs.indiana.edu>
 ;; Keywords: lisp, tools
 
 ;; The purpose of this file is to eliminate the cruftiness that
@@ -51,6 +51,8 @@
     (otherwise nil)))
 
 (defun mule-code-convert-region (st nd code)
+  (if (and (listp code) (car code))
+      (setq code (car code)))
   (case mule-sysdep-version
     (2.3
      (setq mc-flag t)
@@ -58,11 +60,13 @@
      (set-file-coding-system code))
     (2.4
      (setq enable-multibyte-characters t)
-     (if (eq code 'coding-system-automatic)
+     (if (memq code '(autodetect coding-system-automatic))
 	 nil
        (decode-coding-region st nd code)
        (set-buffer-file-coding-system code)))
     (xemacs
+     (if (and (listp code) (not (car code)))
+	 (setq code 'autodetect))
      (decode-coding-region (point-min) (point-max) code)
      (set-file-coding-system code))
     (otherwise