diff options
| author | Daniel Colascione | 2014-04-23 19:37:02 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2014-04-23 19:37:02 -0700 |
| commit | 9b233997f468fe8a4f4cb7c0c799aff2e3374ba1 (patch) | |
| tree | a479ebf7c0d4f1e974707b9900fbd81dec55ecc2 | |
| parent | 417c9bcba10006e773e24cbed1ddb9b16712ceb0 (diff) | |
| download | emacs-9b233997f468fe8a4f4cb7c0c799aff2e3374ba1.tar.gz emacs-9b233997f468fe8a4f4cb7c0c799aff2e3374ba1.zip | |
Add coproc to list of bash builtins.
* lisp/progmodes/sh-script.el (sh-builtins): Add coproc to list of bash builtins.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f94ba4c45a..4026cf7bd5a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-04-24 Daniel Colascione <dancol@dancol.org> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-builtins): Add coproc to list of bash builtins. | ||
| 4 | |||
| 1 | 2014-04-23 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2014-04-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge. | 7 | * emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge. |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 06d7a8fdffe..e8a4d925065 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -677,7 +677,7 @@ removed when closing the here document." | |||
| 677 | "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt" | 677 | "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt" |
| 678 | "source" "suspend" "typeset" "unalias" | 678 | "source" "suspend" "typeset" "unalias" |
| 679 | ;; bash4 | 679 | ;; bash4 |
| 680 | "mapfile" "readarray") | 680 | "mapfile" "readarray" "coproc") |
| 681 | 681 | ||
| 682 | ;; The next entry is only used for defining the others | 682 | ;; The next entry is only used for defining the others |
| 683 | (bourne sh-append shell | 683 | (bourne sh-append shell |