Merge commit '39c53c953ef9ec2a80e55849d2cb44de219801f5'

diff --combined packages/sotlisp/sotlisp.el
index 07ffb195e571d6eaed48853a9ab61117cc302f85,1b5891119363cc220cf71d7965df9b22a3bea8a2..1b5891119363cc220cf71d7965df9b22a3bea8a2
--- 1/packages/sotlisp/sotlisp.el
--- 2/sotlisp.el
+++ b/packages/sotlisp/sotlisp.el
@@@ -80,8 -80,6 +80,6 @@@
  \r
  \f\r
  ;;; Code:\r
- (eval-when-compile\r
-   (require 'subr-x))\r
  \r
  ;;; Predicates\r
  (defun sotlisp--auto-paired-p ()\r
@@@ -463,9 -461,10 +461,10 @@@ removes hooks and abbrevs.
          (ignore-errors (forward-sexp -1)\r
                         (looking-at-p "#'")))\r
        (thing-at-point 'symbol)\r
-     (if-let ((fcap (function-called-at-point)))\r
-         (symbol-name fcap)\r
-       (thing-at-point 'symbol))))\r
+     (let ((fcap (function-called-at-point)))\r
+       (if fcap\r
+           (symbol-name fcap)\r
+         (thing-at-point 'symbol)))))\r
  \r
  (defun sotlisp-find-or-define-function (&optional prefix)\r
    "If symbol under point is a defined function, go to it, otherwise define it.\r