Mercurial > emacs

diff lisp/ChangeLog @ 54358:b21573dfef23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 11 Mar 2004 18:46:47 +0000
parents 5a9a2d434bd4
children 7a7bdc88ded5
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Mar 11 18:35:20 2004 +0000
+++ b/lisp/ChangeLog	Thu Mar 11 18:46:47 2004 +0000
@@ -1,12 +1,25 @@
+2004-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* server.el (server-name): New var.
+	(server-socket-dir): New var to replace server-socket-name.
+	(server-start): Use them.
+
 2004-03-11  Simon Josefsson  <jas@extundo.com>
 
 	* mail/smtpmail.el (smtpmail-read-response): Abort if process has
 	died to avoid infloop.  Reported by Jonathan Glauner
 	<jglauner@sbum.org>.
 
+2004-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* smerge-mode.el (smerge-check-cache, smerge-check): New var and fun.
+	(smerge-mode-menu): Use it to deactivate menu entries.
+	(smerge-keep-current): New fun.
+	(smerge-keep-current): Use it.
+
 2004-03-10  John Paul Wallington  <jpw@gnu.org>
 
-	* foldout.el (foldout-fold-list, foldout-modeline-string): 
+	* foldout.el (foldout-fold-list, foldout-modeline-string):
 	Declare them as variables, not constants.
 
 2004-03-10  Vinicius Jose Latorre  <viniciusjl@ig.com.br>