[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/leaf ff2f4ec 07/13: Merge pull request #484 from conao3
From: |
Stefan Monnier |
Subject: |
[elpa] externals/leaf ff2f4ec 07/13: Merge pull request #484 from conao3/feature#482 |
Date: |
Wed, 17 Mar 2021 18:45:36 -0400 (EDT) |
branch: externals/leaf
commit ff2f4eca0ceba70f2bcec46e82c1145d592e4fb6
Merge: e4343f1 8ad0eb8
Author: Naoya Yamashita <conao3@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #484 from conao3/feature#482
feature#482
---
leaf-tests.el | 4 ++--
leaf.el | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/leaf-tests.el b/leaf-tests.el
index aa28961..6d089aa 100644
--- a/leaf-tests.el
+++ b/leaf-tests.el
@@ -2399,10 +2399,10 @@ Example:
(define-key shell-mode-map [remap backward-sentence]
'sh-beginning-of-command)))
((leaf-key (vector 'key-chord ?i ?j) 'undo nil)
- (let* ((old (lookup-key global-map (vector 'key-chord 105 106)))
+ (let* ((old (lookup-key global-map [key-chord 105 106]))
(value `(global-map "<key-chord> i j" undo ,(and old (not
(numberp old)) old) nil)))
(push value leaf-key-bindlist)
- (define-key global-map (vector 'key-chord 105 106) 'undo)))
+ (define-key global-map [key-chord 105 106] 'undo)))
((leaf-key [(control ?x) (control ?f)] 'undo)
(let* ((old (lookup-key global-map [(control 120) (control 102)]))
diff --git a/leaf.el b/leaf.el
index d88dbb8..e61961f 100644
--- a/leaf.el
+++ b/leaf.el
@@ -5,7 +5,7 @@
;; Author: Naoya Yamashita <conao3@gmail.com>
;; Maintainer: Naoya Yamashita <conao3@gmail.com>
;; Keywords: lisp settings
-;; Version: 4.4.1
+;; Version: 4.4.2
;; URL: https://github.com/conao3/leaf.el
;; Package-Requires: ((emacs "24.1"))
@@ -828,10 +828,10 @@ For example:
(path (leaf-this-file))
(_mvec (if (vectorp key*) key* (read-kbd-macro key*)))
(mstr (if (stringp key*) key* (key-description key*))))
- `(let* ((old (lookup-key ,mmap ,(if vecp key `(kbd ,key))))
+ `(let* ((old (lookup-key ,mmap ,(if vecp key* `(kbd ,key*))))
(value ,(list '\` `(,mmap ,mstr ,command* ,',(and old (not
(numberp old)) old) ,path))))
(push value leaf-key-bindlist)
- (define-key ,mmap ,(if vecp key `(kbd ,key)) ',command*))))
+ (define-key ,mmap ,(if vecp key* `(kbd ,key*)) ',command*))))
(defmacro leaf-key* (key command)
"Similar to `leaf-key', but overrides any mode-specific bindings.
- [elpa] externals/leaf 317879f 01/13: Add :bind-keymap, :bind-keymap*, (continued)
- [elpa] externals/leaf 317879f 01/13: Add :bind-keymap, :bind-keymap*, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf 839d2f0 05/13: fix typo; key -> key*, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf e99647d 09/13: update document, tagged v4.4.3, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf ab5cc26 13/13: Merge pull request #487 from conao3/feature#486, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf 102e73b 12/13: tagged v4.4.4, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf 2378904 08/13: implement :pre-setf, :pre-push, :setf, :push keywords, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf e4343f1 04/13: Merge pull request #483 from conao3/feature#266, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf 5c3647d 02/13: add testcases, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf 8ad0eb8 06/13: tagged v4.4.2, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf de55bed 03/13: update document, tagged v4.4.1, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf ff2f4ec 07/13: Merge pull request #484 from conao3/feature#482,
Stefan Monnier <=
- [elpa] externals/leaf 34f0f1d 10/13: Merge pull request #485 from conao3/feature#470, Stefan Monnier, 2021/03/17
- [elpa] externals/leaf 0c7118e 11/13: fix readme link, Stefan Monnier, 2021/03/17