Mercurial > emacs
view nt/ftime.bat @ 54402:8bf3846fc7dd
2004-03-15 Masatake YAMATO <jet@gyve.org>
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.
author | Masatake YAMATO <jet@gyve.org> |
---|---|
date | Mon, 15 Mar 2004 11:27:47 +0000 |
parents | 93ce5f375b46 |
children | 375f2633d815 ef719132ddfa |
line wrap: on
line source
@echo off if (%1)==() echo Usage: %0 tracefile if (%1)==() goto done rem Need to fiddle with the dumped image so prep doesn't break it obj\i386\preprep ..\src\obj\i386\emacs.exe ..\src\obj\i386\pemacs.exe copy ..\src\obj\i386\temacs.map ..\src\obj\i386\pemacs.map rem ----------------------------------------------------------------- rem Use this version to profile explicit commands only. prep /om /ft /sf _Fexecute_extended_command ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- rem Use this version to ignore startup code rem prep /om /ft /sf _command_loop_1 ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- rem Use this version to include startup code rem prep /om /ft ..\src\obj\i386\pemacs rem ----------------------------------------------------------------- if errorlevel 1 goto done profile ..\src\obj\i386\pemacs %2 %3 %4 %5 %6 %7 %8 %9 if errorlevel 1 goto done prep /m ..\src\obj\i386\pemacs if errorlevel 1 goto done plist ..\src\obj\i386\pemacs > %1 :done goto skipArchTag arch-tag: d1c629de-9172-4d72-ab68-9d45ab9903cc :skipArchTag