emacs: lisp/ediff-util.el comparison

comparison lisp/ediff-util.el @ 106192:a2ee981efbec

2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu> * viper-cmd.el: use viper-last-command-char instead of last-command-char/last-command-event. (viper-prefix-arg-value): do correct conversion of event-char for XEmacs. * viper-util.el, viper.el: use viper-last-command-char instead of last-command-char/last-command-event. * ediff-init.el, ediff-mult.el, ediff-util.el: relpace last-command-char and last-command-event with (ediff-last-command-char) everywhere. * ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is created in fundamental mode. * ediff.el (ediff-version): revert the change of interactive-p to called-interactively-p.

author	Michael Kifer <kifer@cs.stonybrook.edu>
date	Sun, 22 Nov 2009 03:14:14 +0000
parents	009383a57ce8
children	16d3ef458ae1

comparison

equal deleted inserted replaced

-:baf1843cbc25
+:a2ee981efbec
 If optional argument BUF is specified, toggle read-only in that buffer instead
 of the current buffer."
 (interactive)
 (ediff-barf-if-not-control-buffer)
 (let ((ctl-buf (if (null buf) (current-buffer)))
-	(buf-type (ediff-char-to-buftype last-command-event)))
+	(buf-type (ediff-char-to-buftype (ediff-last-command-char))))
 (or buf (ediff-recenter))
 (or buf
 	(setq buf (ediff-get-buffer buf-type)))
 (ediff-with-current-buffer buf     ; eval in buf A/B/C
 		    (ediff-buffer-live-p ediff-buffer-C))
 		))
 (error ediff-KILLED-VITAL-BUFFER))
 (ediff-operate-on-windows
-(if (memq last-command-event '(?v ?\C-v))
+(if (memq (ediff-last-command-char) '(?v ?\C-v))
 'scroll-up
 'scroll-down)
 ;; calculate argument to scroll-up/down
 ;; if there is an explicit argument
 (if (and arg (not (equal arg '-)))
 (ediff-operate-on-windows
 ;; Arrange for scroll-left and scroll-right being called
 ;; interactively so that they set the window's min_hscroll.
 ;; Otherwise, automatic hscrolling will undo the effect of
 ;; hscrolling.
-(if (= last-command-event ?<)
+(if (= (ediff-last-command-char) ?<)
 (lambda (arg)
 	 (let ((prefix-arg arg))
 	   (call-interactively 'scroll-left)))
 (lambda (arg)
 (let ((prefix-arg arg))
 A is used.
 With a prefix argument, synchronize all files around the current point position
 in the specified buffer."
 (interactive "P")
 (ediff-barf-if-not-control-buffer)
-(let* ((buf-type (ediff-char-to-buftype last-command-event))
+(let* ((buf-type (ediff-char-to-buftype (ediff-last-command-char)))
 	 (buffer (ediff-get-buffer buf-type))
 	 (pt (ediff-with-current-buffer buffer (point)))
 	 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
 	 (past-last-diff (< ediff-number-of-differences diff-no))
 	 (beg (if past-last-diff
 (defun ediff-restore-diff  (arg &optional key)
 "Restore ARGth diff from `ediff-killed-diffs-alist'.
 ARG is a prefix argument.  If ARG is nil, restore the current-difference.
 If the second optional argument, a character, is given, use it to
-determine the target buffer instead of last-command-event"
+determine the target buffer instead of (ediff-last-command-char)"
 (interactive "P")
 (ediff-barf-if-not-control-buffer)
 (if (numberp arg)
 (ediff-jump-to-difference arg))
 (ediff-pop-diff ediff-current-difference
-		  (ediff-char-to-buftype (or key last-command-event)))
+		  (ediff-char-to-buftype (or key (ediff-last-command-char))))
 ;; recenter with rehighlighting, but no messages
 (let (ediff-verbose-p)
 (ediff-recenter)))
 (defun ediff-restore-diff-in-merge-buffer (arg)
 	(regexp-C "")
 	msg-connective alt-msg-connective alt-connective)
 (cond
 ((or (and (eq ediff-skip-diff-region-function
 		   ediff-focus-on-regexp-matches-function)
-	       (eq last-command-event ?f))
+	       (eq (ediff-last-command-char) ?f))
 	  (and (eq ediff-skip-diff-region-function
 		   ediff-hide-regexp-matches-function)
-	       (eq last-command-event ?h)))
+	       (eq (ediff-last-command-char) ?h)))
 (message "Selective browsing by regexp turned off")
 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
-((eq last-command-event ?h)
+((eq (ediff-last-command-char) ?h)
 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
 	    regexp-A
 	    (read-string
 	     (format
 	      "Ignore A-regions matching this regexp (default %s): "
 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
 (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
-((eq last-command-event ?f)
+((eq (ediff-last-command-char) ?f)
 (setq ediff-skip-diff-region-function
 	    ediff-focus-on-regexp-matches-function
 	    regexp-A
 	    (read-string
 	     (format
 \(and plain output, if customized output was not generated\)."
 (interactive "P")
 (ediff-barf-if-not-control-buffer)
 (ediff-compute-custom-diffs-maybe)
 (ediff-with-current-buffer
-(cond ((memq last-command-event '(?a ?b ?c))
+(cond ((memq (ediff-last-command-char) '(?a ?b ?c))
 	     (ediff-get-buffer
-	      (ediff-char-to-buftype last-command-event)))
+	      (ediff-char-to-buftype (ediff-last-command-char))))
-	    ((eq last-command-event ?d)
+	    ((eq (ediff-last-command-char) ?d)
 	     (message "Saving diff output ...")
 	     (sit-for 1) ; let the user see the message
 	     (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
 		    ediff-diff-buffer)
 		   ((ediff-buffer-live-p ediff-custom-diff-buffer)

Mercurial > emacs

comparison lisp/ediff-util.el @ 106192:a2ee981efbec