--- a/.hgignore	Sat Jul 09 23:20:36 2005 +0100
+++ b/.hgignore	Sun Jul 10 15:47:31 2005 +0100
@@ -9,7 +9,7 @@
 \.sw.($|/)
 
 ^mcabber/lastchange$
-/cscope.out$
+^mcabber/cscope.out$
 ^mcabber/src/mcabber$
 (^|/)Makefile($|/)
 (^|/)config\.(h(\.in|)|log|cache|guess|status)($|/)

--- a/mcabber/ChangeLog	Sat Jul 09 23:20:36 2005 +0100
+++ b/mcabber/ChangeLog	Sun Jul 10 15:47:31 2005 +0100
@@ -1,5 +1,8 @@
 mcabber (0.6.2-dev)
 
+ * The history log file format has changed; the old log files written by
+   mcabber < 0.6.1 are no longer supported and should be converted.
+   Please see the NEWS file for the details.
  * New multi-line "verbatim" mode (/msay verbatim).  In this mode, all
    commands but /msay are disabled, so that lines beginning with a slash
    can be sent
@@ -8,14 +11,17 @@
  * Color configuration handling improvement
    NOTE: configuration file needs to be updated; see sample config. file!
  * Resource priority can be set (see sample config. file)
+ * Status messages can be user-defined (see sample config. file)
  * mcabber now warns when logging is enabled and there is a write error while
    writing to log files
  * Remove busy/occupied status, which does not exist (it could be an alias for
    dnd)
  * The settings system has been rewritten, but it is still not 100% ready yet
+ * Fix segfault when the resource is not specified
  * New /alias command
  * New /bind command
  * Add /roster toggle_offline
+ * Add /connect and /disconnect commands
 
  -- Mikael, ?
 

--- a/mcabber/TODO	Sat Jul 09 23:20:36 2005 +0100
+++ b/mcabber/TODO	Sun Jul 10 15:47:31 2005 +0100
@@ -5,27 +5,22 @@
 
 TODO:
 
+* Improve debug logging system
 * Presence notification is always accepted.  We should ask...
 * UTF-8 support (Can somebody help me?)
 * Display status / chat mode
-* /connect /disconnect ?
 * Pending message flag is not displayed when buddy is outside Contact window,
   maybe we could show it someway (maybe just a flag?).
 * Show number of online contacts in folded groups
 * Buddy buffer in full width (handy for cut'n paste!)
   (i.e. hide roster window)
-* Create .mcabber and .mcabber/histo dirs if needed.
-* Search for a user
-* Get info from server about a user
+* Create .mcabber and .mcabber/histo dirs if needed.  Or maybe not.
+  However it could be a good idea to check the permissions.
 * Publish personal information
 * Handle message type "error"
 * Show status changes in buddy window (if open)?
 * Options completion
-* Auto away (it would be better to add the "message" variable first, which could
-  be changed with "/set message = I'll be back!")
-  Messages variables:
-  - message_{online,avail,free,dnd,notavail,away,autoaway}
-  - message (current message)
+* Auto away
 * Maybe Ctrl-c should not (immediately) quit mcabber.  What about:
   - 1 Ctrl-c leaves completion/multi-line modes
   - 2 Ctrl-c in less than 2 seconds leave mcabber
@@ -40,8 +35,6 @@
 
 * Commands:
 
-  - /bind $keynum = command
-    Ex.: "/bind 269 = /group toggle"  Map F5 to group toggle
   - /buffer <clear|top|bottom>
     + /buffer % 50          (jump to 50 %)
     + /buffer date $date    (jump to first msg after $date)
@@ -50,12 +43,12 @@
   - /group <expand|shrink|toggle>
     + rename
   - /say_to <jid> blabla
-  - /nick (I don't know if it makes sense for Jabber)
-    I think it is equivalent to setting the "away" message.
   - /info [jid]
+    (request info to the server if the buddy is not in the roster)
   - /server connect|disconnect|register|unregister
   - /auth request|send [jid]
   - /search <jid>|name
+    (server search)
   - /help
   - /rawxml...
 

--- a/mcabber/src/parsecfg.c	Sat Jul 09 23:20:36 2005 +0100
+++ b/mcabber/src/parsecfg.c	Sun Jul 10 15:47:31 2005 +0100
@@ -8,11 +8,6 @@
 #include "settings.h"
 #include "utils.h"
 
-//  cfg_file(filename)
-// Read and parse config file "filename".  If filename is NULL,
-// try to open the configuration file at the default locations.
-//
-// This function comes from Cabber, and has been slightly modified.
 int cfg_file(char *filename)
 {
   FILE *fp;