Mercurial > emacs
comparison lisp/ediff-merg.el @ 90261:7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 16 Jan 2006 08:37:27 +0000 |
parents | aa89c814f853 26faad662ac6 |
children | c5406394f567 |
comparison
equal
deleted
inserted
replaced
90260:0ca0d9181b5e | 90261:7beb78bc1f8e |
---|---|
102 :group 'ediff-merge | 102 :group 'ediff-merge |
103 ) | 103 ) |
104 (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) | 104 (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) |
105 | 105 |
106 ;; check if there is no clash between the ancestor and one of the variants. | 106 ;; check if there is no clash between the ancestor and one of the variants. |
107 ;; if it is not a merge job then return true | |
107 (defsubst ediff-merge-region-is-non-clash (n) | 108 (defsubst ediff-merge-region-is-non-clash (n) |
108 (string-match "prefer" (or (ediff-get-state-of-merge n) ""))) | 109 (if (ediff-merge-job) |
110 (string-match "prefer" (or (ediff-get-state-of-merge n) "")) | |
111 t)) | |
109 | 112 |
110 ;; If ediff-show-clashes-only, check if there is no clash between the ancestor | 113 ;; If ediff-show-clashes-only, check if there is no clash between the ancestor |
111 ;; and one of the variants. | 114 ;; and one of the variants. |
112 (defsubst ediff-merge-region-is-non-clash-to-skip (n) | 115 (defsubst ediff-merge-region-is-non-clash-to-skip (n) |
113 (and ediff-show-clashes-only | 116 (and ediff-show-clashes-only |