aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/emacs.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 57e024757ec..a06f9e2fcd5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12013-01-22 Paul Eggert <eggert@cs.ucla.edu> 12013-01-22 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * emacs.c (Qkill_emacs_hook): Now static.
4
3 * fileio.c (Finsert_file_contents): Simplify. 5 * fileio.c (Finsert_file_contents): Simplify.
4 Remove unnecessary assignments and tests. 6 Remove unnecessary assignments and tests.
5 7
diff --git a/src/emacs.c b/src/emacs.c
index b7888d343f1..597fb2daf95 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -133,7 +133,8 @@ Lisp_Object Qfile_name_handler_alist;
133 133
134Lisp_Object Qrisky_local_variable; 134Lisp_Object Qrisky_local_variable;
135 135
136Lisp_Object Qkill_emacs, Qkill_emacs_hook; 136Lisp_Object Qkill_emacs;
137static Lisp_Object Qkill_emacs_hook;
137 138
138/* If true, Emacs should not attempt to use a window-specific code, 139/* If true, Emacs should not attempt to use a window-specific code,
139 but instead should use the virtual terminal under which it was started. */ 140 but instead should use the virtual terminal under which it was started. */