summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/geiser.texi6
-rw-r--r--doc/macros.texi10
-rw-r--r--doc/thanks.texi4
-rw-r--r--elisp/geiser-base.el5
-rw-r--r--elisp/geiser-connection.el5
-rw-r--r--elisp/geiser-repl.el5
-rw-r--r--news.org12
7 files changed, 30 insertions, 17 deletions
diff --git a/doc/geiser.texi b/doc/geiser.texi
index 29166d8..ea27717 100644
--- a/doc/geiser.texi
+++ b/doc/geiser.texi
@@ -8,7 +8,7 @@
@copying
This manual documents Geiser, an Emacs environment to hack in Scheme.
-Copyright @copyright{} 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2020, 2021 Jose Antonio Ortega Ruiz
+Copyright @copyright{} 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2020, 2021, 2026 Jose Antonio Ortega Ruiz
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -103,8 +103,8 @@ Cheat sheet
@html
<br/>
<div class="navigation" align="right">
-<a class="navlink" href="https://gitlab.com/groups/emacs-geiser/-/issues">Bugs</a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a class="navlink" href="https://gitlab.com/emacs-geiser">Source</a>&nbsp;&nbsp;&nbsp;&nbsp;
+<a class="navlink" href="https://codeberg.org/org/geiser/issues">Bugs</a>&nbsp;&nbsp;&nbsp;&nbsp;
+<a class="navlink" href="https://codeberg.org/geiser">Source</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="navlink" href="http://lists.nongnu.org/mailman/listinfo/geiser-users">Mailing list</a>&nbsp;
</div>
@end html
diff --git a/doc/macros.texi b/doc/macros.texi
index c218dff..86584ef 100644
--- a/doc/macros.texi
+++ b/doc/macros.texi
@@ -1,12 +1,12 @@
-@set VERSION 0.20
+@set VERSION 0.33
@set VERSION_NICK
-@set RELEASE_DATE December 2021
-@set EMACS_VERSION 24.4
-@set GITLAB https://gitlab.com/emacs-geiser/
+@set RELEASE_DATE May 2025
+@set EMACS_VERSION 27.1
+@set CODEBERG https://codeberg.com/geiser/
@macro supimpl{NAME,URL,VERS,NM}
@item
-@uref{\URL\, \NAME\} \VERS\ or better, via @uref{@value{GITLAB}\NM\, geiser-\NM\}
+@uref{\URL\, \NAME\} \VERS\ or better, via @uref{@value{CODEBERG}\NM\, geiser-\NM\}
@end macro
@macro altr{LINK, TXT, TLINK, TRAIL}
diff --git a/doc/thanks.texi b/doc/thanks.texi
index 14eae9b..856afad 100644
--- a/doc/thanks.texi
+++ b/doc/thanks.texi
@@ -78,8 +78,8 @@ gmane.lisp.scheme.geiser}.
@item
@cindex bug tracker
You can submit bug reports either to the mailing list or to
-@uref{https://gitlab.com/groups/emacs-geiser/-/issues, our bug tracker} over at
-Gitlab.
+@uref{https://codeberg.org/org/geiser/issues, our bug tracker} over at
+Codeberg.
@item
@cindex IRC channel
The Freenode IRC channel @i{#geiser} is the Geiserati's meeting point in
diff --git a/elisp/geiser-base.el b/elisp/geiser-base.el
index 4194da5..71aa8b4 100644
--- a/elisp/geiser-base.el
+++ b/elisp/geiser-base.el
@@ -41,9 +41,14 @@
;;; Utilities:
+(require 'ansi-color)
+
(defsubst geiser--chomp (str)
(if (string-match-p ".*\n$" str) (substring str 0 -1) str))
+(defsubst geiser--strip-ansi (s)
+ (replace-regexp-in-string "" "" (ansi-color-filter-apply s)))
+
(defun geiser--shorten-str (str len &optional sep)
(let ((str-len (length str)))
(if (<= str-len len)
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 5f1e782..f462b4c 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -1,6 +1,6 @@
;;; geiser-connection.el --- Talking to a scheme process -*- lexical-binding: t; -*-
-;; Copyright (C) 2009-2011, 2013, 2021-2022, 2025-2026 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009-2011, 2013, 2021-2022, 2025 Jose Antonio Ortega Ruiz
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the Modified BSD License. You should
@@ -23,7 +23,6 @@
(require 'geiser-impl)
(require 'tq)
-(require 'ansi-color)
(eval-when-compile (require 'subr-x))
@@ -82,7 +81,7 @@
(progn (geiser-log--error "Unexpected queue input:\n %s" in)
(delete-region (point-min) (point-max)))
(goto-char (point-max))
- (insert (ansi-color-filter-apply in))
+ (insert (geiser--strip-ansi in))
(goto-char (point-min))
(when (re-search-forward (tq-queue-head-regexp tq) nil t)
(unwind-protect
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 30f2eb3..8594462 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -24,7 +24,6 @@
(require 'geiser-custom)
(require 'geiser-base)
-(require 'ansi-color)
(require 'comint)
(require 'compile)
(require 'scheme)
@@ -744,7 +743,6 @@ to standard output face."
(defun geiser-repl--prepare-send ()
(geiser-image--clean-cache)
(geiser-autodoc--inhibit-autodoc)
- (geiser-eval--wait )
(geiser-con--connection-deactivate geiser-repl--connection))
(defun geiser-repl--send (cmd &optional save-history)
@@ -1138,7 +1136,6 @@ buffer."
(set (make-local-variable 'comint-prompt-read-only)
geiser-repl-read-only-prompt-p)
(setq comint-process-echoes nil)
- (add-hook 'comint-preoutput-filter-functions 'ansi-color-filter-apply)
(set (make-local-variable 'beginning-of-defun-function)
'geiser-repl--beginning-of-defun)
(set (make-local-variable 'comint-input-ignoredups)
@@ -1157,7 +1154,7 @@ buffer."
(geiser-repl-autoeval-mode 1))
(when geiser-repl-superparen-mode-p
(geiser-repl-superparen-mode 1))
-
+ (add-hook 'comint-preoutput-filter-functions #'geiser--strip-ansi nil t)
;; enabling compilation-shell-minor-mode without the annoying highlighter
(compilation-setup t))
diff --git a/news.org b/news.org
index 10e13cf..87a2ffd 100644
--- a/news.org
+++ b/news.org
@@ -1,3 +1,15 @@
+* Version 0.33 (unreleased)
+
+ - Project migrated to codeberg.org: https://codeberg.org/geiser
+ - New geiser-repl-classify-output-p flag that enables classification of REPL
+ outputs as error/warning/success with customizable faces
+ (geiser-repl-output-*). Thanks, Lorenzo.
+ - Fix completion for local variadic args (thanks, rvs314).
+ - Fix for company code locations (thanks, Daniel).
+ - Fix race condition between REPL and background evaluations (thanks, Ian).
+ - Fix for ansi escapes in connected REPLs (thanks, ewhispers and martian
+ hiauts).
+
* Version 0.32 (August 10, 2024)
- REPL: Fix for highlighting of 2-character input prompts (thanks to Macon