summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-12-12 20:23:27 +0100
committerSean Whitton <spwhitton@spwhitton.name>2018-12-23 10:59:50 +0000
commitf96185bd6512a1d3ea85a09bca9eb5d7ec1a069b (patch)
tree6387abe31a06d140b8d789bc35d3ecf737f96288
parent59090cfc63bbcdb8b57051ec3011e81b816f7464 (diff)
smex-load-save-file: adapt to change in Emacs v25.0.50
`setq' now requires an even number of arguments. Also use `unless' instead of `if not'. (cherry picked from commit 55aaebe3d793c2c990b39a302eb26c184281c42c)
-rw-r--r--smex.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/smex.el b/smex.el
index 36d5b2e..74d3b8c 100644
--- a/smex.el
+++ b/smex.el
@@ -240,8 +240,8 @@ Set this to nil to disable fuzzy matching."
(error (if (smex-save-file-not-empty-p)
(error "Invalid data in smex-save-file (%s). Can't restore history."
smex-save-file)
- (if (not (boundp 'smex-history)) (setq smex-history))
- (if (not (boundp 'smex-data)) (setq smex-data))))))
+ (unless (boundp 'smex-history) (setq smex-history nil))
+ (unless (boundp 'smex-data) (setq smex-data nil))))))
(setq smex-history nil smex-data nil))))
(defsubst smex-save-file-not-empty-p ()