1. 19 Mar, 2004 20 commits
  2. 18 Mar, 2004 10 commits
  3. 17 Mar, 2004 2 commits
  4. 16 Mar, 2004 5 commits
  5. 15 Mar, 2004 3 commits
    • Luc Teirlinck's avatar
      (File): Add SMTP and SES. · 6939e0b1
      Luc Teirlinck authored
      6939e0b1
    • Stefan Monnier's avatar
      *** empty log message *** · 0820b1f6
      Stefan Monnier authored
      0820b1f6
    • 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