aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-11 13:31:29 -0400
committerGlenn Morris2013-09-11 13:31:29 -0400
commit5ec0337a36f61c2bd6c7c3ef8102f7deeeafd09a (patch)
treec473399259139455f55408208daf6bc6da5b9116
parent5c91a2b88d1efef802d6b76910ead67ff8048289 (diff)
downloademacs-5ec0337a36f61c2bd6c7c3ef8102f7deeeafd09a.tar.gz
emacs-5ec0337a36f61c2bd6c7c3ef8102f7deeeafd09a.zip
* src/emacs.c (usage_message): Possessive apostrophe tweak.
Likewise in some comments.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c6
-rw-r--r--src/w32proc.c2
-rw-r--r--src/xfns.c2
4 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e3fd6e96ec2..e1276f54d03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-09-11 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c (usage_message): Possessive apostrophe tweak.
4
12013-09-11 Dmitry Antipov <dmantipov@yandex.ru> 52013-09-11 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 * nsterm.m (syms_of_nsterm): Use Qns. 7 * nsterm.m (syms_of_nsterm): Use Qns.
diff --git a/src/emacs.c b/src/emacs.c
index 05384145330..dc4c23b3991 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,7 +1,7 @@
1/* Fully extensible Emacs, running on Unix, intended for GNU. 1/* Fully extensible Emacs, running on Unix, intended for GNU.
2 2
3Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2013 Free Software 3Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2013
4Foundation, Inc. 4 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7
@@ -310,7 +310,7 @@ example, -batch as well as --batch. You can use any unambiguous\n\
310abbreviation for a --option.\n\ 310abbreviation for a --option.\n\
311\n\ 311\n\
312Various environment variables and window system resources also affect\n\ 312Various environment variables and window system resources also affect\n\
313Emacs' operation. See the main documentation.\n\ 313the operation of Emacs. See the main documentation.\n\
314\n\ 314\n\
315Report bugs to bug-gnu-emacs@gnu.org. First, please see the Bugs\n\ 315Report bugs to bug-gnu-emacs@gnu.org. First, please see the Bugs\n\
316section of the Emacs manual or the file BUGS.\n" 316section of the Emacs manual or the file BUGS.\n"
diff --git a/src/w32proc.c b/src/w32proc.c
index dabaa62f71c..221b42fb7b2 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1144,7 +1144,7 @@ create_child (char *exe, char *cmdline, char *env, int is_gui_app,
1144 return FALSE; 1144 return FALSE;
1145} 1145}
1146 1146
1147/* create_child doesn't know what emacs' file handle will be for waiting 1147/* create_child doesn't know what emacs's file handle will be for waiting
1148 on output from the child, so we need to make this additional call 1148 on output from the child, so we need to make this additional call
1149 to register the handle with the process 1149 to register the handle with the process
1150 This way the select emulator knows how to match file handles with 1150 This way the select emulator knows how to match file handles with
diff --git a/src/xfns.c b/src/xfns.c
index 9b3bf79c088..74bc7a8b1d0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1031,7 +1031,7 @@ x_set_border_pixel (struct frame *f, int pix)
1031 Note: this is done in two routines because of the way X10 works. 1031 Note: this is done in two routines because of the way X10 works.
1032 1032
1033 Note: under X11, this is normally the province of the window manager, 1033 Note: under X11, this is normally the province of the window manager,
1034 and so emacs' border colors may be overridden. */ 1034 and so emacs's border colors may be overridden. */
1035 1035
1036static void 1036static void
1037x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) 1037x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)