pkg update and first config fix
org-brain not working, add org-roam
This commit is contained in:
25
lisp/avy.el
25
lisp/avy.el
@@ -4,8 +4,8 @@
|
||||
|
||||
;; Author: Oleh Krehel <ohwoeowho@gmail.com>
|
||||
;; URL: https://github.com/abo-abo/avy
|
||||
;; Package-Version: 20220102.805
|
||||
;; Package-Commit: ba5f035be33693d1a136a5cbeedb24327f551a92
|
||||
;; Package-Version: 20220910.1936
|
||||
;; Package-Commit: 955c8dedd68c74f3cf692c1249513f048518c4c9
|
||||
;; Version: 0.5.0
|
||||
;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
|
||||
;; Keywords: point, location
|
||||
@@ -457,6 +457,9 @@ KEYS is the path from the root of `avy-tree' to LEAF."
|
||||
(defvar avy-action nil
|
||||
"Function to call at the end of select.")
|
||||
|
||||
(defvar avy-action-oneshot nil
|
||||
"Function to call once at the end of select.")
|
||||
|
||||
(defun avy-handler-default (char)
|
||||
"The default handler for a bad CHAR."
|
||||
(let (dispatch)
|
||||
@@ -892,10 +895,11 @@ multiple OVERLAY-FN invocations."
|
||||
(t
|
||||
(funcall avy-pre-action res)
|
||||
(setq res (car res))
|
||||
(funcall (or avy-action 'avy-action-goto)
|
||||
(if (consp res)
|
||||
(car res)
|
||||
res))
|
||||
(let ((action (or avy-action avy-action-oneshot 'avy-action-goto)))
|
||||
(funcall action
|
||||
(if (consp res)
|
||||
(car res)
|
||||
res)))
|
||||
res))))
|
||||
|
||||
(define-obsolete-function-alias 'avy--process 'avy-process
|
||||
@@ -1017,10 +1021,11 @@ COMPOSE-FN is a lambda that concatenates the old string at BEG with STR."
|
||||
(os-line-prefix (get-text-property 0 'line-prefix old-str))
|
||||
(os-wrap-prefix (get-text-property 0 'wrap-prefix old-str))
|
||||
other-ol)
|
||||
(when os-line-prefix
|
||||
(add-text-properties 0 1 `(line-prefix ,os-line-prefix) str))
|
||||
(when os-wrap-prefix
|
||||
(add-text-properties 0 1 `(wrap-prefix ,os-wrap-prefix) str))
|
||||
(unless (= (length str) 0)
|
||||
(when os-line-prefix
|
||||
(add-text-properties 0 1 `(line-prefix ,os-line-prefix) str))
|
||||
(when os-wrap-prefix
|
||||
(add-text-properties 0 1 `(wrap-prefix ,os-wrap-prefix) str)))
|
||||
(when (setq other-ol (cl-find-if
|
||||
(lambda (o) (overlay-get o 'goto-address))
|
||||
(overlays-at beg)))
|
||||
|
||||
Reference in New Issue
Block a user