emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/gptel 4147b3fff9 4/6: gptel-rewrite: Make gptel-rewrite a


From: ELPA Syncer
Subject: [nongnu] elpa/gptel 4147b3fff9 4/6: gptel-rewrite: Make gptel-rewrite a command
Date: Mon, 2 Dec 2024 07:00:01 -0500 (EST)

branch: elpa/gptel
commit 4147b3fff9b2b2003fc3f9cef7f653a730b44ac7
Author: Karthik Chikmagalur <karthikchikmagalur@gmail.com>
Commit: Karthik Chikmagalur <karthikchikmagalur@gmail.com>

    gptel-rewrite: Make gptel-rewrite a command
    
    * gptel-transient.el (gptel-menu): Remove reference to
    `gptel-rewrite-menu'.
    
    * gptel-rewrite.el (gptel--rewrite-callback, gptel-rewrite-menu,
    gptel-rewrite): Obsolete `gptel-rewrite-menu' and rename it to
    `gptel-rewrite'.  Ensure that this command only works when there
    is an active region or a rewrite in progress.
---
 gptel-rewrite.el   | 16 ++++++++++------
 gptel-transient.el |  5 ++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/gptel-rewrite.el b/gptel-rewrite.el
index 2b960e9ee5..f5e77f21f9 100644
--- a/gptel-rewrite.el
+++ b/gptel-rewrite.el
@@ -424,7 +424,7 @@ INFO is the async communication channel for the rewrite 
request."
                         (unless (eq (current-buffer) buf)
                           (format " in buffer %s " (buffer-name buf)))
                         (concat " ready: " mkb ", " (propertize "RET" 'face 
'help-key-binding)
-                                " or " (substitute-command-keys 
"\\[gptel-menu] to continue.")))))))))))
+                                " or " (substitute-command-keys 
"\\[gptel-rewrite] to continue.")))))))))))
 
 ;; * Transient Prefixes for rewriting/refactoring
 
@@ -445,8 +445,10 @@ By default, gptel uses the directive associated with the 
`rewrite'
              'gptel--rewrite-directive "Rewrite directive")))
     :pad-keys t])
 
-;;;###autoload (autoload 'gptel-rewrite-menu "gptel-rewrite" nil t)
-(transient-define-prefix gptel-rewrite-menu ()
+(define-obsolete-function-alias 'gptel-rewrite-menu 'gptel-rewrite "0.9.6")
+
+;;;###autoload (autoload 'gptel-rewrite "gptel-rewrite" nil t)
+(transient-define-prefix gptel-rewrite ()
   "Rewrite or refactor text region using an LLM."
   [:description
    (lambda ()
@@ -499,10 +501,12 @@ By default, gptel uses the directive associated with the 
`rewrite'
         (gptel--suffix-rewrite gptel--rewrite-message t)
         'json)))]]
   (interactive)
+  (unless (or gptel--rewrite-overlays (use-region-p))
+    (user-error "`gptel-rewrite' requires an active region or rewrite in 
progress."))
   (unless gptel--rewrite-message
     (setq gptel--rewrite-message
           (concat (gptel--refactor-or-rewrite) ": ")))
-  (transient-setup 'gptel-rewrite-menu))
+  (transient-setup 'gptel-rewrite))
 
 ;; * Transient infixes for rewriting/refactoring
 
@@ -558,8 +562,8 @@ generated from functions."
           (not (y-or-n-p
                 "Rewrite directive is dynamically generated: Edit its current 
value instead?")))))
   (if cancel (progn (message "Edit canceled")
-                    (call-interactively #'gptel-rewrite-menu))
-    (gptel--edit-directive 'gptel--rewrite-directive #'gptel-rewrite-menu)))
+                    (call-interactively #'gptel-rewrite))
+    (gptel--edit-directive 'gptel--rewrite-directive #'gptel-rewrite)))
 
 (transient-define-suffix gptel--suffix-rewrite (&optional rewrite-message 
dry-run)
   "Rewrite or refactor region contents."
diff --git a/gptel-transient.el b/gptel-transient.el
index 81a0d398a6..fad9ae98f1 100644
--- a/gptel-transient.el
+++ b/gptel-transient.el
@@ -432,9 +432,8 @@ Also format its value in the Transient menu."
      ;;FIXME: Transient complains if I use `gptel--refactor-or-rewrite' here. 
It
      ;;reads this function as a suffix instead of a function that returns the
      ;;description.
-     (lambda () (if (derived-mode-p 'prog-mode)
-               "Refactor" "Rewrite"))
-     gptel-rewrite-menu)]
+     (lambda () (if (derived-mode-p 'prog-mode) "Refactor" "Rewrite"))
+     gptel-rewrite)]
    ["Tweak Response" :if gptel--in-response-p :pad-keys t
     ("SPC" "Mark" gptel--mark-response)
     ("P" "Previous variant" gptel--previous-variant



reply via email to

[Prev in Thread] Current Thread [Next in Thread]