summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Crihfield <roy@manteia.ltd>2021-12-16 15:29:33 +0800
committerbrotzeit <brotzeitmacher@gmail.com>2021-12-16 21:55:12 +0100
commit01452f41c15d25b37d0cd3968a04eb397ba2df73 (patch)
treea4d2c602bd92cdc7217010fe270d1d9bb6c5dd7d
parent3f67a880dc8b31b330cf59aee875d9dc96e7c475 (diff)
downloadrust-mode-01452f41c15d25b37d0cd3968a04eb397ba2df73.tar.gz
Fix rust-electric-pair-skip-self-wrap
nil is a valid value for electric-pair-skip-self, so handle that case
-rw-r--r--rust-mode.el3
1 files changed, 2 insertions, 1 deletions
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.