Mercurial > emacs

view lispintro/MANIFEST @ 54402:8bf3846fc7dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 54ac2f6e3c93
children
line wrap: on
line source

`emacs-lisp-intro-2.00.tar' contains:

        size  filename

        2102  INSTALL
        1482  MANIFEST
       10295  Makefile
         358  Makefile.am
       10215  Makefile.in
        5642  README
        3542  aclocal.m4
        7129  drawers.eps
       36057  configure
         142  configure.in
       12136  cons-1.eps
       12523  cons-2.eps
       12420  cons-2a.eps
       12984  cons-3.eps
       13866  cons-4.eps
       12986  cons-5.eps
      772149  emacs-lisp-intro.texi
        5584  install-sh
       10252  lambda-1.eps
       10278  lambda-2.eps
       10275  lambda-3.eps
        4650  missing
         732  mkinstalldirs
      207383  texinfo.tex

###