aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-07-10 13:27:15 +0200
committerJan Djärv2013-07-10 13:27:15 +0200
commit29be4a5095e3169d5059e1f5033208a70c68ba77 (patch)
tree46f3bfcaf56159c3b7a01ba9c8daedb6ad162a7f /src
parent20c9c1dc90ea3663c3a5293cfdf0a2d3e4e31864 (diff)
downloademacs-29be4a5095e3169d5059e1f5033208a70c68ba77.tar.gz
emacs-29be4a5095e3169d5059e1f5033208a70c68ba77.zip
* emacs.c (main): Fix syntax error.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 049c917eddd..dcd7c13b00f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-07-10 Jan Djärv <jan.h.d@swipnet.se>
2
3 * emacs.c (main): Fix syntax error.
4
12013-07-10 Paul Eggert <eggert@cs.ucla.edu> 52013-07-10 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Timestamp fixes for undo (Bug#14824). 7 Timestamp fixes for undo (Bug#14824).
diff --git a/src/emacs.c b/src/emacs.c
index ee72095f705..7c0ddf97a01 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1042,7 +1042,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
1042 1042
1043 execvp (argv[0], argv); 1043 execvp (argv[0], argv);
1044 emacs_perror (argv[0]); 1044 emacs_perror (argv[0]);
1045 exit (errno == ENOENT : EXIT_ENOENT : EXIT_CANNOT_INVOKE); 1045 exit (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
1046 } 1046 }
1047 1047
1048 /* In exec'd: parse special dname into pipe and name info. */ 1048 /* In exec'd: parse special dname into pipe and name info. */