Merge branch 'main' into more-commands

Author: rntz

cursorless-hats.el

@@ -2,13 +2,17 @@
 (defconst cursorless-hats-file
   (concat cursorless-directory "vscode-hats.json"))
 
-;; TODO: defcustom
-(defconst cursorless-color-alist
-  '((default . "#999") (blue . "#04f") (red . "#e00") (green . "#0b0")
-    (yellow . "#ffc000")
-    (pink . "#ffa0ff")))
-;; (defconst cursorless-color-alist ; dark theme
-;;   '((default . "#999") (blue . "#0af") (red . "#f00") (pink . "#fa8072") (green . "#0a0")))
+(defcustom cursorless-color-alist
+  '((default . "#999")
+    (blue . "#04f")
+    (red . "#e00")
+    (pink . "#ffa0ff")
+    (green . "#0b0")
+    (yellow . "ffc000")
+    (userColor1 . "#6a00ff")
+    (userColor2 . "#ffd8b1"))
+  "The mapping from cursorless color phrases to emacs colors."
+  :group 'cursorless)
 
 (defvar cursorless-show-hats t)
 

cursorless-state.el

@@ -94,7 +94,7 @@
     :path (or (buffer-file-name) :null)
     :temporaryFilePath (cursorless-temporary-file-path)
     :firstVisibleLine (line-number-at-pos (window-start))
-    :lastVisibleLine  (line-number-at-pos (- (window-end) 1))
+    :lastVisibleLine  (line-number-at-pos (window-end))
     ;; where the cursors are. in emacs, only one cursor, so a singleton vector.
     ;; note that cursorless wants line/column, not offset.
     ;; TODO: if transient-mark-mode is enabled, represent the whole selection.