diff --git a/.emacs.d/init.el b/.emacs.d/init.el index a0abb52..b8da6ad 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1575,8 +1575,8 @@ Returns ( . ) or nil." (defun my/copilot-tab () (interactive) - (or (when (my/should-run-emmet-p) (my/emmet-or-tab)) - (copilot-accept-completion) + (or (copilot-accept-completion) + (when (my/should-run-emmet-p) (my/emmet-or-tab)) (when (and (eq evil-state 'normal) (or hs-minor-mode outline-minor-mode)) (evil-toggle-fold) @@ -3173,7 +3173,7 @@ skip exactly those headlines that do not match." (org-timestamp-change (* n shift-n) shift-what)) (save-excursion (goto-char (point-min)) - (evil-numbers/inc-at-pt (* n shift-n) (point-min))) + (evil-numbers/inc-at-pt n (point-min))) (unless (= n n-no-remove) (goto-char (point-min)) (while (re-search-forward org-ts-regexp nil t) diff --git a/Emacs.org b/Emacs.org index ac2b0a3..b252ec5 100644 --- a/Emacs.org +++ b/Emacs.org @@ -2381,8 +2381,8 @@ A general-purpose package to run formatters on files. While the most popular for #+begin_src emacs-lisp (defun my/copilot-tab () (interactive) - (or (when (my/should-run-emmet-p) (my/emmet-or-tab)) - (copilot-accept-completion) + (or (copilot-accept-completion) + (when (my/should-run-emmet-p) (my/emmet-or-tab)) (when (and (eq evil-state 'normal) (or hs-minor-mode outline-minor-mode)) (evil-toggle-fold) @@ -4433,7 +4433,7 @@ Unfortunately, I see no way to advise the original function, so here's my versio (org-timestamp-change (* n shift-n) shift-what)) (save-excursion (goto-char (point-min)) - (evil-numbers/inc-at-pt (* n shift-n) (point-min))) + (evil-numbers/inc-at-pt n (point-min))) (unless (= n n-no-remove) (goto-char (point-min)) (while (re-search-forward org-ts-regexp nil t)