merge from trunk

6 files changed, 14 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a79110f4a0..c7e08e40480 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-11  Glenn Morris  <rgm@gnu.org>
+
+        * savehist.el: No need for cl when compiling on Emacs.
+
 2013-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eshell/esh-mode.el (eshell-mode-syntax-table): Fix up initialization
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 374e57feb1f..379818b2707 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -49,7 +49,7 @@
 
 (require 'custom)
 (eval-when-compile
-  (require 'cl))
+  (if (featurep 'xemacs) (require 'cl)))
 
 ;; User variables
 
diff --git a/src/ChangeLog b/src/ChangeLog
index e3fd6e96ec2..e1276f54d03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-11  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c (usage_message): Possessive apostrophe tweak.
+
 2013-09-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * nsterm.m (syms_of_nsterm): Use Qns.
diff --git a/src/emacs.c b/src/emacs.c
index 96a5d33f363..6ef9aeb93da 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,7 +1,7 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
 
-Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2013 Free Software
-Foundation, Inc.
+Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2013
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -313,7 +313,7 @@ example, -batch as well as --batch.  You can use any unambiguous\n\
 abbreviation for a --option.\n\
 \n\
 Various environment variables and window system resources also affect\n\
-Emacs' operation.  See the main documentation.\n\
+the operation of Emacs.  See the main documentation.\n\
 \n\
 Report bugs to bug-gnu-emacs@gnu.org.  First, please see the Bugs\n\
 section 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,
   return FALSE;
 }
 
-/* create_child doesn't know what emacs' file handle will be for waiting
+/* create_child doesn't know what emacs's file handle will be for waiting
    on output from the child, so we need to make this additional call
    to register the handle with the process
    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)
    Note: this is done in two routines because of the way X10 works.
 
    Note: under X11, this is normally the province of the window manager,
-   and so emacs' border colors may be overridden.  */
+   and so emacs's border colors may be overridden.  */
 
 static void
 x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)