Lines Matching +defs:face +defs:name
60 (defcustom smerge-diff-buffer-name "*vc-diff*"
61 "Buffer name to use for displaying diffs."
94 (put 'smerge-mine-face 'face-alias 'smerge-mine)
95 (defvar smerge-mine-face 'smerge-mine)
105 (put 'smerge-other-face 'face-alias 'smerge-other)
106 (defvar smerge-other-face 'smerge-other)
118 (put 'smerge-base-face 'face-alias 'smerge-base)
119 (defvar smerge-base-face 'smerge-base)
129 (put 'smerge-markers-face 'face-alias 'smerge-markers)
130 (defvar smerge-markers-face 'smerge-markers)
226 (1 smerge-mine-face prepend t)
227 (2 smerge-base-face prepend t)
228 (3 smerge-other-face prepend t)
230 (0 smerge-markers-face keep)
333 ;; mouse-face highlight
369 (overlay-put o 'face 'highlight)
539 ((string= filename (file-name-nondirectory
540 (or buffer-file-name "")))
654 (overlay-put ol 'face 'smerge-refined-change)))
712 (file (if buffer-file-name (file-relative-name buffer-file-name)))
722 (with-current-buffer (get-buffer-create smerge-diff-buffer-name)
749 (defun smerge-ediff (&optional name-mine name-other name-base)
758 (filename (file-name-nondirectory buffer-file-name))
760 (or name-mine (concat "*" filename " MINE*"))))
762 (or name-other (concat "*" filename " OTHER*"))))
787 (or name-base (concat "*" filename " BASE*"))))
805 ;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name)
807 ;; nil 'ediff-merge-revisions buffer-file-name)))