aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2007-10-24 08:24:50 +0000
committerRichard M. Stallman2007-10-24 08:24:50 +0000
commita04ee1610d6513f5f162a2947e0f30225fa33422 (patch)
tree158e45239132043794b3bb63a78313fb3ca3148c /src
parent7f6fd740f2830d7aa6a4a01f72a3bd9663b73d4c (diff)
downloademacs-a04ee1610d6513f5f162a2947e0f30225fa33422.tar.gz
emacs-a04ee1610d6513f5f162a2947e0f30225fa33422.zip
Comment change.
Diffstat (limited to 'src')
-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 4c1ed394e31..cc85133e80e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12007-10-24 Richard Stallman <rms@gnu.org>
2
3 * frame.c (x_figure_window_size): For fullscreen case,
4 set USPosition | PPosition without clobbering rest of window_prompting.
5
6 * keyboard.c (Fcurrent_idle_time): Doc fix.
7
8 * print.c (Fwith_output_to_temp_buffer): Doc fix.
9
12007-10-19 Juanma Barranquero <lekktu@gmail.com> 102007-10-19 Juanma Barranquero <lekktu@gmail.com>
2 11
3 * process.c (Fset_process_filter): Doc fix. 12 * process.c (Fset_process_filter): Doc fix.
diff --git a/src/eval.c b/src/eval.c
index 3ffacf7d196..ee73655d748 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2162,7 +2162,14 @@ do_autoload (fundef, funname)
2162 /* Preserve the match data. */ 2162 /* Preserve the match data. */
2163 record_unwind_save_match_data (); 2163 record_unwind_save_match_data ();
2164 2164
2165 /* Value saved here is to be restored into Vautoload_queue. */ 2165 /* If autoloading gets an error (which includes the error of failing
2166 to define the function being called), we use Vautoload_queue
2167 to undo function definitions and `provide' calls made by
2168 the function. We do this in the specific case of autoloading
2169 because autoloading is not an explicit request "load this file",
2170 but rather a request to "call this function".
2171
2172 The value saved here is to be restored into Vautoload_queue. */
2166 record_unwind_protect (un_autoload, Vautoload_queue); 2173 record_unwind_protect (un_autoload, Vautoload_queue);
2167 Vautoload_queue = Qt; 2174 Vautoload_queue = Qt;
2168 Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt); 2175 Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt);