- (let ((disable (intern-soft (concat (symbol-name addon) "-disable"))))
- (if (or (null disable)
- (not (fboundp disable)))
- (if verbose
- (message "Add-on %S doesn't support enable/disable" addon))
- (if (get addon 'riece-addon-enabled)
- (progn
- (funcall disable)
- (put addon 'riece-addon-enabled nil)
- (if verbose
- (message "Add-on %S disabled" addon)))
- (if verbose
- (message "Add-on %S is already enabled" addon))))))
+ (if (not (get addon 'riece-addon-enabled))
+ (if verbose
+ (message (riece-mcat "Add-on %S is already disabled") addon))
+ (let ((disable (intern-soft (concat (symbol-name addon) "-disable"))))
+ (if (and disable
+ (fboundp disable))
+ (funcall disable))
+ (put addon 'riece-addon-enabled nil)
+ (if verbose
+ (message (riece-mcat "Add-on %S disabled") addon)))))