[Emacs-diffs] trunk r116674: Recognize dash shell

[Glenn Morris]

------------------------------------------------------------
revno: 116674
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16938
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-03-05 13:58:16 -0500
message:
  Recognize dash shell
  
  * lisp/files.el (interpreter-mode-alist):
  * lisp/progmodes/sh-script.el (sh-ancestor-alist): Add dash.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265
  lisp/progmodes/sh-script.el    shscript.el-20091113204419-o5vbwnq5f7feedwu-727

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-05 18:44:58 +0000
+++ b/lisp/ChangeLog    2014-03-05 18:58:16 +0000
@@ -1,3 +1,8 @@
+2014-03-05  Glenn Morris  <address@hidden>
+
+       * files.el (interpreter-mode-alist):
+       * progmodes/sh-script.el (sh-ancestor-alist): Add dash.  (Bug#16938)
+
 2014-03-05  Juanma Barranquero  <address@hidden>
 
        * frameset.el (frameset--initial-params): Filter out null entries.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2014-03-04 03:26:17 +0000
+++ b/lisp/files.el     2014-03-05 18:58:16 +0000
@@ -2517,6 +2517,7 @@
      ("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)

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2014-02-10 01:34:22 +0000
+++ b/lisp/progmodes/sh-script.el       2014-03-05 18:58:16 +0000
@@ -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 <address@hidden>
 ;; 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 @@
   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 @@
   posix                IEEE 1003.2 Shell Standard
   wsh          ? Shell"
   :type '(repeat (cons symbol symbol))
+  :version "24.4"                       ; added dash
   :group 'sh-script)