Merge from emacs-24; up to 117698

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94473f03b7ff7c782ba4df5bad3e89245c9e06aa..c170c50c9f8fe619147e56303c7f3a85ac3df437 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-10  Glenn Morris  <rgm@gnu.org>
+
+       * startup.el (command-line): Handle nil elements in load-path.
+
 2014-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * help.el (view-lossage): Include the actual commands run.