aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorStefan Monnier2012-05-11 10:24:50 -0400
committerStefan Monnier2012-05-11 10:24:50 -0400
commitff46c759ddf01935f111660d982ec03d83406d24 (patch)
tree91abf4834c71e8f05a967af59aa3aa3a3a579f79 /etc
parentdee6c9a34ff9f8ca764465937b6d2621cbb36318 (diff)
downloademacs-ff46c759ddf01935f111660d982ec03d83406d24.tar.gz
emacs-ff46c759ddf01935f111660d982ec03d83406d24.zip
* lisp/progmodes/sh-script.el: Use post-self-insert-hook&electric-pair-mode.
Provide SMIE-based indentation (not enabled by default yet). (sh-mode-map): Don't bind electric keys. Use electric-pair-mode instead of skeleton-pair. (sh-assignment-regexp): Fit within 80 columns. (sh-indent-supported): Specify actual shell name instead of boolean. (sh--maybe-here-document): New fun, from sh-maybe-here-document. (sh-maybe-here-document): Use it. Make obsolete. (sh-electric-here-document-mode) New minor mode. (sh-mode): Use it. Don't set sh-indent-supported-here here. (sh-smie-sh-grammar, sh-smie--sh-operators, sh-smie--sh-operators-re) (sh-smie--sh-operators-back-re, sh-indent-after-continuation) (sh-smie-rc-grammar, sh-use-smie): New vars. (sh-smie--keyword-p, sh-smie--newline-semi-p, sh-smie--sh-keyword-p) (sh-smie-sh-forward-token, sh-smie--looking-back-at-continuation-p) (sh-smie-sh-backward-token, sh-smie--continuation-start-indent) (sh-smie-sh-rules, sh-smie-rc-rules, sh-smie--sh-keyword-in-p) (sh-smie--rc-after-special-arg-p, sh-smie-rc-backward-token) (sh-smie-sh-rules, sh-smie--rc-newline-semi-p): New functions. (sh-set-shell): Use smie-setup if requested.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 9c7cb834b8d..a584d5943ea 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -90,6 +90,11 @@ character when doing minibuffer filename prompts.
90 90
91* Changes in Specialized Modes and Packages in Emacs 24.2 91* Changes in Specialized Modes and Packages in Emacs 24.2
92 92
93** `sh-script'
94*** Pairing of parens/quotes uses electric-pair-mode instead of skeleton-pair.
95*** `sh-electric-here-document-mode' now controls auto-insertion of here-docs.
96*** `sh-use-smie' lets you choose a new indentation and navigation code.
97
93** reStructuredText mode 98** reStructuredText mode
94 99
95*** Major merge with upstream development. 100*** Major merge with upstream development.