[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/mct 775f42951d 02/64: Remove mct--region-current-buffer
From: |
ELPA Syncer |
Subject: |
[elpa] externals/mct 775f42951d 02/64: Remove mct--region-current-buffer |
Date: |
Thu, 30 Dec 2021 23:57:48 -0500 (EST) |
branch: externals/mct
commit 775f42951dcdb5ba6eabe1dfb64156f0e31337e3
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Protesilaos Stavrou <info@protesilaos.com>
Remove mct--region-current-buffer
* Avoid redundant global state
* By executing `marker-buffer` every time, it is checked that the buffer is
alive
---
mct.el | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/mct.el b/mct.el
index ec36e72eda..e6bbf67cb6 100644
--- a/mct.el
+++ b/mct.el
@@ -578,8 +578,8 @@ ARG is a numeric argument for `next-completion', as
described in
(cond
;; FIXME 2021-12-03: same principle as what I wrote above
;; `mct--region-or-minibuffer-active-p'.
- (mct--region-current-buffer
- (mct-focus-marker-buffer))
+ ((mct--region-current-buffer)
+ (mct--focus-current-buffer))
((mct--active-p)
(mct-focus-minibuffer))))
@@ -1111,19 +1111,14 @@ region.")
;;;;;; Live completions
-(defvar mct--region-current-buffer nil
- "Buffer of current Mct session.")
+(defun mct--region-current-buffer ()
+ "Return current buffer of completion in region."
+ (and completion-in-region--data (marker-buffer (nth 0 data))))
-(defun mct--region-marker-buffer ()
- "Set `mct--region-current-buffer', if any."
- (if-let ((data completion-in-region--data))
- (setq mct--region-current-buffer (marker-buffer (nth 0 data)))
- (setq mct--region-current-buffer nil)))
-
-(defun mct-focus-marker-buffer ()
+(defun mct--focus-current-buffer ()
"Focus the buffer where `completion-in-region' is active."
(interactive nil mct-region-mode)
- (when-let ((buf mct--region-current-buffer))
+ (when-let ((buf (mct--region-current-buffer)))
(select-window (get-buffer-window buf))))
(defun mct--region-live-completions (&rest _)
@@ -1145,7 +1140,6 @@ Meant to be added to `after-change-functions'."
;; It cannot be `completion-in-region-mode'.
(defun mct--region-setup-completion-in-region ()
"Set up Mct for `completion-in-region'."
- (mct--region-marker-buffer)
(mct--region-live-update))
;; FIXME 2021-12-03: We cannot use Orderless. Neither the
- [elpa] externals/mct 788aeafb04 19/64: Rename the minibuffer mode, (continued)
- [elpa] externals/mct 788aeafb04 19/64: Rename the minibuffer mode, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 6222731289 10/64: Add new FIXME to exit region completion cleanly, ELPA Syncer, 2021/12/30
- [elpa] externals/mct c79f8c86c9 07/64: Take note of more issues with completion-in-region, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 0d7d64d79a 15/64: Add in-region version of choose-completion, ELPA Syncer, 2021/12/30
- [elpa] externals/mct adeddd2dfe 14/64: Write helper for "choose completion" routine, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 298a83cfc5 17/64: Respin the mct setup for in-region scenario (WIP), ELPA Syncer, 2021/12/30
- [elpa] externals/mct 0362ca4bf1 34/64: Rename symbol for consistency, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 28d7c54f51 44/64: Add debug print to monitor completion-in-region-mode, ELPA Syncer, 2021/12/30
- [elpa] externals/mct bf0f666ee4 49/64: Replace "mct-mode" with "mct-minibuffer-mode", ELPA Syncer, 2021/12/30
- [elpa] externals/mct aaaf12c70c 50/64: Merge branch 'main' into experiment-completion-in-region, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 775f42951d 02/64: Remove mct--region-current-buffer,
ELPA Syncer <=
- [elpa] externals/mct fb177ace70 18/64: Keep "next or mini" intact (we'll use another fn), ELPA Syncer, 2021/12/30
- [elpa] externals/mct f3d86fe28a 06/64: Rename internal function, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 72a1c3e6f4 22/64: Minor changes to doc strings, ELPA Syncer, 2021/12/30
- [elpa] externals/mct dedb62cce5 23/64: Implement next/prev candidate or quit completions, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 6bb328a795 24/64: Merge branch 'main' into experiment-completion-in-region, ELPA Syncer, 2021/12/30
- [elpa] externals/mct a3edf3ce5a 28/64: Remove obsolete function, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 85d05c08b6 33/64: Remove superfluous comment, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 6a1835cf00 48/64: Remove mct--region-buf, ELPA Syncer, 2021/12/30
- [elpa] externals/mct 771fb8b3cb 54/64: Make in-region prev motion work at all times, ELPA Syncer, 2021/12/30
- [elpa] externals/mct e4b49f40f1 58/64: Add TODO about local mct-region-mode, ELPA Syncer, 2021/12/30