branch: elpa/rust-mode commit 01452f41c15d25b37d0cd3968a04eb397ba2df73 Author: Roy Crihfield <r...@manteia.ltd> Commit: brotzeit <brotzeitmac...@gmail.com>
Fix rust-electric-pair-skip-self-wrap nil is a valid value for electric-pair-skip-self, so handle that case --- rust-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rust-mode.el b/rust-mode.el index 8fa31da..c252204 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -1277,7 +1277,8 @@ This wraps the default defined by `electric-pair-inhibit-predicate'." This wraps the default defined by `electric-pair-skip-self'." (or (= ?> char) - (funcall (default-value 'electric-pair-skip-self) char))) + (let ((skip-self (default-value 'electric-pair-skip-self))) + (and skip-self (funcall skip-self char))))) (defun rust-ordinary-lt-gt-p () "Test whether the `<' or `>' at point is an ordinary operator of some kind.