branch: elpa/bind-map commit 26a3b5571de9b3ab1fbcf5a9aca921e4c74f5dc2 Author: justbur <jus...@burkett.cc> Commit: justbur <jus...@burkett.cc>
Make return val consistent in bind-map Used to simplify a couple of macro calls --- bind-map.el | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/bind-map.el b/bind-map.el index b92f5a9799..2532ed0aa3 100644 --- a/bind-map.el +++ b/bind-map.el @@ -366,7 +366,9 @@ mode maps. Set up by bind-map.el." map)) (when bindings `((bind-map-set-keys ,map - ,@bindings)))))) + ,@bindings))) + + `(',map)))) (put 'bind-map 'lisp-indent-function 'defun) (defun bind-map--get-prop (keyword args parent-args) @@ -419,11 +421,9 @@ generated keymap is returned, which is MAJOR-MODE-SYM concatenated with `bind-map-default-map-suffix'." (let ((map-name (intern (concat (symbol-name major-mode-sym) bind-map-default-map-suffix)))) - `(progn - (bind-map ,map-name - :major-modes (,major-mode-sym) - ,@args) - ',map-name))) + `(bind-map ,map-name + :major-modes (,major-mode-sym) + ,@args))) (put 'bind-map-for-major-mode 'lisp-indent-function 'defun) ;;;###autoload @@ -441,11 +441,9 @@ generated keymap is returned, which is MINOR-MODE-SYM concatenated with `bind-map-default-map-suffix'." (let ((map-name (intern (concat (symbol-name minor-mode-sym) bind-map-default-map-suffix)))) - `(progn - (bind-map ,map-name - :minor-modes (,minor-mode-sym) - ,@args) - ',map-name))) + `(bind-map ,map-name + :minor-modes (,minor-mode-sym) + ,@args))) (put 'bind-map-for-minor-mode 'lisp-indent-function 'defun) ;;;###autoload