Merge commit '1380f8c1a51f31514125a08f632d017cdfb8e26e' from hydra

[gnu-emacs-elpa] / packages / sotlisp / sotlisp.el

diff --git a/packages/sotlisp/sotlisp.el b/packages/sotlisp/sotlisp.el
index afbc3ad661a31124da7318761c2f372ef1cd89d0..61d598e4de3eb6ffdc62a7e5aad4b5984a2657fa 100644 (file)
--- a/packages/sotlisp/sotlisp.el
+++ b/packages/sotlisp/sotlisp.el
@@ -81,8 +81,6 @@
 
 \f
 ;;; Code:
-(eval-when-compile
-  (require 'subr-x))
 
 ;;; Predicates
 (defun sotlisp--auto-paired-p ()
@@ -464,9 +462,9 @@ 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.
@@ -533,4 +531,3 @@ With a prefix argument, defines a `defvar' instead of a `defcustom'."
 
 (provide 'sotlisp)
 ;;; sotlisp.el ends here
-