--- a/timeformat.diff	Wed May 15 13:32:42 2013 +0300
+++ b/timeformat.diff	Wed Nov 12 23:04:36 2014 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent f6642109fbfb5029d85f3f7c4dc9d93e100d607a
+# Parent 66f6d14c851bd0280966a8263ff4119588775620
 [experimental] Allow user to modify time formatting
 
   * give user full control and full responsibility
@@ -9,10 +9,27 @@
     * time_prefix_len (normal prefix width + 5)
   * fall back to 0, if any of these unset
 
-diff -r f6642109fbfb mcabber/mcabber/screen.c
---- a/mcabber/mcabber/screen.c	Thu Oct 18 00:00:46 2012 +0300
-+++ b/mcabber/mcabber/screen.c	Thu Oct 18 01:49:44 2012 +0300
-@@ -853,38 +853,100 @@
+diff -r 66f6d14c851b mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c	Tue Nov 11 23:42:00 2014 +0200
++++ b/mcabber/mcabber/screen.c	Tue Nov 11 23:43:05 2014 +0200
+@@ -85,6 +85,7 @@
+ static void scr_end_current_completion(void);
+ static void scr_insert_text(const char*);
+ static void scr_handle_tab(gboolean fwd);
++static unsigned int attention_sign(void);
+ 
+ static void scr_glog_print(const gchar *log_domain, GLogLevelFlags log_level,
+                            const gchar *message, gpointer user_data);
+@@ -222,8 +223,6 @@
+ 
+ /* Functions */
+ 
+-static unsigned int attention_sign(void);
+-
+ static int find_color(const char *name)
+ {
+   int result;
+@@ -875,38 +874,100 @@
  static const char *timeprefixes[] = {
    "%m-%d %H:%M ",
    "%H:%M ",