3 files changed, 10 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73ced85d796..0ccc3f7efa1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-05  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (interpreter-mode-alist):
+        * progmodes/sh-script.el (sh-ancestor-alist): Add dash.  (Bug#16938)
+
 2014-03-05  Juanma Barranquero  <lekktu@gmail.com>
 
         * frameset.el (frameset--initial-params): Filter out null entries.
diff --git a/lisp/files.el b/lisp/files.el
index 8304dccf440..6f930aa492f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2517,6 +2517,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
      ("scm" . scheme-mode)
      ("[acjkwz]sh" . sh-mode)
      ("r?bash2?" . sh-mode)
+     ("dash" . sh-mode)
      ("\\(dt\\|pd\\|w\\)ksh" . sh-mode)
      ("es" . sh-mode)
      ("i?tcsh" . sh-mode)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 7c677df8592..84b0c8b1af4 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,7 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1993-1997, 1999, 2001-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1993-1997, 1999, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
@@ -228,6 +227,7 @@
   '((ash . sh)
     (bash . jsh)
     (bash2 . jsh)
+    (dash . ash)
     (dtksh . ksh)
     (es . rc)
     (itcsh . tcsh)
@@ -255,6 +255,7 @@ rc		Plan 9 Shell
   es            Extensible Shell
 sh              Bourne Shell
   ash           Almquist Shell
+    dash        Debian Almquist Shell
   jsh           Bourne Shell with Job Control
     bash        GNU Bourne Again Shell
     ksh88       Korn Shell '88
@@ -267,6 +268,7 @@ sh		Bourne Shell
   posix         IEEE 1003.2 Shell Standard
   wsh           ? Shell"
   :type '(repeat (cons symbol symbol))
+  :version "24.4"                       ; added dash
   :group 'sh-script)