[elpa] externals/ellama a744ef42cc 4/4: Eliminate aliases

[ELPA Syncer]

branch: externals/ellama
commit a744ef42cc990e8ecdcd06528dc163193a9b4215
Author: Sergey Kostyaev <sskostyaev@gmail.com>
Commit: Sergey Kostyaev <sskostyaev@gmail.com>

    Eliminate aliases
    
    Fixes #39
---
 NEWS.org  |  2 ++
 README.md | 76 +++++++++++++++------------------------------------------------
 ellama.el | 54 ++++++++++-----------------------------------
 3 files changed, 32 insertions(+), 100 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 2db0207902..2c5ed4a2ed 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,5 @@
+* Version 0.5.0
+- Eliminate aliases.
 * Version 0.4.14
 - Extract ellama-chat-done to separate function.
 * Version 0.4.13
diff --git a/README.md b/README.md
index 8d3e1f1a38..18285391f9 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,7 @@ ellama configuration like this:
 
 Ask Ellama about something by entering a prompt in an interactive
 buffer and continue conversation.
-
-### ellama-ask
-
-Alias for `ellama-chat`.
-![ellama-ask](imgs/ellama-ask.gif)
+![ellama-chat](imgs/ellama-ask.gif)
 
 ### ellama-ask-about
 
@@ -102,46 +98,6 @@ Review code in a selected region or the current buffer 
using Ellama.
 Change text in a selected region or the current buffer according to a
 provided change.
 
-### ellama-enhance-grammar-spelling
-
-Enhance the grammar and spelling in the currently selected region or
-buffer using Ellama.
-![ellama-enhance-grammar-spelling](imgs/ellama-enhance-grammar-spelling.gif)
-
-### ellama-enhance-wording
-
-Enhance the wording in the currently selected region or buffer using Ellama.
-
-### ellama-make-concise
-
-Make the text of the currently selected region or buffer concise and
-simple using Ellama.
-
-### ellama-change-code
-
-Change selected code or code in the current buffer according to a
-provided change using Ellama.
-
-### ellama-enhance-code
-
-Change selected code or code in the current buffer according to a
-provided change using Ellama.
-
-### ellama-complete-code
-
-Complete selected code or code in the current buffer according to a
-provided change using Ellama.
-
-### ellama-add-code
-
-Add new code according to a description, generating it with a provided
-context from the selected region or the current buffer using Ellama.
-
-### ellama-render
-
-Render the currently selected text or the text in the current buffer
-as a specified format using Ellama.
-
 ### ellama-make-list
 
 Create a markdown list from the active region or the current buffer using 
Ellama.
@@ -160,38 +116,42 @@ Select ellama provider.
 
 ### ellama-code-complete
 
-Alias to the `ellama-complete-code` function.
+Complete selected code or code in the current buffer according to a
+provided change using Ellama.
 
 ### ellama-code-add
 
-Alias to the `ellama-add-code` function.
+Add new code according to a description, generating it with a provided
+context from the selected region or the current buffer using Ellama.
 
 ### ellama-code-edit
 
-Alias to the `ellama-change-code` function.
+Change selected code or code in the current buffer according to a
+provided change using Ellama.
 
 ### ellama-code-improve
 
-Alias to the `ellama-enhance-code` function.
+Change selected code or code in the current buffer according to a
+provided change using Ellama.
 
 ### ellama-improve-wording
 
-Alias to the `ellama-enhance-wording` function.
+Enhance the wording in the currently selected region or buffer using Ellama.
 
 ### ellama-improve-grammar
-
-Alias to the `ellama-enhance-grammar-spelling` function.
+Enhance the grammar and spelling in the currently selected region or
+buffer using Ellama.
+![ellama-improve-grammar](imgs/ellama-enhance-grammar-spelling.gif)
 
 ### ellama-improve-conciseness
 
-Alias to the `ellama-make-concise` function.
+Make the text of the currently selected region or buffer concise and
+simple using Ellama.
 
 ### ellama-make-format
 
-Alias to the `ellama-render` function.
-
-### ellama-ask-interactive
-Alias to the `ellama-ask` function.
+Render the currently selected text or the text in the current buffer
+as a specified format using Ellama.
 
 ## Keymap
 
@@ -214,7 +174,7 @@ Ellama, using the `C-c e` prefix:
 | "m t"  | ellama-make-table          | Make table                         |
 | "m f"  | ellama-make-format         | Make format                        |
 | "a a"  | ellama-ask-about           | Ask about                          |
-| "a i"  | ellama-ask-interactive     | Chat with ellama (Interactive)     |
+| "a i"  | ellama-chat                | Chat (ask interactively)           |
 | "a l"  | ellama-ask-line            | Ask about current line             |
 | "a s"  | ellama-ask-selection       | Ask about selection                |
 | "t t"  | ellama-translate           | Text translate                     |
diff --git a/ellama.el b/ellama.el
index 8d18b3ee4a..fb7e775728 100644
--- a/ellama.el
+++ b/ellama.el
@@ -6,7 +6,7 @@
 ;; URL: http://github.com/s-kostyaev/ellama
 ;; Keywords: help local tools
 ;; Package-Requires: ((emacs "28.1") (llm "0.6.0") (spinner "1.7.4"))
-;; Version: 0.4.14
+;; Version: 0.5.0
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;; Created: 8th Oct 2023
 
@@ -123,7 +123,7 @@
             ("m f" ellama-make-format "Make format")
             ;; ask
             ("a a" ellama-ask-about "Ask about")
-            ("a i" ellama-ask-interactive "Ask interactively")
+            ("a i" ellama-chat "Ask interactively")
             ("a l" ellama-ask-line "Ask current line")
             ("a s" ellama-ask-selection "Ask selection")
             ;; text
@@ -293,36 +293,6 @@ when the request completes (with BUFFER current)."
                     :session t
                     :on-done #'ellama-chat-done))))
 
-;;;###autoload
-(defalias 'ellama-ask 'ellama-chat)
-
-;;;###autoload
-(defalias 'ellama-code-complete 'ellama-complete-code)
-
-;;;###autoload
-(defalias 'ellama-code-add 'ellama-add-code)
-
-;;;###autoload
-(defalias 'ellama-code-edit 'ellama-change-code)
-
-;;###autoload
-(defalias 'ellama-code-improve 'ellama-enhance-code)
-
-;;;###autoload
-(defalias 'ellama-improve-wording 'ellama-enhance-wording)
-
-;;;###autoload
-(defalias 'ellama-improve-grammar 'ellama-enhance-grammar-spelling)
-
-;;;###autoload
-(defalias 'ellama-improve-conciseness 'ellama-make-concise)
-
-;;;###autoload
-(defalias 'ellama-make-format 'ellama-render)
-
-;;;###autoload
-(defalias 'ellama-ask-interactive 'ellama-ask)
-
 ;;;###autoload
 (defun ellama-ask-about ()
   "Ask ellama about selected region or current buffer."
@@ -423,25 +393,25 @@ when the request completes (with BUFFER current)."
      :point beg)))
 
 ;;;###autoload
-(defun ellama-enhance-grammar-spelling ()
+(defun ellama-improve-grammar ()
   "Enhance the grammar and spelling in the currently selected region or 
buffer."
   (interactive)
   (ellama-change "improve grammar and spelling"))
 
 ;;;###autoload
-(defun ellama-enhance-wording ()
+(defun ellama-improve-wording ()
   "Enhance the wording in the currently selected region or buffer."
   (interactive)
   (ellama-change "use better wording"))
 
 ;;;###autoload
-(defun ellama-make-concise ()
+(defun ellama-improve-conciseness ()
   "Make the text of the currently selected region or buffer concise and 
simple."
   (interactive)
   (ellama-change "make it as simple and concise as possible"))
 
 ;;;###autoload
-(defun ellama-change-code (change)
+(defun ellama-code-edit (change)
   "Change selected code or code in current buffer according to provided 
CHANGE."
   (interactive "sWhat needs to be changed in this code: ")
   (let* ((beg (if (region-active-p)
@@ -460,7 +430,7 @@ when the request completes (with BUFFER current)."
      :point beg)))
 
 ;;;###autoload
-(defun ellama-enhance-code ()
+(defun ellama-code-improve ()
   "Change selected code or code in current buffer according to provided 
CHANGE."
   (interactive)
   (let* ((beg (if (region-active-p)
@@ -479,7 +449,7 @@ when the request completes (with BUFFER current)."
      :point beg)))
 
 ;;;###autoload
-(defun ellama-complete-code ()
+(defun ellama-code-complete ()
   "Complete selected code or code in current buffer."
   (interactive)
   (let* ((beg (if (region-active-p)
@@ -497,7 +467,7 @@ when the request completes (with BUFFER current)."
      :point end)))
 
 ;;;###autoload
-(defun ellama-add-code (description)
+(defun ellama-code-add (description)
   "Add new code according to DESCRIPTION.
 Code will be generated with provided context from selected region or current
 buffer."
@@ -517,7 +487,7 @@ buffer."
 
 
 ;;;###autoload
-(defun ellama-render (needed-format)
+(defun ellama-make-format (needed-format)
   "Render selected text or text in current buffer as NEEDED-FORMAT."
   (interactive "sSpecify required format: ")
   (let* ((beg (if (region-active-p)
@@ -538,13 +508,13 @@ buffer."
 (defun ellama-make-list ()
   "Create markdown list from active region or current buffer."
   (interactive)
-  (ellama-render "markdown list"))
+  (ellama-make-format "markdown list"))
 
 ;;;###autoload
 (defun ellama-make-table ()
   "Create markdown table from active region or current buffer."
   (interactive)
-  (ellama-render "markdown table"))
+  (ellama-make-format "markdown table"))
 
 (defun ellama-summarize-webpage (url)
   "Summarize webpage fetched from URL."