Lines Matching +defs:diff +defs:id
41 (defvar ediff-diff-status)
1148 (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge)
1152 buf-C-state-diff (ediff-get-state-of-diff ediff-current-difference 'C)
1154 buf-A-state-diff (ediff-get-state-of-diff ediff-current-difference 'A)
1155 buf-B-state-diff (ediff-get-state-of-diff ediff-current-difference 'B)
1156 buf-A-state-diff (if buf-A-state-diff
1157 (format "[%s] " buf-A-state-diff)
1159 buf-B-state-diff (if buf-B-state-diff
1160 (format "[%s] " buf-B-state-diff)
1162 buf-C-state-diff (if (and (ediff-buffer-live-p ediff-buffer-C)
1163 (or buf-C-state-diff buf-C-state-merge))
1165 (or buf-C-state-diff "")
1175 (setq buf-A-state-diff ""
1176 buf-B-state-diff ""
1177 buf-C-state-diff ""))
1184 ;; control buffer id
1187 (ediff-make-narrow-control-buffer-id 'skip-name)
1188 (ediff-make-wide-control-buffer-id)))
1196 (setq ediff-diff-status buf-A-state-diff)
1199 (list " A: " 'ediff-diff-status mode-line-format))
1202 (setq ediff-diff-status buf-B-state-diff)
1205 (list " B: " 'ediff-diff-status mode-line-format))
1209 (setq ediff-diff-status buf-C-state-diff)
1212 (list " C: " 'ediff-diff-status mode-line-format))
1225 "[=diff(B)] ")
1227 "[=diff(A)] ")
1239 (cons 'icon-name (ediff-make-narrow-control-buffer-id))
1243 frame-icon-title-format (ediff-make-narrow-control-buffer-id))
1248 (defun ediff-make-narrow-control-buffer-id (&optional skip-name)
1267 (defun ediff-make-wide-control-buffer-id ()
1275 (list (format "%%b diff %d of %d"