[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/consult a08e270 1/3: Fix #375: Disable completion previ

From: ELPA Syncer
Subject: [elpa] externals/consult a08e270 1/3: Fix #375: Disable completion preview in org source blocks
Date: Fri, 30 Jul 2021 11:57:07 -0400 (EDT)

branch: externals/consult
commit a08e2709e4bae9da8acbcfe58875205384caee38
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Fix #375: Disable completion preview in org source blocks
 consult.el | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/consult.el b/consult.el
index 313dab2..861952a 100644
--- a/consult.el
+++ b/consult.el
@@ -552,7 +552,7 @@ ARGS is a list of commands or sources followed by the list 
of keyword-value pair
        (setq ,list (cdr ,head))
-;; Upstream bug#46326, Consult issue 
+;; Upstream bug#49776, Consult issue 
 (defmacro consult--minibuffer-with-setup-hook (fun &rest body)
   "Variant of `minibuffer-with-setup-hook' using a symbol and `fset'.
@@ -2081,13 +2081,20 @@ KEYMAP is a command-specific keymap."
 The candidates are previewed in the region from START to END. This function is
 used as the `:state' argument for `consult--read' in the `consult-yank' family
 of functions and in `consult-completion-in-region'."
-  (unless (minibufferp)
+  (unless (or (minibufferp)
+              ;; XXX Disable preview if anything odd is going on with the 
markers. Otherwise we get
+              ;; "Marker points into wrong buffer errors". See
+              ;; https://github.com/minad/consult/issues/375, where Org mode 
source blocks are
+              ;; completed in a different buffer than the original buffer. 
This completion is
+              ;; probably also problematic in my Corfu completion package.
+              (not (eq (window-buffer) (current-buffer)))
+             (and (markerp start) (not (eq (marker-buffer start) 
+             (and (markerp end) (not (eq (marker-buffer end) 
     (let (ov)
       (lambda (cand restore)
         (if restore
             (when ov (delete-overlay ov))
-          (unless ov (setq ov (consult--overlay start end
-                                                'invisible t
+          (unless ov (setq ov (consult--overlay start end 'invisible t
                                                 'window (selected-window))))
           ;; Use `add-face-text-property' on a copy of "cand in order to merge 
face properties
           (setq cand (copy-sequence cand))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]