summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorTassilo Horn <tsdh@gnu.org>2022-02-08 21:54:56 +0100
committerTassilo Horn <tsdh@gnu.org>2022-02-08 21:54:56 +0100
commit2755e6bba0f9dbb4030f51ea3bc258ee23bb41c5 (patch)
tree58eadcf6e9080e13f61de579e9488f221644b32c /lisp/emacs-lisp
parentf7d16d93fded6ccdfef3c537c1841b7322010f12 (diff)
downloademacs-2755e6bba0f9dbb4030f51ea3bc258ee23bb41c5.tar.gz
emacs-2755e6bba0f9dbb4030f51ea3bc258ee23bb41c5.tar.bz2
emacs-2755e6bba0f9dbb4030f51ea3bc258ee23bb41c5.zip
Allow showing show-paren context in an overlay
* lisp/paren.el (show-paren-context-when-offscreen): Add new possibility `overlay'. (show-paren--context-overlay): New defvar. (show-paren--delete-context-overlay): New function. (show-paren--show-context-in-overlay): New function. (show-paren-function): Handle the new `overlay' case. * lisp/emacs-lisp/eldoc.el (eldoc-display-message-no-interference-p): There's no interference if `show-paren-context-when-offscreen' is overlay or child-frame.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/eldoc.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 74a20b8a8b7..73713a3dec9 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -387,6 +387,10 @@ Also store it in `eldoc-last-message' and return that value."
;; conflicts with eldoc.
(and (boundp 'show-paren-context-when-offscreen)
show-paren-context-when-offscreen
+ ;; There's no conflict with the child-frame and
+ ;; overlay versions.
+ (not (memq show-paren-context-when-offscreen
+ '(child-frame overlay)))
(not (pos-visible-in-window-p
(overlay-end show-paren--overlay)))))))