branch: master commit fe25187c1f7f77878b7c1c8506d8664d32baf3e7 Merge: c5538df 39c53c9 Author: Artur Malabarba <bruce.connor...@gmail.com> Commit: Artur Malabarba <bruce.connor...@gmail.com>
Merge commit '39c53c953ef9ec2a80e55849d2cb44de219801f5' --- packages/sotlisp/sotlisp.el | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/sotlisp/sotlisp.el b/packages/sotlisp/sotlisp.el index 07ffb19..1b58911 100644 --- a/packages/sotlisp/sotlisp.el +++ b/packages/sotlisp/sotlisp.el @@ -80,8 +80,6 @@ ;;; Code: -(eval-when-compile - (require 'subr-x)) ;;; Predicates (defun sotlisp--auto-paired-p () @@ -463,9 +461,10 @@ removes hooks and abbrevs." (ignore-errors (forward-sexp -1) (looking-at-p "#'"))) (thing-at-point 'symbol) - (if-let ((fcap (function-called-at-point))) - (symbol-name fcap) - (thing-at-point 'symbol)))) + (let ((fcap (function-called-at-point))) + (if fcap + (symbol-name fcap) + (thing-at-point 'symbol))))) (defun sotlisp-find-or-define-function (&optional prefix) "If symbol under point is a defined function, go to it, otherwise define it.