Mercurial > emacs
view man/trampver.texi @ 65129:8303172e4c68
(smerge-remove-props): Make the args non-optional.
(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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 25 Aug 2005 20:13:38 +0000 |
parents | 060177e931f8 |
children | da00cdf6de37 2d92f5c9d6ae |
line wrap: on
line source
@c -*-texinfo-*- @c texi/trampver.texi. Generated from trampver.texi.in by configure. @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. @set trampver 2.0.50 @c Other flags from configuration @set prefix /usr/local @set lispdir /usr/local/share/emacs/site-lisp @set infodir /usr/local/info @c Formatting of the tramp program name consistent. @set tramp @sc{tramp} @c Some flags which make the text independent on the (X)Emacs flavor. @c "emacs" resp "xemacs" are set in the Makefile. Default is "emacs". @ifclear emacs @ifclear xemacs @set emacs @end ifclear @end ifclear @c Emacs values. @ifset emacs @set emacsname GNU Emacs @set emacsdir emacs @set ftppackagename Ange-FTP @set prefix / @set prefixsinglehop @set postfix : @set postfixsinglehop : @set postfixmultihop : @set emacsothername XEmacs @set emacsotherdir xemacs @set emacsotherfilename tramp-xemacs.html @set japanesemanual tramp_ja-emacs.html @end ifset @c XEmacs counterparts. @ifset xemacs @set emacsname XEmacs @set emacsdir xemacs @set ftppackagename EFS @set prefix /[ @set prefixsinglehop [ @set postfix ] @set postfixsinglehop / @set postfixmultihop : @set emacsothername GNU Emacs @set emacsotherdir emacs @set emacsotherfilename tramp-emacs.html @set japanesemanual tramp_ja-xemacs.html @end ifset @ignore arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c @end ignore