Mercurial > emacs
view lispref/index.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 | 26a5da04740c |
children | 7a84d4874322 |
line wrap: on
line source
@c -*-texinfo-*- @setfilename ../info/index @c Indexing guidelines @c I assume that all indexes will be combinded. @c Therefore, if a generated findex and permutations @c cover the ways an index user would look up the entry, @c then no cindex is added. @c Concept index (cindex) entries will also be permuted. Therefore, they @c have no commas and few irrelevant connectives in them. @c I tried to include words in a cindex that give the context of the entry, @c particularly if there is more than one entry for the same concept. @c For example, "nil in keymap" @c Similarly for explicit findex and vindex entries, e.g. "print example". @c Error codes are given cindex entries, e.g. "end-of-file error". @c pindex is used for .el files and Unix programs @node Index, New Symbols, Standard Hooks, Top @unnumbered Index @c Print the indices @printindex fn