aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDan Nicolaescu <[email protected]>2008-04-12 16:41:03 +0000
committerDan Nicolaescu <[email protected]>2008-04-12 16:41:03 +0000
commit63616f520813a708b0bf717be9dde084bddab31a (patch)
tree482822a9b5956143330870c315fd6294a6e8650b /lisp
parent07d5b8c101fe83ae92a2e14dbad9044984b732fb (diff)
(sh-show-indent): Fix typo.
(sh-mode-map): Add a toggle for inserting braces and quotes in pairs.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/sh-script.el9
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dac4bdaa45..c67aae3ae2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2008-04-12 Dan Nicolaescu <[email protected]>
+ * progmodes/sh-script.el (sh-show-indent): Fix typo.
+ (sh-mode-map): Add a toggle for inserting braces and quotes in pairs.
+
* vc-cvs.el (vc-cvs-registered): Allow removed files to be
considered registered.
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index fa32f4aab4..bff5814811 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -492,11 +492,16 @@ This is buffer-local in every such buffer.")
:help "Learn how to indent a line as it currently is indented"))
(define-key menu-map [sh-show-indent]
'(menu-item "Show indentation" sh-show-indent
- :help "Show the how the currently line would be indented"))
+ :help "Show the how the current line would be indented"))
(define-key menu-map [sh-set-indent]
'(menu-item "Set indentation" sh-set-indent
:help "Set the indentation for the current line"))
+ (define-key menu-map [sh-pair]
+ '(menu-item "Insert braces and quotes in pairs" (lambda () (interactive) (setq skeleton-pair (not skeleton-pair)))
+ :button (:toggle . skeleton-pair)
+ :help "Inserting a brace or quote automatically inserts the matching pair"))
+
(define-key menu-map [sh-s0] '("--"))
;; Insert
(define-key menu-map [sh-function]
@@ -2776,7 +2781,7 @@ If INFO is supplied it is used, else it is calculated from current line."
(if msg (message "%s" msg) (message nil))))
(defun sh-show-indent (arg)
- "Show the how the currently line would be indented.
+ "Show the how the current line would be indented.
This tells you which variable, if any, controls the indentation of
this line.
If optional arg ARG is non-null (called interactively with a prefix),