Lines Matching +defs:function +defs:list
70 (append (list diff-util nil nil nil option) files)))
80 ediff-diff-program "--binary" (list file file)))
84 ediff-diff3-program "--binary" (list file file file)))
242 (ediff-defvar-local ediff-setup-diff-regions-function nil
243 "value is a function symbol depending on the kind of job is to be done.
247 The function should take three mandatory arguments, file-A, file-B, and
258 ;; ediff-setup-diff-regions-function, which can also have the value
271 (ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer)
309 ;; This function works for diff3 and diff2 jobs
316 (let (diff3-job diff-program diff-options ok-regexp diff-list)
338 (ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer)
343 (setq diff-list
348 ;; fixup diff-list
354 (cdr diff-list)))
359 (cdr diff-list)))
364 (cdr diff-list)))
367 (ediff-convert-fine-diffs-to-overlays diff-list reg-num)
371 (defun ediff-prepare-error-list (ok-regexp diff-buff)
396 ;; This function handles diff-2 jobs including the case of
408 diff-list shift-A shift-B
411 ;; diff list contains word numbers, unless changed later
412 (setq diff-list (cons (if word-mode 'words 'points)
413 diff-list))
474 ;; make diff-list contain word numbers
475 (setq diff-list
476 (nconc diff-list
477 (list
547 (setq diff-list
549 diff-list
550 (list
572 diff-list
576 (defun ediff-convert-diffs-to-overlays (diff-list)
577 (ediff-set-diff-overlays-in-one-buffer 'A diff-list)
578 (ediff-set-diff-overlays-in-one-buffer 'B diff-list)
580 (ediff-set-diff-overlays-in-one-buffer 'C diff-list))
582 (ediff-set-diff-overlays-in-one-buffer 'Ancestor diff-list))
595 ;; the first elt designates type of list
596 (cdr diff-list))
601 (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list)
605 ;; ediff-extract-diffs puts the type of diff-list as the first elt
606 ;; of this list. The type is either 'points or 'words
607 (diff-list-type (car diff-list))
614 diff-overlay-list list-element total-diffs
617 (setq diff-list (cdr diff-list)) ; discard diff list type
618 (setq total-diffs (length diff-list))
623 (while diff-list
625 list-element (car diff-list)
626 begin (aref list-element (cond ((eq buf-type 'A) 0)
630 end (aref list-element (cond ((eq buf-type 'A) 1)
634 state-of-diff (aref list-element 8)
641 (car (delq buf-type (delq state-of-diff (list 'A 'B 'C)))))
648 (if (eq diff-list-type 'words)
674 (setq diff-overlay-list
676 diff-overlay-list
677 (list (vector overlay nil nil state-of-diff)))
678 diff-list
679 (cdr diff-list))
683 (vconcat diff-overlay-list))
719 ((> (length (delq nil (list empty-A empty-B empty-C))) 1)
910 (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)
911 (let (overlay overlay-list)
912 (while diff-list
916 (nth 0 diff-list) (nth 1 diff-list) ediff-buffer-C))
918 (setq overlay-list (cons overlay overlay-list))
919 (if (> (length diff-list) 1)
920 (setq diff-list (cdr (cdr diff-list)))
921 (error "ediff-set-fine-overlays-for-combined-merge: corrupt list of
924 (setq overlay-list (reverse overlay-list))
926 reg-num 'C (apply 'vector overlay-list))
930 ;; Convert diff list to overlays for a given DIFF-REGION
932 (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num)
937 combined-merge-diff-list
938 diff-overlay-list list-element
942 (setq diff-list (cdr diff-list)) ; discard list type (words or points)
947 (setq combined-merge-diff-list
950 combined-merge-diff-list region-num)
952 (while diff-list
954 list-element (car diff-list)
955 begin (aref list-element (cond ((eq buf-type 'A) 0)
958 end (aref list-element (cond ((eq buf-type 'A) 1)
970 (setq diff-overlay-list (nconc diff-overlay-list (list overlay))))
972 (setq diff-list (cdr diff-list))
974 ;; convert the list of difference information into a vector
977 region-num buf-type (vconcat diff-overlay-list))
981 (defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num)
982 (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
983 (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
985 (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num)
1004 (list (string-to-number
1011 (list x (1+ x))))
1015 (list x x)))))
1039 diff-list shift-A shift-B shift-C
1042 ;; diff list contains word numbers or points, depending on word-mode
1043 (setq diff-list (cons (if word-mode 'words 'points)
1044 diff-list))
1116 ;; make diff-list contain word numbers
1117 (setq diff-list
1118 (nconc diff-list
1119 (list (vector
1192 (setq diff-list
1194 diff-list
1198 (list (vector
1207 (list (vector a-begin-pt a-end-pt
1219 diff-list
1238 (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer)
1249 ;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank
1332 (defvar ediff-forward-word-function 'ediff-forward-word
1335 (make-variable-buffer-local 'ediff-forward-word-function)
1387 (let ((forward-word-function
1392 ediff-forward-word-function)
1393 ediff-forward-word-function))
1416 (funcall forward-word-function)
1431 ;; For ediff, a word is determined by ediff-forward-word-function
1434 ;; remember val ediff-forward-word-function has in ctl buf
1435 (let ((fwd-word-fun ediff-forward-word-function)
1454 (append ediff-cmp-options (list (expand-file-name f1)
1522 ;; ARG1 is a regexp, ARG2 is a list of full-filenames
1524 (defun ediff-delete-all-matches (regex file-list-list)
1526 (while file-list-list
1527 (setq elt (car file-list-list))
1530 (setq file-list-list (cdr file-list-list)))