diff options
| author | Jan Djärv | 2012-07-31 07:56:36 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-07-31 07:56:36 +0200 |
| commit | 14c114ae549b8f682e8513f1379b671cd15b01ae (patch) | |
| tree | f408df08808d7925bafd91f5b946fba55787a4ef | |
| parent | 3bd21e82ebb795ef367fa68624ed7b0799a8db50 (diff) | |
| download | emacs-14c114ae549b8f682e8513f1379b671cd15b01ae.tar.gz emacs-14c114ae549b8f682e8513f1379b671cd15b01ae.zip | |
* nsterm.m (openFiles): Fix previous checkin.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
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 @@ | |||
| 1 | 2012-07-31 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (openFiles): Fix previous checkin. | ||
| 4 | |||
| 1 | 2012-07-31 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-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; |