diff options
| author | Glenn Morris | 2013-08-28 21:02:46 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-08-28 21:02:46 -0400 |
| commit | cc585c965a8549af7c3cc224adbee4bc8ae1e9ec (patch) | |
| tree | d52eb58495cd4f98db7bb0a7e58aa214b055041f | |
| parent | 397440a1b6521d0dc60ee2abd97f5eed22020dab (diff) | |
| download | emacs-cc585c965a8549af7c3cc224adbee4bc8ae1e9ec.tar.gz emacs-cc585c965a8549af7c3cc224adbee4bc8ae1e9ec.zip | |
* lisp/progmodes/sh-script.el (sh-builtins) <bash>: Add some bash4-isms.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 616f9044f78..817476fb1c4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-29 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-builtins) <bash>: Add some bash4-isms. | ||
| 4 | |||
| 1 | 2013-08-28 Glenn Morris <rgm@gnu.org> | 5 | 2013-08-28 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * progmodes/antlr-mode.el: No need to require cc-mode twice. | 7 | * progmodes/antlr-mode.el: No need to require cc-mode twice. |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index c8b65e0a029..292bc2369a6 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 | 1 | ;;; sh-script.el --- shell-script editing commands for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1993-1997, 1999, 2001-2013 Free Software Foundation, | 3 | ;; Copyright (C) 1993-1997, 1999, 2001-2013 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 |
| @@ -673,7 +672,9 @@ removed when closing the here document." | |||
| 673 | "." "alias" "bg" "bind" "builtin" "caller" "compgen" "complete" | 672 | "." "alias" "bg" "bind" "builtin" "caller" "compgen" "complete" |
| 674 | "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history" | 673 | "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history" |
| 675 | "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt" | 674 | "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt" |
| 676 | "source" "suspend" "typeset" "unalias") | 675 | "source" "suspend" "typeset" "unalias" |
| 676 | ;; bash4 | ||
| 677 | "mapfile" "readarray") | ||
| 677 | 678 | ||
| 678 | ;; The next entry is only used for defining the others | 679 | ;; The next entry is only used for defining the others |
| 679 | (bourne sh-append shell | 680 | (bourne sh-append shell |
| @@ -737,6 +738,7 @@ implemented as aliases. See `sh-feature'." | |||
| 737 | :type '(repeat (cons (symbol :tag "Shell") | 738 | :type '(repeat (cons (symbol :tag "Shell") |
| 738 | (choice (repeat string) | 739 | (choice (repeat string) |
| 739 | (sexp :format "Evaluate: %v")))) | 740 | (sexp :format "Evaluate: %v")))) |
| 741 | :version "24.4" ; bash4 additions | ||
| 740 | :group 'sh-script) | 742 | :group 'sh-script) |
| 741 | 743 | ||
| 742 | 744 | ||