[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed 9bb3513 04/34: Fix differing initialization condi
From: |
Stefan Monnier |
Subject: |
[elpa] externals/objed 9bb3513 04/34: Fix differing initialization conditions |
Date: |
Mon, 15 Mar 2021 22:21:08 -0400 (EDT) |
branch: externals/objed
commit 9bb351313799bf4fb39f1b680cdf0a7ddccccbb4
Author: Clemens Radermacher <clemera@posteo.net>
Commit: Clemens Radermacher <clemera@posteo.net>
Fix differing initialization conditions
---
objed.el | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/objed.el b/objed.el
index 9222abc..17020f3 100644
--- a/objed.el
+++ b/objed.el
@@ -1291,14 +1291,7 @@ Useful for keeping the same popup when pressing
undefined keys.")
See `objed-cmd-alist'."
(when (and objed-mode
(funcall objed-init-p-function)
- (not (minibufferp))
- (not objed--block-p)
- (eq real-this-command cmd)
- (not objed-disabled-p)
- (not (eq (cadr overriding-terminal-local-map)
- objed-map))
- (or (not objed-disabled-modes)
- (not (apply 'derived-mode-p objed-disabled-modes))))
+ (eq real-this-command cmd))
(objed--init cmd)))
(defun objed--save-start-position (&rest _)
@@ -1345,10 +1338,12 @@ See `objed-cmd-alist'."
(defun objed-init-p ()
"Default for `objed-init-p-function'."
(and (not (minibufferp))
- (not (bobp))
+ (not (and (bobp) (eobp)))
;; don't interfere with other special modes
;; like hydra
(not overriding-terminal-local-map)
+ (not objed--block-p)
+ (not objed-disabled-p)
;; don't activate when completing the regular Emacs way
(not (get-buffer-window "*Completions*" 0))
;; don't activate during a company completion
@@ -1358,7 +1353,8 @@ See `objed-cmd-alist'."
(not (eq last-command 'magit-commit-create))
;; dont activate when insertion keys are bound to non insert commands
(not (objed--insert-keys-rebound-p))
- ;; TODO: add variables for those
+ (or (not objed-disabled-modes)
+ (not (apply 'derived-mode-p objed-disabled-modes)))
(or (memq major-mode '(messages-buffer-mode help-mode))
(not (derived-mode-p 'comint-mode 'special-mode 'dired-mode)))))
- [elpa] externals/objed f4e7cab 24/34: Also allow prefix syntax for objed-include-backward, (continued)
- [elpa] externals/objed f4e7cab 24/34: Also allow prefix syntax for objed-include-backward, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 70f9fb5 34/34: Add notice for paused development, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 0f75d33 32/34: Fix compiler warnings, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 9f7f6e5 23/34: Improve include commands to also cover punctuation and constituents, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 2287436 19/34: Include possible active region when acting on multiple objects, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 9f565e4 30/34: Make transposing objects work with active region, Stefan Monnier, 2021/03/15
- [elpa] externals/objed e93dda7 33/34: Require cl-lib in all files, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 410a425 29/34: Refactor isearch handling and add missing commands, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 8dc1770 01/34: Stay on at boundary for M-[/] (Fix #68), Stefan Monnier, 2021/03/15
- [elpa] externals/objed 31c5ded 03/34: Add separate option for auto init behavior on buffer change, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 9bb3513 04/34: Fix differing initialization conditions,
Stefan Monnier <=
- [elpa] externals/objed e046331 07/34: Implemented objed-local-mode (#72), Stefan Monnier, 2021/03/15
- [elpa] externals/objed e89d8da 06/34: Fix bytecompile and linting errors, Stefan Monnier, 2021/03/15
- [elpa] externals/objed f5ddab2 08/34: Update objed-exit-op: Check range was passed, Stefan Monnier, 2021/03/15
- [elpa] externals/objed e871e0f 11/34: Mention changes of public interface, Stefan Monnier, 2021/03/15
- [elpa] externals/objed ae47cf6 10/34: Ensure to never shrink on expansion for objed-beg/end-of-block, Stefan Monnier, 2021/03/15
- [elpa] externals/objed f45cddb 09/34: Restructure note about out of date keybindings, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 2224691 12/34: Make note about changes more prominent, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 5d3b8a8 18/34: Fix quotes in docstring, Stefan Monnier, 2021/03/15
- [elpa] externals/objed dd520d4 20/34: Don't override last-command in objed--do-objects, Stefan Monnier, 2021/03/15
- [elpa] externals/objed 47891ba 17/34: Remove objed-extend face, Stefan Monnier, 2021/03/15