Lines Matching +defs:delete +defs:if
89 (if (not (assq 'emerge-mode minor-mode-alist))
118 (if (interactive-p)
182 "*Non-nil if Emerge should process local-variables lists in merge buffers.
188 "*If non-nil: `emerge-execute-line' makes no output if an input was deleted.
503 or nil if there is none.")
573 (if (not (file-readable-p file-A))
575 (if (not (file-readable-p file-B))
582 (if output-file
589 (if temp
592 (cons `(lambda () (delete-file ,file-A))
600 (if temp
603 (cons `(lambda () (delete-file ,file-B))
633 (if output-file
676 (if b
684 (if b
689 (if (string-equal diff-type "a")
694 (if (string-equal diff-type "d")
716 (delete-matching-lines ok-regexp)))
723 (if (not (file-readable-p file-A))
725 (if (not (file-readable-p file-B))
727 (if (not (file-readable-p file-ancestor))
736 (if output-file
743 (if temp
746 (cons `(lambda () (delete-file ,file-A))
754 (if temp
757 (cons `(lambda () (delete-file ,file-B))
765 (if temp
768 (cons `(lambda () (delete-file ,file-ancestor))
802 (if output-file
846 ;; if the A and B files are the same, ignore the difference
847 (if (not (string-equal agreement "2"))
873 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
875 (if (match-beginning 2)
905 (if file-out
927 (if file-out
936 ;; if merge was successful was given, save to disk
937 (if (not emerge-prefix-argument)
938 (emerge-write-and-delete file-out)))
957 (delete-file ,emerge-file-A)
958 (delete-file ,emerge-file-B))
988 (delete-file ,emerge-file-A)
989 (delete-file ,emerge-file-B)
990 (delete-file
1012 (if (string= (car command-line-args-left) "-a")
1031 (emerge-write-and-delete file-out)
1032 (kill-emacs (if emerge-prefix-argument 1 0)))
1055 (emerge-write-and-delete file-out)
1057 (funcall emerge-exit-func (if emerge-prefix-argument 1 0)))
1074 (if arg
1098 (if arg
1133 (delete-file ,emerge-file-A)
1134 (delete-file ,emerge-file-B))
1181 (delete-file ,emerge-file-A)
1182 (delete-file ,emerge-file-B)
1183 (delete-file ,emerge-ancestor))
1200 In addition, if only one of `a=file' or `b=file' is present, and `output=file'
1209 ;; Stop if at end of buffer (even though we might be in a line, if
1211 (if (eobp)
1216 (if (looking-at "[ \t]*")
1221 (if (looking-at "\\([a-z]+\\)=\\([^ \t\n]+\\)[ \t]*")
1231 (if file-A
1235 (if file-B
1239 (if file-ancestor
1243 (if file-out
1251 (if (not (or (and file-A file-B) file-out))
1253 (if (not (or file-A file-B))
1308 (if (not (and (bolp) (eolp)))
1311 (if (and ancestor-dir (string-equal ancestor-dir ""))
1313 (if (and output-dir (string-equal output-dir ""))
1317 (if (not (string-equal (substring a-dir -1) "/"))
1320 (if (not (string-equal (substring b-dir -1) "/"))
1322 (if ancestor-dir
1325 (if (not (string-equal (substring ancestor-dir -1) "/"))
1327 (if output-dir
1330 (if (not (string-equal (substring output-dir -1) "/"))
1350 (if (and (cdr p) (string-equal (car p) (car (cdr p))))
1357 (if (and a-dir-files (string-equal (car a-dir-files) f))
1361 (if (and b-dir-files (string-equal (car b-dir-files) f))
1365 (if (and ancestor-dir-files (string-equal (car ancestor-dir-files) f))
1369 (if output-dir
1371 (backward-delete-char 1)
1379 ;; Make sure we are not in the minibuffer window when we try to delete
1381 (if (eq (selected-window) (minibuffer-window))
1383 (delete-other-windows)
1389 (if pos
1393 (if pos
1396 (if pos
1399 (if (/= 0 (emerge-eval-in-buffer emerge-diff-error-buffer (buffer-size)))
1408 ;; Set up fixed keymaps if necessary
1409 (if (not emerge-basic-keymap)
1414 (setq emerge-edit-keymap (if emerge-old-keymap
1550 (if (eq (aref (aref emerge-difference-list n) 6) 'prefer-B)
1558 ;; Process the local-variables list at the end of the merged file, if
1561 (if emerge-process-local-variables
1569 (defun emerge-write-and-delete (file-out)
1571 (delete-other-windows)
1572 ;; delete A, B, and ancestor buffers, if they haven't been changed
1573 (if (not (buffer-modified-p emerge-A-buffer))
1575 (if (not (buffer-modified-p emerge-B-buffer))
1577 (if (and emerge-ancestor-buffer
1588 This brings the buffers into view if they are in windows.
1592 (if arg
1595 ;; Redisplay whatever buffers are showing, if there is a selected difference
1596 (if (and (>= emerge-current-difference 0)
1606 (if window-A (progn
1614 (if window-B (progn
1622 (if merge-window (progn
1635 ;; Perform some operation on all three windows (if they are showing).
1639 ;; End of buffer is reported in the merge buffer, but if the scroll was
1649 (if window-A (progn
1654 (if window-B (progn
1659 (if merge-window (progn
1664 "Scroll up all three merge buffers, if they are in windows.
1672 ;; if there is an explicit argument
1673 (if (and arg (not (equal arg '-)))
1676 ;; if not, see if we can determine a default amount (the window height)
1678 (if (null merge-window)
1684 (if arg
1691 "Scroll down all three merge buffers, if they are in windows.
1699 ;; if there is an explicit argument
1700 (if (and arg (not (equal arg '-)))
1703 ;; if not, see if we can determine a default amount (the window height)
1705 (if (null merge-window)
1711 (if arg
1718 "Scroll left all three merge buffers, if they are in windows.
1726 ;; if there is an explicit argument
1727 (if (and arg (not (equal arg '-)))
1730 ;; if not, see if we can determine a default amount
1733 (if (null merge-window)
1739 (if arg
1746 "Scroll right all three merge buffers, if they are in windows.
1754 ;; if there is an explicit argument
1755 (if (and arg (not (equal arg '-)))
1758 ;; if not, see if we can determine a default amount
1761 (if (null merge-window)
1767 (if arg
1776 to the left margin, if they are in windows."
1793 (if (not (and (<= (progn
1801 ;; We failed that test, see if it fits at all
1805 (if (pos-visible-in-window-p end)
1822 (if (< emerge-current-difference emerge-number-of-differences)
1836 (if (> emerge-current-difference -1)
1852 (if (and (>= difference-number -1)
1869 Unselects the selected difference, if any, restores the read-only and modified
1874 (if (prog1
1876 (if (not arg)
1914 Refuses to function if this difference has been edited, i.e., if it
1917 even if the difference has been edited."
1922 (if emerge-auto-advance
1926 (if emerge-auto-advance
1934 (delete-region merge-begin merge-end)
1943 Refuses to function if this difference has been edited, i.e., if it
1946 even if the difference has been edited."
1951 (if emerge-auto-advance
1955 (if emerge-auto-advance
1963 (delete-region merge-begin merge-end)
1981 (if (eq (aref diff-vector 6) 'default-B)
1987 (if (zerop (% n 10))
2003 (if (eq (aref diff-vector 6) 'default-A)
2009 (if (zerop (% n 10))
2047 (setq emerge-auto-advance (if (null arg)
2050 (message (if emerge-auto-advance
2062 (setq emerge-skip-prefers (if (null arg)
2065 (message (if emerge-skip-prefers
2111 (if (not arg)
2129 (if (not arg)
2143 (if (not arg)
2154 (delete-other-windows)
2162 (if buffer-file-name
2171 (if buffer-file-name
2179 (if emerge-ancestor-buffer
2181 (if buffer-file-name
2200 (if arg
2204 (if (or (< n 0) (>= n (1- emerge-number-of-differences)))
2258 ;; check location of the points, give error if they aren't in the
2260 (if (or (< A-point (aref old-diff 0))
2263 (if (or (< B-point (aref old-diff 2))
2266 (if (or (< merge-point (aref old-diff 4))
2344 (if success
2366 (if success
2453 (if (<= location (marker-position (aref diff-vector end)))
2468 ;; if the point is in a difference, select it
2470 ;; if the arg is nil and the point is not in a difference, error
2472 ;; if the arg is positive, select the following difference
2474 (if (< index emerge-number-of-differences)
2477 ;; if the arg is negative, select the preceding difference
2479 (if (> index 0)
2506 (if valid-diff
2508 (if (> (point) (aref diff begin-marker))
2510 (if (> (point) (aref diff end-marker))
2520 (if localize
2524 (if (assq 'emerge-combine-versions-template (buffer-local-variables))
2534 (if localize
2538 (if (assq 'emerge-combine-versions-template (buffer-local-variables))
2544 Refuses to function if this difference has been edited, i.e., if it is
2546 An argument forces the variant to be selected even if the difference has
2555 Refuses to function if this difference has been edited, i.e., if it is
2557 An argument forces the variant to be selected even if the difference has
2561 (if (not (stringp template))
2570 (if emerge-auto-advance
2578 (delete-region merge-begin merge-end)
2583 (if (= c ?%)
2613 (if emerge-fast-mode
2636 (if buffer
2666 (if (= before-marker here)
2690 (if (= after-marker here)
2709 ;; remove the flags, if they're there
2711 (if (looking-at emerge-before-flag-match)
2712 (delete-char emerge-before-flag-length)
2717 (if (looking-at emerge-after-flag-match)
2718 (delete-char emerge-after-flag-length)
2725 (if (and (>= emerge-current-difference 0)
2728 (if (and (>= n 0) (< n emerge-number-of-differences))
2733 (if (eq selection-type 'default-A)
2735 (if (eq selection-type 'default-B)
2738 (if (not suppress-display)
2763 (if (emerge-compare-buffers emerge-A-buffer A-begin A-end
2767 (if (emerge-compare-buffers emerge-B-buffer B-begin B-end
2771 (if (or force (= merge-begin merge-end))
2782 ;; directory instead if default-directory, if emerge-default-last-directories
2786 ;; alternative-default-dir, and if emerge-default-last-directories is set,
2791 ;; if emerge-default-last-directories is set, and
2832 (if (and (>= emerge-current-difference 0)
2849 (if (not (and (= (- x-end x-begin) (- y-end y-begin))))
2863 (if (not (string-equal x-string y-string))
2873 (if (null (get-buffer (concat prefix suffix)))
2882 (if (not (and (>= emerge-current-difference 0)
2896 (mapcar (function (lambda (v) (if (symbolp v)
2905 (if (symbolp var)
2942 (if (yes-or-no-p "Do you really write to write out this unfinished merge? ")
2945 (if (and (>= emerge-current-difference 0)
2953 (if (and (>= emerge-current-difference 0)
2962 ;; file on disk, and attempt to remedy the situation if not.
2963 ;; Signal an error if we can't make them the same, or the user doesn't want
2966 ;; First check if the file has been modified since the buffer visited it.
2967 (if (verify-visited-file-modtime (current-buffer))
2968 (if (buffer-modified-p)
2970 (if (yes-or-no-p (format "Save file %s? " buffer-file-name))
2975 (if (buffer-modified-p)
2979 (if (yes-or-no-p (format "Revert file %s? " buffer-file-name))
2992 ;; Define a key, even if a prefix of it is defined
2996 ;; Find out if a prefix of key is defined
2999 (if (integerp v)
3008 ;;If optional arg MINOR is non-nil (or prefix argument is given if interactive),
3024 ;; ;; Document a minor mode if it is listed in minor-mode-alist,
3027 ;; (if (and local-binding
3057 ;; (if (arrayp map)
3062 ;; (if (eq (aref map i) olddef)
3065 ;; (emerge-define-key-if-possible shadowmap key newdef)))
3069 ;; (if (eq (cdr-safe (car-safe map)) olddef)
3073 ;; (emerge-define-key-if-possible shadowmap key newdef)))
3077 ;; Define a key if it (or a prefix) is not already defined in the map.
3078 (defun emerge-define-key-if-possible (keymap key definition)
3081 (if (integerp present)
3082 ;; if it is "too long", look up the valid prefix
3083 (if (not (lookup-key keymap (substring key 0 present)))
3084 ;; if the prefix isn't defined, define it
3086 ;; if there is no present definition, define it
3087 (if (not present)
3107 SPC, it is ignored; if it is anything else, it is processed as a command."
3118 (if (not (pos-visible-in-window-p))
3124 (if (not (eq c 32))
3134 ;; Auto-save files for non-file buffers don't use the process id, so if a
3146 (if buffer-file-name
3147 ;; if buffer has a file, try the format <file directory>/#<file name>#
3152 (if (file-writable-p f)
3164 ;; if buffer has no file, use the format ~/#%<buffer name>%<process id>#
3185 (if (>= b ?/)
3196 (if (string= (substring s (match-beginning 0)