[Emacs-commit] emacs/lisp smerge-mode.el ChangeLog

[Stefan Monnier]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Stefan Monnier <address@hidden> 05/08/25 20:13:38

Modified files:
        lisp           : smerge-mode.el ChangeLog 

Log message:
        (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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/smerge-mode.el.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.8103&tr2=1.8104&r1=text&r2=text