1 files changed, 10 insertions, 6 deletions

diff --git a/elisp.el b/elisp.el
index 415ce59..b2da685 100644
--- a/elisp.el
+++ b/elisp.el
@@ -214,17 +214,21 @@ PARSE-START is the starting position of the parse."
                              (any-quoted-p nil)
                              (point nil))
                         (or
-                         (when-let (char (char-before last))
-                           (or (char-equal char ?')
-                               (char-equal char ?`)))
+                         (let ((char (char-before point)))
+                           (cond
+                            (char
+                             (or (char-equal char ?')
+                                 (char-equal char ?`)))))
                          (progn
                            (while (and rest (not any-quoted-p))
                              (setq point (pop rest))
                              (setq any-quoted-p
                                    (or
-                                    (when-let (char (char-before point))
-                                      (or (char-equal char ?')
-                                          (char-equal char ?`)))
+                                    (let ((char (char-before point)))
+                                      (cond
+                                       (char
+                                        (or (char-equal char ?')
+                                            (char-equal char ?`)))))
                                     (save-excursion
                                       (goto-char (1+ point))
                                       (looking-at-p