1. 23 Oct, 2011 1 commit
    • Chong Yidong's avatar
      Make vc-toggle-read-only an alias for toggle-read-only. · 86c60681
      Chong Yidong authored
      It hasn't worked in a VC sense since 2008-05-02T07:12:59Z!esr@snark.thyrsus.com, though this was
      not documented at the time (grr).
      
      * lisp/vc/vc-hooks.el (vc-toggle-read-only): Make it an obsolete alias
      for toggle-read-only.  Note that this hasn't called vc-next-action
      since 2008-05-02, though it wasn't documented at the time.
      
      * lisp/files.el (toggle-read-only): Remove obsolete comment about
      version control.
      
      * doc/emacs/buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only.
      
      * lisp/cedet/ede.el (ede-maybe-checkout): Function deleted;
      vc-toggle-read-only does not do version control now.
      
      * lisp/cedet/ede/project-am.el (project-remove-file, project-add-file)
      (project-new-target): Don't call ede-maybe-checkout.
      
      * lisp/cedet/ede/util.el (ede-make-buffer-writable): Don't use
      vc-toggle-read-only.
      
      * lisp/vc/ediff-init.el (ediff-toggle-read-only-function): Use
      toggle-read-only.
      86c60681
  2. 03 Mar, 2011 1 commit
    • David Abrahams's avatar
      ediff-init.el fix for bug#1821. (tiny change) · 31128af6
      David Abrahams authored
      Tiny change; note that author said he placed it in the public domain.
      (If this wasn't a tiny change, we would still need paperwork.)
      
      * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
      Move ediff-defvar-local calls after defcustoms.
      31128af6
  3. 25 Jan, 2011 1 commit
  4. 15 Jan, 2011 1 commit
  5. 02 Oct, 2010 1 commit
    • Glenn Morris's avatar
      Remove some functions, variables and aliases obsolete since at least 21.1. · 3226d6ca
      Glenn Morris authored
      * doc/misc/misc.texi (Shell Mode): Remove reference to old function name.
      
      * src/character.c (Fchar_bytes): Remove obsolete function.
      (syms_of_character): Remove Schar_bytes.
      * lisp/subr.el (char-bytes): Remove obsolete function.
      
      * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias.
      
      * lisp/isearch.el (isearch-return-char): Remove obsolete function.
      
      * lisp/mouse.el: No longer provide mldrag.
      (mldrag-drag-mode-line, mldrag-drag-vertical-line):
      Remove obsolete aliases.
      
      * lisp/comint.el (comint-kill-output): Remove obsolete alias.
      
      * lisp/shell.el: Comment fix.
      
      * lisp/composite.el (decompose-composite-char): Remove obsolete function.
      * lisp/ps-def.el (decompose-composite-char): Remove unused function.
      
      * lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function.
      
      * lisp/outline.el (outline-visible): Remove obsolete function.
      
      * lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight):
      * lisp/faces.el (internal-find-face, internal-get-face)
      (frame-update-faces, frame-update-face-colors)
      (x-frob-font-weight, x-frob-font-slant)
      (internal-frob-font-weight, internal-frob-font-slant)
      (x-make-font-bold, x-make-font-demibold, x-make-font-unbold)
      (x-make-font-italic, x-make-font-oblique, x-make-font-unitalic)
      (x-make-font-bold-italic): Remove functions and aliases, obsolete
      since Emacs 21.1.
      * lisp/emulation/viper-util.el (viper-get-face):
      * lisp/obsolete/lucid.el (find-face, get-face): Use facep.
      * lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face):
      Remove unused functions.
      * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.
      
      * etc/NEWS: Mention above changes.
      3226d6ca
  6. 29 Aug, 2010 1 commit
  7. 11 Jun, 2010 1 commit
    • Juri Linkov's avatar
      Move version control related files to the "vc" subdirectory. · 56b2854f
      Juri Linkov authored
      * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
      * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
      * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
      * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
      * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
      * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
      * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
      * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
      Move files to the "vc" subdirectory.
      56b2854f
  8. 13 Jan, 2010 1 commit
  9. 07 Dec, 2009 1 commit
    • Michael Kifer's avatar
      2009-12-07 Michael Kifer <kifer@cs.stonybrook.edu> · 2de386ca
      Michael Kifer authored
      	* ediff-init.el (ediff-event-key): use event-to-character instead of
      	event-key.
      
      	* ediff-mult.el (ediff-setup-meta-map, ediff-prepare-meta-buffer): add
      	menus to the meta mode. (Dan Nicolaescu's <dann@ics.uci.edu> patch.)
      
      	* ediff.el (ediff-buffers-internal): add unwind-protect.
      2de386ca
  10. 22 Nov, 2009 1 commit
    • Michael Kifer's avatar
      2009-11-22 Michael Kifer <kifer@cs.stonybrook.edu> · 433d9ace
      Michael Kifer authored
      	* viper-cmd.el: use viper-last-command-char instead of
      	last-command-char/last-command-event.
      	(viper-prefix-arg-value): do correct conversion of event-char for
      	XEmacs.
      
      	* viper-util.el, viper.el: use viper-last-command-char instead of
      	last-command-char/last-command-event.
      
      	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
      	last-command-char and last-command-event with (ediff-last-command-char) everywhere.
      
      	* ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is
      	created in fundamental mode.
      
      	* ediff.el (ediff-version): revert the change of interactive-p to
      	called-interactively-p.
      433d9ace
  11. 15 Aug, 2009 1 commit
    • Michael Kifer's avatar
      2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> · 68b962d4
      Michael Kifer authored
      	* viper-cmd.el (viper-insert-isearch-string): new function.
      	(viper-if-string): redefine C-s in the minibuffer to insert the last
      	incremental search string.
      
      	* ediff-init.el (ediff-coding-system): use escape-quoted in case of
      	XEmacs.
      
      	* ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
      	ediff-merge-region-is-non-clash,
      	ediff-skip-merge-region-if-changed-from-default-p): use defun.
      	Also check if the job is really a merge job.
      
      	* ediff.el (ediff-current-file): new function.
      68b962d4
  12. 05 Jan, 2009 1 commit
  13. 03 Dec, 2008 1 commit
    • Lute Kamstra's avatar
      * align.el: · 9201cc28
      Lute Kamstra authored
      * allout.el:
      * apropos.el:
      * arc-mode.el:
      * autoinsert.el:
      * avoid.el:
      * battery.el:
      * bookmark.el:
      * buff-menu.el:
      * calculator.el:
      * chistory.el:
      * cmuscheme.el:
      * comint.el:
      * compare-w.el:
      * dabbrev.el:
      * delim-col.el:
      * desktop.el:
      * diff-mode.el:
      * diff.el:
      * dired-aux.el:
      * dired-x.el:
      * dired.el:
      * dos-vars.el:
      * ediff-diff.el:
      * ediff-help.el:
      * ediff-init.el:
      * ediff-merg.el:
      * ediff-mult.el:
      * ediff-ptch.el:
      * ediff-vers.el:
      * ediff-wind.el:
      * ediff.el:
      * emerge.el:
      * facemenu.el:
      * faces.el:
      * ffap.el:
      * filecache.el:
      * find-dired.el:
      * font-core.el:
      * font-lock.el:
      * forms.el:
      * fringe.el:
      * help-at-pt.el:
      * hippie-exp.el:
      * ido.el:
      * image-file.el:
      * imenu.el:
      * indent.el:
      * info.el:
      * isearchb.el:
      * iswitchb.el:
      * jit-lock.el:
      * jka-compr.el:
      * log-edit.el:
      * lpr.el:
      * ls-lisp.el:
      * man.el:
      * menu-bar.el:
      * midnight.el:
      * mouse-sel.el:
      * mouse.el:
      * msb.el:
      * outline.el:
      * paren.el:
      * pcmpl-cvs.el:
      * pcmpl-gnu.el:
      * pcomplete.el:
      * pcvs-info.el:
      * pcvs-parse.el:
      * printing.el:
      * ps-mule.el:
      * ps-print.el:
      * replace.el:
      * ruler-mode.el:
      * saveplace.el:
      * sb-image.el:
      * scroll-bar.el:
      * sha1.el:
      * shadowfile.el:
      * shell.el:
      * sort.el:
      * speedbar.el:
      * strokes.el:
      * tempo.el:
      * term.el:
      * terminal.el:
      * time-stamp.el:
      * time.el:
      * tree-widget.el:
      * type-break.el:
      * vc-cvs.el:
      * vc-hg.el:
      * vc-mcvs.el:
      * vc-rcs.el:
      * vc-sccs.el:
      * vc.el:
      * view.el:
      * w32-vars.el:
      * whitespace.el:
      * wid-edit.el: Remove leading * from docstrings of defcustoms,
      deffaces, defconsts and defuns.
      9201cc28
  14. 19 Oct, 2008 1 commit
  15. 31 Jul, 2008 1 commit
    • Dan Nicolaescu's avatar
      * bitmaps/README: · 7c2fb837
      Dan Nicolaescu authored
      * xfns.c:
      * termcap.c:
      * term.c:
      * syswait.h:
      * systty.h:
      * systime.h:
      * syssignal.h:
      * sysdep.c:
      * process.h:
      * process.c:
      * print.c:
      * ndir.h:
      * lread.c:
      * keyboard.c:
      * getpagesize.h:
      * floatfns.c:
      * fileio.c:
      * emacs.c:
      * doc.c:
      * dispnew.c:
      * dired.c:
      * data.c:
      * callproc.c:
      * buffer.c:
      * README:
      * Makefile.in:
      * s/template.h:
      * s/msdos.h:
      * m/vax.h: Remove VMS support.
      * s/vms.h:
      * vlimit.h:
      * uaf.h:
      * temacs.opt:
      * param.h:
      * ioctl.h: Remove file.
      
      * descrip.mms:
      * compile.com: Remove file.
      * Create.c: Remove VMS support.
      
      * message.el (Module):
      
      * gnus-start.el (Module):
      
      * gnus-registry.el (Module):
      
      * textmodes/texinfmt.el:
      * nxml/nxml-enc.el:
      * mail/feedmail.el:
      * international/mule.el:
      * international/latexenc.el:
      * emulation/viper-util.el:
      * emulation/viper-init.el:
      * emulation/viper-ex.el:
      * emacs-lisp/bytecomp.el:
      * version.el:
      * subr.el:
      * startup.el:
      * sort.el:
      * shadowfile.el:
      * recentf.el:
      * printing.el:
      * paths.el:
      * minibuffer.el:
      * ls-lisp.el:
      * loadup.el:
      * hippie-e...
      7c2fb837
  16. 06 May, 2008 1 commit
  17. 03 May, 2008 1 commit
  18. 23 Apr, 2008 1 commit
  19. 04 Apr, 2008 1 commit
    • Michael Kifer's avatar
      2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu> · 2d84cc27
      Michael Kifer authored
      	* ediff*el: replaced load with require in eval-when-compile.
      
      	* ediff-hook: deleted all invocations of (autoload ...).
      
      	* ediff-util.el (ediff-setup): make window-min-height a local variable
      	in ediff control window, and set its min height to 2.
      	(ediff-setup-control-buffer): dedicate the control window.
      	(ediff-toggle-multiframe): undedicate control window.
      	Work directly with ediff-setup-windows-multiframe and
      	ediff-setup-windows-plain.
      
      	* ediff-wind (ediff-choose-window-setup-function-automatically): new
      	function.
      	(ediff-window-setup-function): change initialization.
      	(ediff-setup-windows-automatic): deleted.
      	(ediff-setup-windows-plain-merge): make control window dedicated.
      	(ediff-destroy-control-frame): do not skip frames if working in a
      	single frame.
      
      	* emulation/viper-ex.el: move provide's forward, prevent ecursion in
      	eval-when-compile.
      
      	* emulation/viper-util.el: move provide's forward, prevent ecursion in
      	eval-when-compile.
      2d84cc27
  20. 05 Mar, 2008 2 commits
    • Glenn Morris's avatar
      Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test. · 4af37d74
      Glenn Morris authored
      (ediff-cond-compile-for-xemacs-or-emacs): Remove.
      (top-level, ediff-frame-iconified-p): Simplify if+and to just and.
      (ediff-read-event, ediff-overlayp, ediff-make-overlay, ediff-delete-overlay):
      Move the XEmacs test inside the definition.
      4af37d74
    • Dan Nicolaescu's avatar
      * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip. · 38805987
      Dan Nicolaescu authored
      (standard-mode-line-position): Add mouse-face.
      
      * progmodes/compile.el (compilation-menu-map):
      (compilation-mode-map):
      * progmodes/grep.el (grep-mode-map):  Add :help.
      
      * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Define and
      initialize in one step.  Add :help.  Use :enable to activate menu
      items. Show the key binding for edebug-defun.
      (lisp-interaction-mode-map): Add a menu.
      
      * term.el (term-mode-map): Define and initialize in one step.
      
      * ediff-init.el (ediff-color-display-p): Simplify.
      (Xor): Remove unused function.
      (ediff-with-syntax-table): Simplify for emacs.
      
      * ediff-hook.el (menu-bar-ediff-menu): Don't depend on the
      menu-bar being loaded, it always is.
      38805987
  21. 04 Mar, 2008 1 commit
  22. 07 Jan, 2008 1 commit
  23. 06 Dec, 2007 1 commit
  24. 27 Nov, 2007 1 commit
  25. 09 Nov, 2007 1 commit
    • Dan Nicolaescu's avatar
      * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove. · e83d1fe8
      Dan Nicolaescu authored
      (ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
      (ediff-current-diff-A, ediff-current-diff-B)
      (ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
      (ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
      (ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
      (ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
      (ediff-odd-diff-Ancestor, ediff-reset-mouse):
      * ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
      (ediff-setup-windows-plain-merge)
      (ediff-setup-windows-plain-compare, ediff-setup-control-frame)
      (ediff-refresh-control-frame, ediff-get-visible-buffer-window):
      * ediff-util.el (ediff-setup-keymap, )
      (ediff-toggle-wide-display, ediff-toggle-multiframe)
      (ediff-toggle-use-toolbar, ediff-really-quit)
      (ediff-good-frame-under-mouse)
      (ediff-highlight-diff-in-one-buffer)
      (ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
      (ediff-make-bullet-proof-overlay):
      * ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
      (ediff-set-meta-overlay):
      * ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
      * ediff.el (ediff-documentation): Replace ediff-xemacs-p and
      ediff-emacs-p with their former definitions.
      
      * emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
      (viper-has-face-support-p, viper-inactivate-input-method)
      (viper-activate-input-method)
      (viper-use-replace-region-delimiters, viper-restore-cursor-type):
      * emulation/viper-mous.el (viper-multiclick-timeout)
      (viper-surrounding-word, viper-mouse-click-insert-word)
      (viper-mouse-click-search-word, viper-parse-mouse-key):
      * emulation/viper-macs.el (viper-char-array-to-macro):
      * emulation/viper.el (viper-go-away, viper-set-hooks)
      (viper-non-hook-settings):
      * emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
      (viper-get-saved-cursor-color-in-insert-mode)
      (viper-get-saved-cursor-color-in-emacs-mode)
      (viper-check-version, viper-get-visible-buffer-window)
      (viper-file-checked-in-p, viper-set-replace-overlay)
      (viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
      (viper-check-minibuffer-overlay, viper-read-key-sequence)
      (viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
      with their former definitions.
      (viper-eventify-list-xemacs): Only do work for XEmacs.
      (viper-set-unread-command-events): Only do work for Emacs.
      (viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
      (viper-move-overlay, viper-overlay-start, viper-overlay-end)
      (viper-overlay-get, viper-overlay-put, viper-read-event)
      (viper-characterp, viper-int-to-char, viper-get-face)
      (viper-color-defined-p, viper-iconify): New defaliases replacing
      the old fsets.
      
      * progmodes/fortran.el (comment-region-function)
      (uncomment-region-function): Pacify byte compiler.
      
      * vc.el (vc-diff-internal): Remove code for an old version of
      gnus.
      e83d1fe8
  26. 16 Sep, 2007 1 commit
  27. 25 Jul, 2007 1 commit
  28. 12 Jun, 2007 1 commit
  29. 25 May, 2007 1 commit
  30. 21 Jan, 2007 1 commit
  31. 10 Jan, 2007 1 commit
  32. 19 Feb, 2006 1 commit
    • Michael Kifer's avatar
      2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu> · b6178721
      Michael Kifer authored
      	* viper-cmd.el (viper-insert-state-post-command-sentinel,
      	viper-change-state-to-vi, viper-change-state-to-emacs):
      	made aware of cursor coloring in the emacs state.
      	(viper-special-read-and-insert-char): use read-char-exclusive.
      	(viper-minibuffer-trim-tail): workaround for fields in minibuffer.
      
      	* viper-init.el (viper-emacs-state-cursor-color): new variable.
      
      	* viper-util.el (viper-save-cursor-color,
      	viper-get-saved-cursor-color-in-replace-mode,
      	viper-get-saved-cursor-color-in-insert-mode,
      	viper-restore-cursor-color): make aware of the cursor color in emacs
      	state.
      	(viper-get-saved-cursor-color-in-emacs-mode): new function.
      
      	* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
      	ediff-ignore-case-option3, ediff-actual-diff-options,
      	ediff-actual-diff3-options): new variables to control case sensitivity.
      	(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
      	ediff-setup-diff-regions3): made aware of case-sensitivity.
      	(ediff-toggle-ignore-case): new function.
      	(ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.
      
      	* ediff-help.el (ediff-long-help-message-narrow2,
      	ediff-long-help-message-compare2, ediff-long-help-message-compare3,
      	ediff-long-help-message-word-mode): add ignore-case command.
      	(ediff-help-for-quick-help): add ignore-case command.
      
      	* ediff-merg.el: move provide to the end.
      
      	* ediff-ptch.el: move provide to the end.
      
      	* ediff-wind.el: move provide to the end.
      
      	* ediff-mult.el: move provide to the end.
      	(ediff-set-meta-overlay): enable follow-link.
      
      	* ediff.el: move provide to the end.
      	Break recursive load cycle in eval-when-compile.
      	(ediff-patch-buffer): better heuristics.
      
      	* ediff-util.el: move provide to the end.
      	Break recursive load cycle in eval-when-compile.
      	(ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
      	defuns.
      	(ediff-submit-report): pass the values of ediff-diff3-program,
      	ediff-diff3-options.
      b6178721
  33. 06 Feb, 2006 1 commit
  34. 09 Aug, 2005 1 commit
  35. 06 Aug, 2005 1 commit
  36. 10 Jul, 2005 1 commit
    • Michael Kifer's avatar
      * viper-cmd.el (viper--key-maps): new variable. · 8ea74b0e
      Michael Kifer authored
      	(viper-normalize-minor-mode-map-alist): use viper--key-maps and
      	emulation-mode-map-alists.
      	(viper-envelop-ESC-key): use viper-subseq.
      	(viper-search-forward/backward/next): disable debug-on-error.
      
      	* viper-keym.el (viper-toggle-key,viper-quoted-insert-key,
      	viper-ESC-key): new defcustoms.
      
      	* viper-macs.el (ex-map-read-args): use viper-subseq.
      
      	* viper-util.el (viper-key-to-emacs-key): use viper-subseq.
      	(viper-subseq): copy of subseq from cl.el.
      
      	* viper.el (viper-go-away,viper-set-hooks): use
      	emulation-mode-map-alists, advise self-insert-command, add-minor-mode.
      
      	* viper-mous.el (viper-current-frame-saved): use defvar.
      
      	* viper-init.el: got rid of -face in face names.
      
      	* ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
      	Make it work with longlines mode
      
      	* ediff-mult.el (ediff-meta-mode-hook): new variable.
      
      	* ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.
      
      	* ediff-init: got rid of -face in face names.
      8ea74b0e
  37. 04 Jul, 2005 2 commits
  38. 17 Jun, 2005 1 commit
    • Miles Bader's avatar
      Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432 · fa735daa
      Miles Bader authored
      Remove "-face" suffix from ediff faces
      
      2005-06-17  Miles Bader  <miles@gnu.org>
      
         * lisp/ediff-init.el (ediff-current-diff-A, ediff-current-diff-B)
         (ediff-current-diff-C, ediff-current-diff-Ancestor)
         (ediff-fine-diff-A, ediff-fine-diff-B, ediff-fine-diff-C)
         (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B)
         (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
         (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
         Remove "-face" suffix from face names.
         (ediff-current-diff-face-A, ediff-current-diff-face-B)
         (ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
         (ediff-fine-diff-face-A, ediff-fine-diff-face-B)
         (ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
         (ediff-even-diff-face-A, ediff-even-diff-face-B)
         (ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
         (ediff-odd-diff-face-A, ediff-odd-diff-face-B)
         (ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
         New backward-compatibility aliases for renamed faces.
         (ediff-current-diff-face-A, ediff-current-diff-face-B)
         (ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
         (ediff-fine-diff-face-A, ediff-fine-diff-face-B)
         (ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
         (ediff-even-diff-face-A, ediff-even-diff-face-B)
         (ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
         (ediff-odd-diff-face-A, ediff-odd-diff-face-B)
         (ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
         Use renamed ediff faces.
      fa735daa