*** empty log message ***

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e29c9421cd33897e68428dd24d337a7285bf270e..f1858418c27e4025c98936345fd3c3c25a254c22 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-02  Richard M. Stallman  <rms@gnu.org>
+
+       * emacsclient.c (main): Test HAVE_GETCWD, not BSD_SYSTEM.
+
 2002-06-05  Francesco Potorti`  <pot@gnu.org>
 
        * etags.c (main): Avoid a buffer overrun with sprintf.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4179d7847be0305e4f10632845cc2d0468586cfa..d33fcc1a71d46c99964acdb9f11e3a414706fa10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-02  Richard M. Stallman  <rms@gnu.org>
+
+       * finder.el (finder-commentary): Use *Finder-package* buffer.
+
+       * server.el (server-buffer-done): Test of server-existing-buffer
+       was backwards.
+
 2002-11-27  Kenichi Handa  <handa@m17n.org>
 
        * language/european.el (encode-mac-roman): Deal with unencodable
@@ -29,6 +36,7 @@
        * progmodes/etags.el (find-tag-default): Copy text at point without
        properties.
 
+>>>>>>> 1.2776.2.248
 2002-11-11  Fabrice Bauzac  <fabrice.bauzac@wanadoo.fr>  (tiny change)
 
        * dired-aux.el (dired-show-file-type): Format filename with "%s" to