Mercurial > emacs

changeset 1610:fc2b0405bd87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Jim Blandy <jimb@redhat.com>
date Mon, 16 Nov 1992 01:33:17 +0000
parents 5beb9d2bc959
children 2701f8d53d25
files lisp/emerge.el
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emerge.el	Mon Nov 16 01:31:33 1992 +0000
+++ b/lisp/emerge.el	Mon Nov 16 01:33:17 1992 +0000
@@ -2065,7 +2065,7 @@
 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 @@
 		     ((= 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 @@
 	      (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: