1 files changed, 15 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a720aa19ec..a27456241a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2014-05-21  Daniel Colascione  <dancol@dancol.org>
+
+        * files.el (interpreter-mode-alist): Add mksh.
+
+        * progmodes/sh-script.el (sh-ancestor-alist): Add mksh, a pdksh
+        derivative.
+        (sh-alias-alist): Alias /system/bin/sh (Android's system shell) to
+        mksh. Improve custom spec; allow regular expressions.
+        (sh-shell): Delegate name splitting to `sh-canonicalize-shell'.
+        (sh-after-hack-local-variables): New function.
+        (sh-mode): Use it; respect file-local `sh-shell' variable. (bug#17333)
+        (sh-set-shell): Use `sh-canonicalize-shell' instead of open-coding
+        the normalization.
+        (sh-canonicalize-shell): Rewrite to support regexes.
+
 2014-05-21  Leo Liu  <sdl.web@gmail.com>
 
         * emacs-lisp/cl-lib.el (cl-endp): Fix last change.