# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1032411526 0
# Node ID 407d0cf87424d1411aca1c6defe5cb4274a38645
# Parent  2c7b4003c5ad42c501502c49ea96fbca3dca7622
(unify-8859-on-encoding-mode): Set init value to t to reflect reality.
(ucs-minibuffer-setup): Use minibuffer-selected-window.

diff -r 2c7b4003c5ad -r 407d0cf87424 lisp/international/ucs-tables.el
--- a/lisp/international/ucs-tables.el	Thu Sep 19 01:21:46 2002 +0000
+++ b/lisp/international/ucs-tables.el	Thu Sep 19 04:58:46 2002 +0000
@@ -1254,7 +1254,7 @@
 See also command `unify-8859-on-decoding-mode'."
   :group 'mule
   :global t
-  :init-value nil
+  :init-value t
   (if unify-8859-on-encoding-mode
       (ucs-unify-8859 t)
     (ucs-fragment-8859 t)))
@@ -2482,10 +2482,11 @@
 ;; the above to work in it.
 (defun ucs-minibuffer-setup ()
   "Set up an appropriate `buffer-file-coding-system' for current buffer.
-Does so by inheriting it from the cadr of the current buffer list.
 Intended to be added to `minibuffer-setup-hook'."
   (set (make-local-variable 'buffer-file-coding-system)
-       (with-current-buffer (cadr (buffer-list))
+       (with-current-buffer (let ((win (minibuffer-selected-window)))
+			      (if (window-live-p win) (window-buffer win)
+				(cadr (buffer-list))))
 	 buffer-file-coding-system)))
 
 ;; Modified to allow display of arbitrary characters with an