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

[Stefan Monnier]

CVSROOT:        /cvs
Module name:    emacs
Branch:         EMACS_21_1_RC
Changes by:     Stefan Monnier <monnier+gnu/address@hidden>     01/11/14 
20:26:37

Modified files:
        lisp           : smerge-mode.el 

Log message:
        (smerge-match-conflict): Fix typo.
        (smerge-diff): Be careful to read match-data early enough.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/smerge-mode.el.diff?only_with_tag=EMACS_21_1_RC&tr1=1.14&tr2=1.14.4.1&r1=text&r2=text