*** empty log message ***

2 files changed, 26 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 749f7cc352f..3575c3441d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-11  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-copy-current-file-name): Use buffer-name if
+        buffer-file-name is nil.
+
 2006-07-11  Chong Yidong  <cyd@stupidchicken.com>
 
         * simple.el (undo-ask-before-discard): Set to nil.
diff --git a/src/ChangeLog b/src/ChangeLog
index 8a69f99cc48..182dea1afda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2006-07-11  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (sit_for): Reduce number of args from 5 to 3.
+        Now just one TIMEOUT arg that can be a Lisp float or Lisp int.
+        Combine args DISPLAY and INITIAL_DISPLAY into one arg DO_DISPLAY.
+        Undo 2006-06-14 change for non-preemptive display if TIMEOUT < 0.
+        The rework of sit_for args also fixes several incorrect Qt args
+        which should have been 1.
+        (Fredisplay): Pass 1 instead of Qt to swallow_events and
+        detect_input_pending_run_timers.
+
+        * lisp.h (sit_for): Update prototype.
+        (Fredisplay): Add EXFUN.
+
+        * dispextern.h (sit_for): Remove prototype.
+
+        * callint.c (Fcall_interactively):
+        * minibuf.c (temp_echo_area_glyphs):
+        * keyboard.c (command_loop_1, read_char, Fexecute_extended_command):
+        * fileio.c (Fdo_auto_save): Update/simplify sit_for calls.
+
 2006-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * syntax.c (forw_comment): Also use EMACS_INT for buffer positions.