Merge from emacs-24; up to 2014-04-17T02:05:48Z!eggert@cs.ucla.edu

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9078046f1492ce1e5638f23cd3e9243342d16940..648e5f3869e6a02e51c182e373cd176a2bb0d997 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable
+       assignments such as "case=hello" (bug#17297).
+
 2014-04-18  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-run-real-handler, tramp-file-name-handler):