Skip to content

Commit acb910a

Browse files
authored
Merge pull request #1380 from lem-project/rewrite-defcommand-argument
Replace arg-descriptor in defcommand with keyword
2 parents 38fc597 + 8113c7a commit acb910a

44 files changed

Lines changed: 205 additions & 204 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

contrib/google-translate/main.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
;;;don't edit above
44
(defvar lem-user::*google-api-key* nil)
55

6-
(define-command popup-google-translate (start end) ("r")
6+
(define-command popup-google-translate (start end) (:region)
77
(display-popup-message
88
(translate-client:translate
99
(points-to-string start end)

contrib/ollama/ollama.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
(ignore-errors (bt2:join-thread *handler*))
7070
(when close-hook (funcall close-hook)))
7171

72-
(define-command ollama-prompt (prompt) ("sPrompt: ")
72+
(define-command ollama-prompt (prompt) ((:string "Prompt: "))
7373
"prompt ollama, and stream the response to a temp buffer"
7474
(let ((buf (make-buffer "*ollama*" :temporary t)))
7575
(unless (eq (buffer-major-mode buf) 'ollama-mode)

contrib/selection-mode/selection-mode.lisp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@
6161

6262
(defclass selection-advice () ())
6363

64-
(define-command (selection-next-line (:advice-classes selection-advice)) (&optional n) ("p")
64+
(define-command (selection-next-line (:advice-classes selection-advice)) (&optional n) (:universal)
6565
(call-with-selection #'next-line n))
66-
(define-command (selection-backward-char (:advice-classes selection-advice)) (&optional n) ("p")
66+
(define-command (selection-backward-char (:advice-classes selection-advice)) (&optional n) (:universal)
6767
(call-with-selection #'backward-char n))
68-
(define-command (selection-forward-char (:advice-classes selection-advice)) (&optional n) ("p")
68+
(define-command (selection-forward-char (:advice-classes selection-advice)) (&optional n) (:universal)
6969
(call-with-selection #'forward-char n))
70-
(define-command (selection-previous-line (:advice-classes selection-advice)) (&optional n) ("p")
70+
(define-command (selection-previous-line (:advice-classes selection-advice)) (&optional n) (:universal)
7171
(call-with-selection #'previous-line n))
72-
(define-command (selection-copy (:advice-classes selection-advice)) (&optional n) ("p")
72+
(define-command (selection-copy (:advice-classes selection-advice)) (&optional n) (:universal)
7373
(declare (ignore n))
7474
(message "Copy")
7575
(copy-to-clipboard (points-to-string (overlay-start *overlay*) (overlay-end *overlay*)))
7676
(cancel-selection))
7777

78-
(define-command (selection-cut (:advice-classes selection-advice)) (&optional n) ("p")
78+
(define-command (selection-cut (:advice-classes selection-advice)) (&optional n) (:universal)
7979
(declare (ignore n))
8080
(message "Cut")
8181
(copy-to-clipboard (points-to-string (overlay-start *overlay*) (overlay-end *overlay*)))
@@ -84,7 +84,7 @@
8484
(cancel-selection))
8585

8686
(define-command (selection-paste (:advice-classes selection-advice))
87-
(&optional n) ("p")
87+
(&optional n) (:universal)
8888
(declare (ignore n))
8989
(message "Paste")
9090
(paste-from-clipboard))

extensions/dart-mode/dart-mode.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ see : https://dart.dev/guides/language/language-tour
182182

183183
;; (define-key *dart-mode-keymap* "Tab" 'dart-insert-indent)
184184

185-
(define-command dart-insert-indent (n) ("p")
185+
(define-command dart-insert-indent (n) (:universal)
186186
(with-point ((point (current-point)))
187187
(back-to-indentation point)
188188
(when (point< (current-point) point)

extensions/elisp-mode/run-elisp.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
:name "run-elisp"
7676
:output-callback 'output-callback))))
7777

78-
(define-command elisp-eval-region (start end) ("r")
78+
(define-command elisp-eval-region (start end) (:region)
7979
(unless (alive-process-p)
8080
(editor-error "Emacs Lisp Terminal process doesn't exist."))
8181
(lem-process:process-send-input *process*

extensions/elixir-mode/run-elixir.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
:name "run-elixir"
7373
:output-callback 'output-callback))))
7474

75-
(define-command elixir-eval-region (start end) ("r")
75+
(define-command elixir-eval-region (start end) (:region)
7676
(unless (alive-process-p)
7777
(editor-error "elixir process doesn't exist."))
7878
(lem-process:process-send-input *process* (points-to-string start end)))

extensions/erlang-mode/run-erlang.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
:name "run-erlang"
7474
:output-callback 'output-callback))))
7575

76-
(define-command erlang-eval-region (start end) ("r")
76+
(define-command erlang-eval-region (start end) (:region)
7777
(unless (alive-process-p)
7878
(editor-error "Erlang process doesn't exist."))
7979
(lem-process:process-send-input *process* (points-to-string start end)))

extensions/go-mode/go-mode.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
(decf indent tab-width)))
139139
indent)))))
140140

141-
(define-command go-electric-close (n) ("p")
141+
(define-command go-electric-close (n) (:universal)
142142
(self-insert n)
143143
(indent))
144144

extensions/lisp-mode/apropos-mode.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
(or package
4949
(current-package))))
5050

51-
(define-command lisp-apropos (&optional arg) ("P")
51+
(define-command lisp-apropos (&optional arg) (:universal-nil)
5252
(check-connection)
5353
(let ((string)
5454
(only-external-p t)
@@ -70,7 +70,7 @@
7070
(lisp-apropos-internal (prompt-for-string "lisp Apropos: ")
7171
nil nil nil))
7272

73-
(define-command lisp-apropos-package (internal) ("P")
73+
(define-command lisp-apropos-package (internal) (:universal-nil)
7474
(check-connection)
7575
(let ((package (read-package-name)))
7676
(lisp-apropos-internal ""

extensions/lisp-mode/eval.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
(eval-print string)
234234
(move-point (current-point) end))))
235235

236-
(define-command lisp-eval-region (start end) ("r")
236+
(define-command lisp-eval-region (start end) (:region)
237237
"Execute the region as Lisp code."
238238
(check-connection)
239239
(eval-with-transcript

0 commit comments

Comments
 (0)