diff options
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/progmodes/sh-script.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a14148bf0e0..66fb8f3f12a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-14 Tassilo Horn <tassilo@member.fsf.org> + + * progmodes/sh-script.el (sh-other-keywords): Add ZSH's foreach + loop keyword. + 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/easymenu.el: Add :enable (bug#7754), and obey :label. diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index ee7e4c3b1b6..52a72f0874e 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -762,7 +762,7 @@ flow of control or syntax. See `sh-feature'." (shell "break" "case" "continue" "exec" "exit") (zsh sh-append bash - "select")) + "select" "foreach")) "List of keywords not in `sh-leading-keywords'. See `sh-feature'." :type '(repeat (cons (symbol :tag "Shell") |