aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--src/ChangeLog8
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f3c8e6c498..da2995840da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -228,7 +228,7 @@
2282011-04-06 Juanma Barranquero <lekktu@gmail.com> 2282011-04-06 Juanma Barranquero <lekktu@gmail.com>
229 229
230 * files.el (after-find-file-from-revert-buffer): Remove variable. 230 * files.el (after-find-file-from-revert-buffer): Remove variable.
231 (after-find-file): Dont' bind it. 231 (after-find-file): Don't bind it.
232 (revert-buffer-in-progress-p): New variable. 232 (revert-buffer-in-progress-p): New variable.
233 (revert-buffer): Bind it. 233 (revert-buffer): Bind it.
234 Pass nil for `after-find-file-from-revert-buffer'. 234 Pass nil for `after-find-file-from-revert-buffer'.
diff --git a/src/ChangeLog b/src/ChangeLog
index 764b345bd25..669808a3a5f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -39,10 +39,10 @@
39 39
402011-04-15 Ben Key <bkey76@gmail.com> 402011-04-15 Ben Key <bkey76@gmail.com>
41 41
42 * keyboard.c (Qundefined): Don't declare static since it is 42 * keyboard.c (Qundefined): Don't declare static since it is used
43 used in nsfns.m. 43 in nsfns.m.
44 * xfaces.c (Qbold, Qexpanded, Qitalic, Qcondensed): Don't 44 * xfaces.c (Qbold, Qexpanded, Qitalic, Qcondensed): Don't declare
45 declare static since they are used in nsfont.m. 45 static since they are used in nsfont.m.
46 46
472011-04-15 Stefan Monnier <monnier@iro.umontreal.ca> 472011-04-15 Stefan Monnier <monnier@iro.umontreal.ca>
48 48