diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:34:04 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:34:04 -0700 |
| commit | da17b70a997d3b1c38d9f3d7d8ab6c7dab273765 (patch) | |
| tree | 28c6e45159f45912c6bd3d17de7bf71e85272bfe /lisp/paren.el | |
| parent | 640335361ccc36945836b5e7de0dbbf984b332e8 (diff) | |
| parent | a09473261c8b11243e68d84c5dc2448d65a67e77 (diff) | |
| download | emacs-da17b70a997d3b1c38d9f3d7d8ab6c7dab273765.tar.gz | |
Merge from origin/emacs-25
a094732 * etc/PROBLEMS: Say that HP-UX cc doesn't work.
1925dd9 Fix duplicate wording in Emacs manual
6de8429 * lisp/paren.el (show-paren--default, show-paren-function): A...
2d671fd Fix wording in Emacs manual
a8766a2 Document how to customize input methods
6eb8995 * lisp/net/eww.el (eww-reload): Doc fix. (Bug#25981)
aceac95 Fix warning message about native completion (Bug#25984)
a314c1f Clarify documentation of 'raise' and 'height' display specs
f366f6e Mention problems with GPaste in PROBLEMS
6e788ef ; etc/PROBLEMS: Explain about the python+libedit problem (Bug...
6406618 Fix doc strings in info.el
c1ed152 ; * src/keyboard.c (Fposn_at_point): Fix last change.
eed9677 Fix doc string of 'posn-at-point'
0d5957e Documentation fix in elisp reference manual
Diffstat (limited to 'lisp/paren.el')
| -rw-r--r-- | lisp/paren.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/paren.el b/lisp/paren.el index a8ac09cf916..a4d9200c42f 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -176,6 +176,9 @@ if there's no opener/closer near point, or a list of the form Where HERE-BEG..HERE-END is expected to be near point.") (defun show-paren--default () + "Finds the opener/closer near point and its match. + +It is the default value of `show-paren-data-function'." (let* ((temp (show-paren--locate-near-paren)) (dir (car temp)) (outside (cdr temp)) @@ -228,9 +231,8 @@ Where HERE-BEG..HERE-END is expected to be near point.") (if (= dir 1) pos (1+ pos)) mismatch))))))) -;; Find the place to show, if there is one, -;; and show it until input arrives. (defun show-paren-function () + "Highlight the parentheses until the next input arrives." (let ((data (and show-paren-mode (funcall show-paren-data-function)))) (if (not data) (progn |