branch: externals/ellama
commit 500544fe539fc7120efd144030fc5469a6d880c7
Merge: b32479ffc3 8937251aea
Author: Sergey Kostyaev <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #391 from s-kostyaev/fix-compilation-warnings
Fix compilation warnings
---
Makefile | 13 ++++++++++++-
NEWS.org | 3 +++
ellama.el | 52 ++++++++++++++++++++++++++--------------------------
3 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 703af5b049..0d799e2f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,17 @@
.PHONY: build test check-compile-warnings manual refill-news
+# This order is based on the packages dependency graph.
+ELLAMA_COMPILE_ORDER = \
+ ellama-tools.el \
+ ellama-skills.el \
+ ellama.el \
+ ellama-context.el \
+ ellama-transient.el \
+ ellama-blueprint.el \
+ ellama-community-prompts.el \
+ ellama-manual.el
+
build:
emacs -batch --eval "(package-initialize)" -f batch-byte-compile
ellama*.el
@@ -19,7 +30,7 @@ test:
--eval "(ert t)"
check-compile-warnings:
- emacs --batch --eval "(package-initialize)" --eval "(setq
native-comp-eln-load-path (list default-directory))" -L . -f
batch-native-compile ellama*.el
+ emacs --batch --eval "(package-initialize)" --eval "(setq
native-comp-eln-load-path (list default-directory))" -L . -f
batch-native-compile $(ELLAMA_COMPILE_ORDER)
manual:
emacs -batch --eval "(package-initialize)" \
diff --git a/NEWS.org b/NEWS.org
index 46738078d0..c9e87bcc5d 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,6 @@
+* Version 1.12.15
+- Fix compilation warnings. This change resolves compilation warnings found
+ during building.
* Version 1.12.14
- Add fake streaming helpers and new stream tests. Introduce
~ellama-test--fake-stream-partials~ and
~ellama-test--run-with-fake-streaming~
diff --git a/ellama.el b/ellama.el
index c404c31bca..5a7243a742 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.24.0") (plz "0.8") (transient
"0.7") (compat "29.1") (yaml "1.2.3"))
-;; Version: 1.12.14
+;; Version: 1.12.15
;; SPDX-License-Identifier: GPL-3.0-or-later
;; Created: 8th Oct 2023
@@ -468,6 +468,15 @@ It should be a function with single argument generated
text string."
"Enable debug."
:type 'boolean)
+(defcustom ellama-sessions-directory (file-truename
+ (file-name-concat
+ user-emacs-directory
+ "ellama-sessions"))
+ "Directory for saved ellama sessions."
+ :type 'string)
+
+(defvar ellama--current-session-id nil)
+
(defun ellama--set-file-name-and-save ()
"Set buffer file name and save buffer."
(interactive)
@@ -708,13 +717,6 @@ This filter contains only subset of markdown syntax to be
good enough."
;; If ellama-enable-keymap is nil, remove the key bindings
(define-key global-map (kbd ellama-keymap-prefix) nil))))
-(defcustom ellama-sessions-directory (file-truename
- (file-name-concat
- user-emacs-directory
- "ellama-sessions"))
- "Directory for saved ellama sessions."
- :type 'string)
-
(defcustom ellama-naming-provider nil
"LLM provider for generating names."
:type '(sexp :validate llm-standard-provider-p))
@@ -725,8 +727,6 @@ This filter contains only subset of markdown syntax to be
good enough."
(defvar-local ellama--current-session nil)
-(defvar ellama--current-session-id nil)
-
(defcustom ellama-session-line-template " ellama session: %s"
"Template for formatting the current session line."
:type 'string)
@@ -739,14 +739,6 @@ This filter contains only subset of markdown syntax to be
good enough."
ellama--current-session-id))
'face 'ellama-face))
-(defun ellama-session-update-header-line ()
- "Update header line for ellama session header line mode."
- (when (listp header-line-format)
- (let ((element '(:eval (ellama-session-line))))
- (if ellama-session-header-line-mode
- (add-to-list 'header-line-format element t)
- (setq header-line-format (delete element header-line-format))))))
-
;;;###autoload
(define-minor-mode ellama-session-header-line-mode
"Toggle Ellama Session header line mode."
@@ -758,14 +750,6 @@ This filter contains only subset of markdown syntax to be
good enough."
ellama-session-header-line-mode
ellama-session-header-line-mode)
-(defun ellama-session-update-mode-line ()
- "Update mode line for ellama session mode line mode."
- (when (listp mode-line-format)
- (let ((element '(:eval (ellama-session-line))))
- (if ellama-session-mode-line-mode
- (add-to-list 'mode-line-format element t)
- (setq mode-line-format (delete element mode-line-format))))))
-
;;;###autoload
(define-minor-mode ellama-session-mode-line-mode
"Toggle Ellama Session mode line mode."
@@ -777,6 +761,22 @@ This filter contains only subset of markdown syntax to be
good enough."
ellama-session-mode-line-mode
ellama-session-mode-line-mode)
+(defun ellama-session-update-header-line ()
+ "Update header line for ellama session header line mode."
+ (when (listp header-line-format)
+ (let ((element '(:eval (ellama-session-line))))
+ (if ellama-session-header-line-mode
+ (add-to-list 'header-line-format element t)
+ (setq header-line-format (delete element header-line-format))))))
+
+(defun ellama-session-update-mode-line ()
+ "Update mode line for ellama session mode line mode."
+ (when (listp mode-line-format)
+ (let ((element '(:eval (ellama-session-line))))
+ (if ellama-session-mode-line-mode
+ (add-to-list 'mode-line-format element t)
+ (setq mode-line-format (delete element mode-line-format))))))
+
(defvar ellama--active-sessions (make-hash-table :test #'equal))
(cl-defstruct ellama-session
