merge from trunk

2 files changed, 5 insertions, 1 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