Mercurial > emacs
view lispref/front-cover-1.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 | 695cf19ef79e |
children | 375f2633d815 |
line wrap: on
line source
\input texinfo @c -*-texinfo-*- @comment %**start of header @setfilename front1.info @settitle GNU Emacs Lisp Reference Manual @smallbook @comment %**end of header @titlepage . @sp 2 @center @titlefont{The} @sp 1 @center @titlefont{GNU} @sp 1 @center @titlefont{Emacs Lisp} @sp 1 @center @titlefont{Reference} @sp 1 @center @titlefont{Manual} @sp 2 @center GNU Emacs Version 19.29 @center for Unix Users @center Edition 2.4, June 1995 @sp 2 @center @titlefont{Volume 1} @sp 2 @center by Bil Lewis, Dan LaLiberte, @center and the GNU Manual Group @page . @sp 5 @center @titlefont{The} @sp 1 @center @titlefont{GNU} @sp 1 @center @titlefont{Emacs Lisp} @sp 1 @center @titlefont{Reference} @sp 1 @center @titlefont{Manual} @sp 2 @center GNU Emacs Version 19.29 @center for Unix Users @center Edition 2.4, June 1995 @sp 2 @center @titlefont{Volume 2} @sp 2 @center by Bil Lewis, Dan LaLiberte, @center and the GNU Manual Group @end titlepage @bye @ignore arch-tag: 5182b306-c403-4e4f-ba24-e1911bc6da9d @end ignore