Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-43

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-553
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-557
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-559
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-561
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30
   Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc leim/quail/uni-input.el
index 49a6f840cfa8c17041dcb463303779a31521a36d,12b93dc19a69ee2d0eb0814daa7414da1d401019..9e2c04278d63b32021994b99d1cad660c3d37c45
--- 1/leim/quail/uni-input.el
--- 2/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@@ -40,6 -37,39 +40,10 @@@
  
  (require 'quail)
  
 -;; Maybe stolen from Mule-UCS -- I don't remember.
 -(define-ccl-program utf-8-ccl-encode
 -  `(4 (if (r0 < ?\x80)
 -      ((write r0))
 -      (if (r0 < #x800)
 -        ((write ((r0 >> 6) | ?\xC0))
 -         (write ((r0 & ?\x3F) | ?\x80)))
 -      (if (r0 < #x10000)
 -          ((write ((r0 >> 12) | ?\xE0))
 -           (write (((r0 >> 6) & ?\x3F) | ?\x80))
 -           (write ((r0 & ?\x3F) | ?\x80)))
 -        (if (r0 < #x200000)
 -            ((write ((r0 >> 18) | ?\xF0))
 -             (write (((r0 >> 12) & ?\x3F) | ?\x80))
 -             (write (((r0 >> 6) & ?\x3F) | ?\x80))
 -             (write ((r0 & ?\x3F) | ?\x80)))
 -          (if (r0 < #x4000000)
 -              ((write ((r0 >> 24) | ?\xF8))
 -               (write (((r0 >> 18) & ?\x3F) | ?\x80))
 -               (write (((r0 >> 12) & ?\x3F) | ?\x80))
 -               (write (((r0 >> 6) & ?\x3F) | ?\x80))
 -               (write ((r0 & ?\x3F) | ?\x80)))
 -            ((write ((r0 >> 30) | ?\xFC))
 -             (write (((r0 >> 24) & ?\x3F) | ?\x80))
 -             (write (((r0 >> 18) & ?\x3F) | ?\x80))
 -             (write (((r0 >> 12) & ?\x3F) | ?\x80))
 -             (write (((r0 >> 6) & ?\x3F) | ?\x80))
 -             (write ((r0 & ?\x3F) | ?\x80))))))))))
 -
+ (defun ucs-input-insert-char (char)
+   (insert char)
+   (move-overlay quail-overlay (overlay-start quail-overlay) (point)))
+ 
  (defun ucs-input-method (key)
    (if (or buffer-read-only
          (and (/= key ?U) (/= key ?u)))
@@@ -65,12 -93,10 +67,10 @@@
                           (= 1 (length seq))
                           (setq key (aref seq 0))
                           (memq key '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?a
 -                                     ?b ?c ?d ?e ?f ?A ?B ?C ?D ?E ?F)))
 +                                        ?b ?c ?d ?e ?f ?A ?B ?C ?D ?E ?F)))
                      (progn
                        (push key events)
-                       (let ((last-command-char key)
-                             (current-prefix-arg))
-                         (call-interactively 'self-insert-command)))
+                       (ucs-input-insert-char key))
                    (let ((last-command-char key)
                          (current-prefix-arg))
                      (condition-case nil

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/descr-text.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus-start.el
Simple merge

diff --cc lisp/gnus/gnus-sum.el
Simple merge

diff --cc lisp/gnus/mm-util.el
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge