From: Jan Djärv Date: Tue, 31 Jul 2012 05:56:36 +0000 (+0200) Subject: * nsterm.m (openFiles): Fix previous checkin. X-Git-Tag: emacs-24.2.90~977 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14c114ae549b8f682e8513f1379b671cd15b01ae;p=emacs.git * nsterm.m (openFiles): Fix previous checkin. --- diff --git a/src/ChangeLog b/src/ChangeLog index b22f12a53b4..37e3bf61897 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-31 Jan Djärv + + * nsterm.m (openFiles): Fix previous checkin. + 2012-07-31 Paul Eggert * 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) /* Don't open files from the command line, Cocoa parses the command line wrong anyway, --option value tries to open value if --option is the last option. */ - if (ns_ignore_open_file) + if (ns_do_open_file) { NSEnumerator *files = [fileList objectEnumerator]; NSString *file;