# HG changeset patch # User Gerd Moellmann # Date 996573056 0 # Node ID 4c230c64c6df5ad6eb57bf9fb6f28f7d50fe5ec8 # Parent 2be878396f1e2083cdcef39625470414803f1f25 *** empty log message *** diff -r 2be878396f1e -r 4c230c64c6df lisp/ChangeLog --- a/lisp/ChangeLog Tue Jul 31 09:50:32 2001 +0000 +++ b/lisp/ChangeLog Tue Jul 31 09:50:56 2001 +0000 @@ -1,5 +1,8 @@ 2001-07-31 Gerd Moellmann + * international/mule.el (set-keyboard-coding-system): Set + keyboard-coding-system. + * smerge-mode.el (smerge-mode): Check if `font-lock-mode' is bound before accessing it.