aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b22f12a53b4..37e3bf61897 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-07-31 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (openFiles): Fix previous checkin.
4
12012-07-31 Paul Eggert <eggert@cs.ucla.edu> 52012-07-31 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * indent.c (compute_motion): Remove unused local. 7 * indent.c (compute_motion): Remove unused local.
diff --git a/src/nsterm.m b/src/nsterm.m
index 4e181e9d1d2..d92ab8160c3 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4477,7 +4477,7 @@ ns_term_shutdown (int sig)
4477 /* Don't open files from the command line, Cocoa parses the command line 4477 /* Don't open files from the command line, Cocoa parses the command line
4478 wrong anyway, --option value tries to open value if --option is the last 4478 wrong anyway, --option value tries to open value if --option is the last
4479 option. */ 4479 option. */
4480 if (ns_ignore_open_file) 4480 if (ns_do_open_file)
4481 { 4481 {
4482 NSEnumerator *files = [fileList objectEnumerator]; 4482 NSEnumerator *files = [fileList objectEnumerator];
4483 NSString *file; 4483 NSString *file;