Lines Matching +defs:delete +defs:if
66 ;; test if diff supports the --binary option
75 (let ((file (if (boundp 'null-device) null-device "/dev/null")))
92 ;; make sure that mandatory options are added even if the user changes
96 (if (eq symb 'ediff-diff-options)
121 "*Utility to use to determine if two files are identical.
122 It must return code 0, if its arguments are identical files."
150 Use `setq-default' if setting it in .emacs")
203 (ediff-defvar-local ediff-auto-refine (if (ediff-has-face-support-p) 'on 'nix)
209 Use `setq-default' if setting it in .emacs")
214 Use `setq-default' if setting it in .emacs")
262 (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]"
266 ;; create, if it doesn't exist
318 diff-program (if diff3-job ediff-diff3-program ediff-diff-program)
319 diff-options (if diff3-job
322 ok-regexp (if diff3-job
326 (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num))
332 (if file-A file-A file-B)
333 (if file-B file-B file-A)
334 (if diff3-job
335 (if file-C file-C file-B))
339 (ediff-message-if-verbose
344 (if diff3-job
349 (if diff3-job
380 (delete-matching-lines ok-regexp)
381 (if (memq system-type '(vax-vms axp-vms))
382 (delete-matching-lines "^$")))
384 (if (/= 0 (ediff-with-current-buffer ediff-error-buffer (buffer-size)))
412 (setq diff-list (cons (if word-mode 'words 'points)
415 (if bounds
425 (goto-char (if shift-A shift-A (point-min))))
427 (goto-char (if shift-B shift-B (point-min))))
428 (if (ediff-buffer-live-p C-buffer)
439 (if b
447 (if b
454 (if (string-equal diff-type "a")
458 (if (string-equal diff-type "d")
466 (if (eq ediff-default-variant 'default-B)
473 (if word-mode
478 (if (ediff-buffer-live-p C-buffer)
502 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
504 (if (eq longlines-mode-val 1)
513 (if (eq longlines-mode-val 1)
518 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
519 (if (eq longlines-mode-val 1)
528 (if (eq longlines-mode-val 1)
531 (if (ediff-buffer-live-p C-buffer)
534 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
535 (if (eq longlines-mode-val 1)
544 (if (eq longlines-mode-val 1)
551 (if (ediff-buffer-live-p C-buffer)
558 (if (eq ediff-default-variant 'default-B) 'A 'B)
579 (if ediff-3way-job
581 (if ediff-merge-with-ancestor-job
584 (if ediff-merge-job
592 (if state-of-merge (format "%S" state-of-merge))
620 ;; shift, if necessary
647 ;; convert word numbers to points, if necessary
648 (if (eq diff-list-type 'words)
654 (if (> end limit) (setq end limit))
655 (if (> begin end) (setq begin end))
661 (if (and (ediff-has-face-support-p)
666 (if (= 0 (mod current-diff 10))
687 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine
689 ;; if `flag' is 'skip then don't compute fine diffs for this region.
693 (if (< ediff-number-of-differences 1)
696 (if ediff-word-mode
720 (if (and (ediff-looks-like-combined-merge n)
723 (if ediff-3way-comparison-job
724 (ediff-message-if-verbose
730 (ediff-message-if-verbose
737 ;; if all regions happen to be whitespace
738 (if (and whitespace-A whitespace-B whitespace-C)
741 ;; if some regions are white and others don't, then mark as
745 ;; don't compute fine diffs if diff vector exists
747 (if (ediff-no-fine-diffs-p n)
762 (ediff-message-if-verbose
788 (if ediff-3way-job
805 ;; set the new vector of fine diffs, if none exists
822 (if (and file-C (not ediff-merge-job))
835 (ediff-message-if-verbose
838 (ediff-message-if-verbose
855 (defun ediff-install-fine-diff-if-necessary (n)
860 (if (and
875 ;; if fine diff vector is not set for diff N, then do nothing
884 (if ediff-3way-job
890 (face (if default
895 (priority (if default
919 (if (> (length diff-list) 1)
945 ;; if it is a combined merge then set overlays in buff C specially
946 (if (and ediff-merge-job (eq buf-type 'C)
961 (if (not (or begin end))
964 ;; convert lines to points, if necessary
984 (if ediff-3way-job
1000 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
1002 (if (match-beginning 2)
1020 ;; WORD-MODE also tells if we are in the word-mode or not.
1043 (setq diff-list (cons (if word-mode 'words 'points)
1045 (if bounds
1053 (if three-way-comp
1059 (goto-char (if shift-A shift-A (point-min))))
1061 (goto-char (if shift-B shift-B (point-min))))
1062 (if three-way-comp
1064 (goto-char (if shift-C shift-C (point-min)))))
1065 (if (ediff-buffer-live-p anc-buffer)
1075 ;; if the files A and B are the same and not 3way-comparison,
1077 (if (or three-way-comp (not (string-equal agreement "3")))
1089 (if (memq state-of-merge '(default-A prefer-A)) 'B 'A))
1115 (if word-mode
1134 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1136 (if (eq longlines-mode-val 1)
1145 (if (eq longlines-mode-val 1)
1150 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1151 (if (eq longlines-mode-val 1)
1160 (if (eq longlines-mode-val 1)
1165 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1166 (if (eq longlines-mode-val 1)
1175 (if (eq longlines-mode-val 1)
1178 (if (ediff-buffer-live-p anc-buffer)
1181 (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
1182 (if (eq longlines-mode-val 1)
1189 (if (eq longlines-mode-val 1)
1195 ;; if comparing with ancestor, then there also is a
1197 (if three-way-comp
1227 (if (string-match "^-i\\| -i\\|\\(^\\| \\)-[^- ]+i" ediff-diff-options)
1250 ;; string. All elements in FILES must be strings. We also delete nil from
1257 (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments
1258 ;; the --binary option, if present, should be used only for buffer jobs
1262 (setq args (delete "--binary" args)))
1270 (if (or (memq system-type '(emx ms-dos windows-nt windows-95))
1273 ;; delete files used by other processes. Thus, in ediff-buffers
1274 ;; and similar functions, we can't delete temp files because
1284 (if proc (kill-process proc))
1313 (if opoint
1318 ;; we do this because diff always exits with status 1, if diffs are found
1321 (if (and (memq (process-status process) '(exit signal))
1327 (delete-process process))))
1390 (if control-buf
1398 (if control-buf
1413 (delete-region (point-min) (point))
1419 (delete-region sv-point (point))
1444 (if (and flag (> n 0))
1449 "Return t if files F1 and F2 have identical contents."
1450 (if (and (not (file-directory-p f1))
1475 (if (null ediff-recurse-to-subdirectories)
1476 (if (y-or-n-p "Compare subdirectories recursively? ")
1479 (if (eq ediff-recurse-to-subdirectories 'yes)
1482 (entries-1 (ediff-delete-all-matches "^\\.\\.?$" all-entries-1))
1483 (entries-2 (ediff-delete-all-matches "^\\.\\.?$" all-entries-2))
1499 ;; True if all contents are the same; false otherwise
1503 (if (and (= (length entries-1) (length entries-2))
1510 (if (ediff-same-contents
1516 ;; if reached the end then lists are equal
1524 (defun ediff-delete-all-matches (regex file-list-list)
1535 (if ediff-ignore-case
1551 (ediff-barf-if-not-control-buffer)
1554 (if ediff-ignore-case