1. 25 Aug, 2005 1 commit
    • Stefan Monnier's avatar
      (smerge-remove-props): Make the args non-optional. · 41796d09
      Stefan Monnier authored
      (smerge-keep-n): Remove props.
      (smerge-keep-base, smerge-keep-other, smerge-keep-mine)
      (smerge-keep-current, smerge-kill-current): Don't remove props anymore
      now that it's done in smerge-keep-n.
      (smerge-refined-change): New face.
      (smerge-refine-chopup-region, smerge-refine-highlight-change)
      (smerge-refine): New funs.
      (smerge-basic-map): Bind smerge-refine.
      41796d09
  2. 22 Aug, 2005 1 commit
    • Stefan Monnier's avatar
      (smerge-basic-map): Bind smerge-combine-with-next. · 48d59eda
      Stefan Monnier authored
      (smerge-auto-leave): Make undo re-enable the mode.
      (debug-ignored-errors): Add the user-error of impossible resolution.
      (smerge-resolve): Move things around a bit, in preparation for later.
      (smerge-diff): Don't fail if the buffer has no associated file.
      (ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler.
      (smerge-conflict-overlay): New function.
      (smerge-match-conflict): Don't add text properties here.
      (smerge-find-conflict): Instead, add an overlay here.
      Also check for the case where we're inside a conflict already, so as to
      obviate the need for font-lock-multiline, which is unbearably slow with
      large conflicts and ciomplex font-lock patterns.
      (smerge-remove-props): Remove overlay rather than text-properties.
      (smerge-mode): Don't set font-lock-multiline.
      Remove overlays when turned off.
      48d59eda
  3. 06 Aug, 2005 1 commit
  4. 26 Jul, 2005 1 commit
  5. 04 Jul, 2005 1 commit
  6. 03 Jul, 2005 1 commit
  7. 16 Jun, 2005 1 commit
  8. 10 Jun, 2005 1 commit
    • Miles Bader's avatar
      Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375 · e8bfdf82
      Miles Bader authored
      Remove "-face" suffix from smerge faces
      
      2005-06-10  Miles Bader  <miles@gnu.org>
      
         * lisp/smerge-mode.el (smerge-mine, smerge-other, smerge-base)
         (smerge-markers): Remove "-face" suffix from face names.
         (smerge-mine-face, smerge-other-face, smerge-base-face)
         (smerge-markers-face):
         New backward-compatibility aliases for renamed faces.
         (smerge-mine-face, smerge-other-face, smerge-base-face)
         (smerge-markers-face): Use renamed smerge faces.
      e8bfdf82
  9. 08 Apr, 2005 1 commit
    • Dan Nicolaescu's avatar
      * mh-customize.el (mh-speedbar-selected-folder-face): Special case · ea81d57e
      Dan Nicolaescu authored
      high number of colors displays.
      
      * textmodes/table.el (table-cell-face): Add special case for
      displays supporting a high number of colors.
      * progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
      (vhdl-font-lock-reserved-words-face)
      (vhdl-speedbar-architecture-face)
      (vhdl-speedbar-instantiation-face)
      (vhdl-speedbar-architecture-selected-face)
      (vhdl-speedbar-instantiation-selected-face): Likewise.
      * progmodes/sh-script.el (sh-heredoc-face): Likewise.
      * progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
      * progmodes/ebrowse.el (ebrowse-tree-mark-face)
      (ebrowse-root-class-face, ebrowse-member-attribute-face)
      (ebrowse-progress-face): Likewise.
      * progmodes/compile.el (compilation-info-face): Likewise.
      * progmodes/cc-fonts.el (c-invalid-face): Likewise.
      * emacs-lisp/re-builder.el (reb-match-3): Likewise.
      * calendar/calendar.el (diary-face): Likewise.
      * woman.el (woman-italic-face, woman-bold-face)
      (woman-unknown-face): Likewise.
      * wid-edit.el (widget-button-pressed-face): Likewise.
      * whitespace.el (whitespace-highlight-face): Likewise.
      * smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
      * pcvs-info.el (cvs-marked-face): Likewise.
      * info.el (info-xref): Likewise.
      * ido.el (ido-subdir-face, ido-indicator-face): Likewise.
      * hilit-chg.el (highlight-changes-face)
      (highlight-changes-delete-face): Likewise.
      * hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
      (hi-red-b): Likewise.
      * generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
      * font-lock.el (font-lock-keyword-face)
      (font-lock-function-name-face, font-lock-warning-face): Likewise.
      * cus-edit.el (custom-invalid-face, custom-modified-face)
      (custom-set-face, custom-changed-face, custom-variable-tag-face)
      (custom-group-tag-face-1, custom-group-tag-face): Likewise.
      * comint.el (comint-highlight-prompt): Likewise.
      ea81d57e
  10. 04 Apr, 2005 1 commit
  11. 30 Apr, 2004 1 commit
  12. 15 Apr, 2004 2 commits
  13. 14 Apr, 2004 1 commit
  14. 23 Mar, 2004 1 commit
    • Stefan Monnier's avatar
      (smerge-mode-menu): Fix activate pred for resolve. · 5bd8d87b
      Stefan Monnier authored
      (smerge-context-menu-map): Remove unused var.
      (smerge-keep-all): Preserve markers.
      (smerge-keep-n): New fun.
      (smerge-keep-base, smerge-keep-other, smerge-keep-mine)
      (smerge-keep-current, smerge-ediff): Use it.
      (smerge-kill-current): Use it.  Make it work on some 3-part conflicts.
      (smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
      (smerge-resolve): Resolve trivial 3-part conflicts.
      5bd8d87b
  15. 16 Mar, 2004 1 commit
  16. 15 Mar, 2004 1 commit
    • Masatake YAMATO's avatar
      2004-03-15 Masatake YAMATO <jet@gyve.org> · 11ece56b
      Masatake YAMATO authored
      	Added context menu support in smerge mode.
      	Most of the part is written by Stefan Monnier.
      
      	* smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New
      	keyman and menu.
      	(smerge-text-properties): New function.
      	(smerge-remove-props): New function.
      	(smerge-popup-context-menu): New function.
      	(smerge-resolve): Call `smerge-remove-props'.
      	(smerge-keep-base, smerge-keep-other, smerge-keep-mine):
      	Ditto.
      	(smerge-keep-current): Ditto.
      	(smerge-kill-current): New function.
      	(smerge-match-conflict): Detect the file as `a same-diff conflict'
      	if the filename is "ANCESTOR". Put text properties.
      11ece56b
  17. 10 Mar, 2004 1 commit
  18. 06 Oct, 2003 2 commits
  19. 01 Sep, 2003 1 commit
  20. 04 Feb, 2003 1 commit
  21. 10 Oct, 2002 2 commits
  22. 04 Oct, 2002 1 commit
  23. 03 Sep, 2002 1 commit
  24. 15 Aug, 2002 1 commit
  25. 15 Nov, 2001 1 commit
  26. 31 Jul, 2001 1 commit
  27. 10 May, 2001 1 commit
  28. 07 Mar, 2001 1 commit
  29. 25 Jan, 2001 1 commit
  30. 23 Dec, 2000 1 commit
  31. 22 Dec, 2000 2 commits
  32. 06 Oct, 2000 1 commit
  33. 05 Oct, 2000 1 commit
  34. 16 Aug, 2000 1 commit
  35. 21 Jul, 2000 1 commit
  36. 25 May, 2000 1 commit