* bytecomp.el: Declare unread-command-char an obsolete variable.

	* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
	vip-prefix-arg-com): Use unread-command-event instead of
	unread-command-char; respect its new semantics.
	* emerge.el (emerge-show-file-name): Same.

1 files changed, 5 insertions, 5 deletions

diff --git a/lisp/emerge.el b/lisp/emerge.el
index e3c06979100..e70bf3969c6 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -2065,7 +2065,7 @@ With prefix argument, puts mark before, point after."
 Use C-u l to reset the windows afterward."
   (interactive)
   (delete-other-windows)
-  (let ((temp-buffer-show-hook
+  (let ((temp-buffer-show-function
          (function (lambda (buf)
                      (split-window-vertically)
                      (switch-to-buffer buf)
@@ -2476,9 +2476,9 @@ been edited."
                      ((= c ?b) 
                       (insert-buffer-substring emerge-B-buffer B-begin B-end))
                      ((= c ?%) 
-                      (insert ?%)
-                      (t
-                       (insert c)))))
+                      (insert ?%))
+                     (t
+                      (insert c))))
            (insert c)))
        (setq i (1+ i))))
    (goto-char merge-begin)
@@ -2910,7 +2910,7 @@ SPC, it is ignored; if it is anything else, it is processed as a command."
               (enlarge-window 1))
             (let ((c (read-char)))
               (if (/= c 32)
-                  (setq unread-command-char c))))))))
+                  (setq unread-command-event c))))))))
 
 ;; Improved auto-save file names.
 ;; This function fixes many problems with the standard auto-save file names: