diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/paren.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/paren.el')
| -rw-r--r-- | lisp/paren.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/paren.el b/lisp/paren.el index 30314c2f9c8..5825d6a4f72 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -87,7 +87,10 @@ whitespace there." 'show-paren-mismatch "22.1") (defcustom show-paren-highlight-openparen t - "Non-nil turns on openparen highlighting when matching forward." + "Non-nil turns on openparen highlighting when matching forward. +When nil, and point stands just before an open paren, the paren +is not highlighted, the cursor being regarded as adequate to mark +its position." :type 'boolean) (defvar show-paren--idle-timer nil) |