lua-mode has derived from prog-mode for a while now.

[pico8.git] / pico8.el

diff --git a/pico8.el b/pico8.el
index 2597bb3..32239f5 100644 (file)
--- a/pico8.el
+++ b/pico8.el
@@ -454,9 +454,8 @@ this is the numeric literal in the code."
     (let ((beg (- (point) (% (min 255 (current-column)) 2))))
       (string-to-number (buffer-substring beg (+ beg 2)) 16)))
 
     (let ((beg (- (point) (% (min 255 (current-column)) 2))))
       (string-to-number (buffer-substring beg (+ beg 2)) 16)))
 

-   ;; In Lua or other code, the sprite is a numeric literal.
-   ;; lua-mode doesn't derive from anything.
-   ((or (derived-mode-p 'lua-mode) (derived-mode-p 'prog-mode))
+   ;; In Lua, the sprite is a numeric literal.
+   ((derived-mode-p 'lua-mode)

     (pico8--string-to-number (or (word-at-point) "")))
 
    (t nil)))
     (pico8--string-to-number (or (word-at-point) "")))
 
    (t nil)))


@@ -496,9 +495,6 @@ This function needs a lot of work.."
                     (and (re-search-backward "\\<f[gs]et\\|s?spr\\>"
                                              (- (point) 30) t)
                          (char-after)))))
                     (and (re-search-backward "\\<f[gs]et\\|s?spr\\>"
                                              (- (point) 30) t)
                          (char-after)))))

-           ;; FIXME: Actually parse something? lua-mode's sexp
-           ;; commands don't seem too good, and counting parentheses
-           ;; by hand is for nerds.

            (cond ((= c ?f) (pico8-goto-flag n))
                  ((= c ?s) (pico8-goto-sprite n))
                  (t (error "There's nothing obvious to go to")))))
            (cond ((= c ?f) (pico8-goto-flag n))
                  ((= c ?s) (pico8-goto-sprite n))
                  (t (error "There's nothing obvious to go to")))))