|
| From: | Stefan Monnier |
| Subject: | [Emacs-commit] emacs src/lisp.h src/font.h src/coding.h src/cc... |
| Date: | Wed, 13 Feb 2008 15:10:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/02/13 15:10:59
Modified files:
src : lisp.h font.h coding.h ccl.h
lisp : smerge-mode.el ChangeLog
Log message:
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.611&r2=1.612
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.h?cvsroot=emacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.h?cvsroot=emacs&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ccl.h?cvsroot=emacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.12779&r2=1.12780
| [Prev in Thread] | Current Thread | [Next in Thread] |