aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2007-10-24 08:24:50 +0000
committerRichard M. Stallman <[email protected]>2007-10-24 08:24:50 +0000
commita04ee1610d6513f5f162a2947e0f30225fa33422 (patch)
tree158e45239132043794b3bb63a78313fb3ca3148c
parent7f6fd740f2830d7aa6a4a01f72a3bd9663b73d4c (diff)
Comment change.
-rw-r--r--src/ChangeLog9
-rw-r--r--src/eval.c9
2 files changed, 17 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c1ed394e3..cc85133e80 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-24 Richard Stallman <[email protected]>
+
+ * frame.c (x_figure_window_size): For fullscreen case,
+ set USPosition | PPosition without clobbering rest of window_prompting.
+
+ * keyboard.c (Fcurrent_idle_time): Doc fix.
+
+ * print.c (Fwith_output_to_temp_buffer): Doc fix.
+
2007-10-19 Juanma Barranquero <[email protected]>
* process.c (Fset_process_filter): Doc fix.
diff --git a/src/eval.c b/src/eval.c
index 3ffacf7d19..ee73655d74 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2162,7 +2162,14 @@ do_autoload (fundef, funname)
/* Preserve the match data. */
record_unwind_save_match_data ();
- /* Value saved here is to be restored into Vautoload_queue. */
+ /* If autoloading gets an error (which includes the error of failing
+ to define the function being called), we use Vautoload_queue
+ to undo function definitions and `provide' calls made by
+ the function. We do this in the specific case of autoloading
+ because autoloading is not an explicit request "load this file",
+ but rather a request to "call this function".
+
+ The value saved here is to be restored into Vautoload_queue. */
record_unwind_protect (un_autoload, Vautoload_queue);
Vautoload_queue = Qt;
Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt);