aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/sh-script.el
diff options
context:
space:
mode:
authorGlenn Morris2014-03-05 13:58:16 -0500
committerGlenn Morris2014-03-05 13:58:16 -0500
commitbd2d43dc7461cc3d8cdcecf069fc275baf60c842 (patch)
tree2892cf862f0e882031d9292815180c302a6535b8 /lisp/progmodes/sh-script.el
parent6952100dc3abfd9df124ca45d924a18b654d2de3 (diff)
downloademacs-bd2d43dc7461cc3d8cdcecf069fc275baf60c842.tar.gz
emacs-bd2d43dc7461cc3d8cdcecf069fc275baf60c842.zip
Recognize dash shell
* lisp/files.el (interpreter-mode-alist): * lisp/progmodes/sh-script.el (sh-ancestor-alist): Add dash. Fixes: debbugs:16938
Diffstat (limited to 'lisp/progmodes/sh-script.el')
-rw-r--r--lisp/progmodes/sh-script.el6
1 files changed, 4 insertions, 2 deletions
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 @@
1;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*- 1;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*-
2 2
3;; Copyright (C) 1993-1997, 1999, 2001-2014 Free Software Foundation, 3;; Copyright (C) 1993-1997, 1999, 2001-2014 Free Software Foundation, Inc.
4;; Inc.
5 4
6;; Author: Daniel Pfeiffer <occitan@esperanto.org> 5;; Author: Daniel Pfeiffer <occitan@esperanto.org>
7;; Version: 2.0f 6;; Version: 2.0f
@@ -228,6 +227,7 @@
228 '((ash . sh) 227 '((ash . sh)
229 (bash . jsh) 228 (bash . jsh)
230 (bash2 . jsh) 229 (bash2 . jsh)
230 (dash . ash)
231 (dtksh . ksh) 231 (dtksh . ksh)
232 (es . rc) 232 (es . rc)
233 (itcsh . tcsh) 233 (itcsh . tcsh)
@@ -255,6 +255,7 @@ rc Plan 9 Shell
255 es Extensible Shell 255 es Extensible Shell
256sh Bourne Shell 256sh Bourne Shell
257 ash Almquist Shell 257 ash Almquist Shell
258 dash Debian Almquist Shell
258 jsh Bourne Shell with Job Control 259 jsh Bourne Shell with Job Control
259 bash GNU Bourne Again Shell 260 bash GNU Bourne Again Shell
260 ksh88 Korn Shell '88 261 ksh88 Korn Shell '88
@@ -267,6 +268,7 @@ sh Bourne Shell
267 posix IEEE 1003.2 Shell Standard 268 posix IEEE 1003.2 Shell Standard
268 wsh ? Shell" 269 wsh ? Shell"
269 :type '(repeat (cons symbol symbol)) 270 :type '(repeat (cons symbol symbol))
271 :version "24.4" ; added dash
270 :group 'sh-script) 272 :group 'sh-script)
271 273
272 274