From 68b962d42a9cc126759448484d23e10e2102d622 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sat, 15 Aug 2009 05:57:08 +0000 Subject: 2009-08-15 Michael Kifer * viper-cmd.el (viper-insert-isearch-string): new function. (viper-if-string): redefine C-s in the minibuffer to insert the last incremental search string. * ediff-init.el (ediff-coding-system): use escape-quoted in case of XEmacs. * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, ediff-merge-region-is-non-clash, ediff-skip-merge-region-if-changed-from-default-p): use defun. Also check if the job is really a merge job. * ediff.el (ediff-current-file): new function. --- lisp/ediff-merg.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lisp/ediff-merg.el') diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 35ea4348d0e..ca90e0923f0 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -97,23 +97,25 @@ Buffer B." ;; check if there is no clash between the ancestor and one of the variants. ;; if it is not a merge job then return true -(defsubst ediff-merge-region-is-non-clash (n) +(defun ediff-merge-region-is-non-clash (n) (if (ediff-merge-job) (string-match "prefer" (or (ediff-get-state-of-merge n) "")) t)) ;; If ediff-show-clashes-only, check if there is no clash between the ancestor ;; and one of the variants. -(defsubst ediff-merge-region-is-non-clash-to-skip (n) - (and ediff-show-clashes-only +(defun ediff-merge-region-is-non-clash-to-skip (n) + (and (ediff-merge-job) + ediff-show-clashes-only (ediff-merge-region-is-non-clash n))) ;; If ediff-skip-changed-regions, check if the merge region differs from ;; the current default. If a region is different from the default, it means ;; that the user has made determination as to how to merge for this particular ;; region. -(defsubst ediff-skip-merge-region-if-changed-from-default-p (n) - (and ediff-skip-merge-regions-that-differ-from-default +(defun ediff-skip-merge-region-if-changed-from-default-p (n) + (and (ediff-merge-job) + ediff-skip-merge-regions-that-differ-from-default (ediff-merge-changed-from-default-p n 'prefers-too))) -- cgit v1.2.1