Lines Matching +defs:next +defs:line +defs:internal
152 (defcustom emerge-match-diff-line
187 (defcustom emerge-execute-line-deletions nil
188 "*If non-nil: `emerge-execute-line' makes no output if an input was deleted.
217 The variable `n' holds the (internal) number of the difference."
222 The variable `n' holds the (internal) number of the difference."
359 (define-key emerge-basic-keymap "n" 'emerge-next-difference)
388 (define-key emerge-basic-keymap "x1" 'emerge-one-line-window)
393 (define-key emerge-basic-keymap "xl" 'emerge-line-numbers)
439 (define-key emerge-move-menu [emerge-next-difference]
440 '("Next Difference" . emerge-next-difference))
443 (define-key emerge-options-menu [emerge-one-line-window]
444 '("One Line Window" . emerge-one-line-window))
527 the first line of the section, and one to the beginning of the first line
557 the next difference.")
571 (defun emerge-files-internal (file-A file-B &optional startup-hooks quit-hooks
671 (while (re-search-forward emerge-match-diff-line nil t)
720 (defun emerge-files-with-ancestor-internal (file-A file-B file-ancestor
843 ;; leave point after matched line
844 (beginning-of-line 2)
871 (beginning-of-line 2)
907 (emerge-files-internal
929 (emerge-files-with-ancestor-internal
996 ;;; Functions to start Emerge from the command line
1000 (let ((file-a (nth 0 command-line-args-left))
1001 (file-b (nth 1 command-line-args-left))
1002 (file-out (nth 2 command-line-args-left)))
1003 (setq command-line-args-left (nthcdr 3 command-line-args-left))
1004 (emerge-files-internal
1012 (if (string= (car command-line-args-left) "-a")
1015 (setq file-a (nth 2 command-line-args-left))
1016 (setq file-b (nth 3 command-line-args-left))
1017 (setq file-anc (nth 1 command-line-args-left))
1018 (setq file-out (nth 4 command-line-args-left))
1019 (setq command-line-args-left (nthcdr 5 command-line-args-left)))
1021 (setq file-a (nth 0 command-line-args-left))
1022 (setq file-b (nth 1 command-line-args-left))
1023 (setq file-anc (nth 2 command-line-args-left))
1024 (setq file-out (nth 3 command-line-args-left))
1025 (setq command-line-args-left (nthcdr 4 command-line-args-left)))
1026 (emerge-files-with-ancestor-internal
1039 (emerge-files-internal
1048 (emerge-files-with-ancestor-internal
1072 (emerge-revisions-internal
1096 (emerge-revision-with-ancestor-internal
1106 (defun emerge-revisions-internal (file revision-A revision-B &optional
1140 (defun emerge-revision-with-ancestor-internal (file revision-A revision-B
1189 ;;; Function to start Emerge based on a line in a file
1191 (defun emerge-execute-line ()
1192 "Run Emerge using files named in current text line.
1193 Looks in that line for whitespace-separated entries of these forms:
1202 If `emerge-execute-line-deletions' is non-nil and `ancestor=file' is present,
1209 ;; Stop if at end of buffer (even though we might be in a line, if
1210 ;; the line does not end with newline)
1213 ;; Go to the beginning of the line
1214 (beginning-of-line)
1218 ;; Process the entire line
1220 ;; Get the next entry
1232 (error "This line has two `A' entries"))
1236 (error "This line has two `B' entries"))
1240 (error "This line has two `ancestor' entries"))
1244 (error "This line has two `output' entries"))
1255 ;; Go to the beginning of the next line, so next execution will use
1256 ;; next line in buffer.
1257 (beginning-of-line 2)
1284 ((and file-ancestor emerge-execute-line-deletions)
1292 ;;; Sample function for creating information for emerge-execute-line
1307 ;; Check that we're not on a line
1309 (error "There is text on this line"))
1385 (emerge-refresh-mode-line)
1479 ;; Move to line DESIRED-LINE assuming we are at line CURRENT-LINE.
1481 (defun emerge-goto-line (desired-line current-line)
1482 (forward-line (- desired-line current-line))
1483 desired-line)
1493 ;; Record current line number in each buffer
1495 (a-line 1)
1496 (b-line 1))
1515 (setq a-line (emerge-goto-line a-begin a-line))
1517 (setq a-line (emerge-goto-line a-end a-line))
1521 (setq b-line (emerge-goto-line b-begin b-line))
1523 (setq b-line (emerge-goto-line b-end b-line))
1682 (- (window-height merge-window) 1 next-screen-context-lines)))
1709 (- (window-height merge-window) 1 next-screen-context-lines)))
1789 ;; BEG must be at the beginning of a line.
1794 (move-to-window-line emerge-min-visible-lines)
1798 (move-to-window-line
1809 (move-to-window-line lines)
1812 ;; And position the beginning on the right line
1819 (defun emerge-next-difference ()
1820 "Advance to the next difference."
1907 ;; restore mode line
1908 (kill-local-variable 'mode-line-buffer-identification)
1923 (emerge-next-difference)))))
1927 (emerge-next-difference))))))
1939 (emerge-refresh-mode-line)))
1952 (emerge-next-difference)))))
1956 (emerge-next-difference))))))
1968 (emerge-refresh-mode-line)))
2025 (force-mode-line-update))
2038 (force-mode-line-update))
2043 advance to the next difference.
2053 (force-mode-line-update))
2057 This mode causes `emerge-next-difference' and `emerge-previous-difference'
2068 (force-mode-line-update))
2219 (next (aref emerge-difference-list (1+ i))))
2221 (aref next 1)
2223 (aref next 3)
2225 (aref next 5)
2227 (ns (aref next 6)))
2239 ;; fix the mode line
2240 (emerge-refresh-mode-line)
2303 ;; fix the mode line
2304 (emerge-refresh-mode-line)
2376 (beginning-of-line)
2379 (beginning-of-line 2)
2383 (beginning-of-line)
2386 (beginning-of-line 2)
2389 (beginning-of-line)
2392 (beginning-of-line 2)
2483 (defun emerge-line-numbers ()
2484 "Display the current line numbers.
2485 This function displays the line numbers of the points in the A, B, and
2493 (merge-line (emerge-line-number-in-buf 4 5))
2494 (A-line (emerge-eval-in-buffer emerge-A-buffer
2495 (emerge-line-number-in-buf 0 1)))
2496 (B-line (emerge-eval-in-buffer emerge-B-buffer
2497 (emerge-line-number-in-buf 2 3))))
2499 merge-line A-line B-line)))
2501 (defun emerge-line-number-in-buf (begin-marker end-marker)
2504 (beginning-of-line)
2549 (emerge-combine-versions-internal emerge-combine-versions-template force))
2563 (emerge-combine-versions-internal template force)))
2565 (defun emerge-combine-versions-internal (template force)
2571 (emerge-next-difference))))))
2602 (emerge-refresh-mode-line)))
2606 Overrides any change that the mode might make to the mode line or local
2612 (emerge-refresh-mode-line)
2617 (defun emerge-one-line-window ()
2741 (emerge-refresh-mode-line))))
2825 ;; Revise the mode line to display which difference we have selected
2827 (defun emerge-refresh-mode-line ()
2828 (setq mode-line-buffer-identification
2844 (force-mode-line-update))
3105 If the name won't fit on one line, the minibuffer is expanded to hold it,
3208 "Characters that must be quoted with \\ when used in a shell command line.