run-geiser obsoleted (just use M-x geiser)

7 files changed, 27 insertions, 22 deletions

diff --git a/doc/parens.texi b/doc/parens.texi
index b95958a..e53a355 100644
--- a/doc/parens.texi
+++ b/doc/parens.texi
@@ -94,7 +94,7 @@ how to make sure that that's actually the case.
 
 As i've already mentioned a couple of times, @i{geiser-mode} needs a
 running REPL to be operative.  Thus, a common usage pattern will be
-for you to first call @code{run-geiser}
+for you to first call @code{geiser}
 @ifhtml
 (or @ref{choosing-impl,,one of its variants}),
 @end ifhtml
diff --git a/doc/repl.texi b/doc/repl.texi
index 0c20dcc..01a0a18 100644
--- a/doc/repl.texi
+++ b/doc/repl.texi
@@ -21,8 +21,8 @@ ready, just come back here and proceed to the following sections.
 @cindex REPL
 To start a Scheme REPL (meaning, a Scheme process offering you a
 Read-Eval-Print Loop), Geiser provides the generic interactive command
-@command{run-geiser}. If you invoke it (via, as is customary in Emacs,
-@kbd{M-x run-geiser}), you'll be saluted by a prompt asking which one of
+@command{geiser}. If you invoke it (via, as is customary in Emacs,
+@kbd{M-x geiser}), you'll be saluted by a prompt asking which one of
 the supported implementations you want to launch---yes, you can stop the
 asking, see
 @altr{active-implementations,below,Customization and tips,.}
@@ -379,7 +379,7 @@ some related tips.
 @subsubheading Choosing a Scheme implementation
 @cindex scheme implementation, choosing
 @anchor{choosing-impl}
-Instead of using the generic @command{run-geiser} command, you can directly
+Instead of using the generic @command{geiser} command, you can directly
 start your Scheme of choice using any of the following commands:
 @itemize @bullet
 @item @command{run-racket}
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index 67af8f4..689388b 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -204,27 +204,29 @@ Here's how a typical call to this macro looks like:
     (keywords geiser-guile--keywords)
     (case-sensitive geiser-guile-case-sensitive-p))
 
-This macro also defines a runner function (run-NAME) and a
-switcher (switch-to-NAME), and provides geiser-NAME."
+This macro also defines a runner function (geiser-NAME) and a
+switcher (geiser-NAME-switch), and provides geiser-NAME."
   (let ((name (if (listp name) (car name) name))
         (parent (and (listp name) (cadr name))))
     (unless (symbolp name)
       (error "Malformed implementation name: %s" name))
-    (let ((runner (intern (format "run-%s" name)))
+    (let ((old-runner (intern (format "run-%s" name)))
+          (runner (intern (format "geiser-%s" name)))
           (old-switcher (intern (format "switch-to-%s" name)))
           (switcher (intern (format "geiser-%s-switch" name)))
           (runner-doc (format "Start a new %s REPL." name))
           (switcher-doc (format "Switch to a running %s REPL, or start one."
                                 name))
-          (ask (make-symbol "ask")))
+          (ask (gensym "ask")))
       `(progn
          (geiser-impl--define load-file-name ',name ',parent ',methods)
          (require 'geiser-repl)
          (require 'geiser-menu)
+         (define-obsolete-function-alias ',old-runner ',runner "Geiser 0.26")
          (defun ,runner ()
            ,runner-doc
            (interactive)
-           (run-geiser ',name))
+           (geiser ',name))
          (define-obsolete-function-alias ',old-switcher ',switcher "Geiser 0.26")
          (defun ,switcher (&optional ,ask)
            ,switcher-doc
diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el
index 464bf45..24b0512 100644
--- a/elisp/geiser-mode.el
+++ b/elisp/geiser-mode.el
@@ -283,7 +283,7 @@ With prefix, try to enter the current buffer's module."
       (geiser-mode-switch-to-repl nil)
       (comint-kill-subjob)
       (sit-for 0.1)) ;; ugly hack; but i don't care enough to fix it
-    (run-geiser impl)
+    (geiser impl)
     (sit-for 0.2)
     (goto-char (point-max))
     (pop-to-buffer b)))
@@ -396,7 +396,7 @@ interacting with the Geiser REPL is at your disposal.
              geiser-mode-start-repl-p
              (not (geiser-syntax--font-lock-buffer-p))
              (not (geiser-repl--connection*)))
-    (save-window-excursion (run-geiser geiser-impl--implementation))))
+    (save-window-excursion (geiser geiser-impl--implementation))))
 
 (defun turn-on-geiser-mode ()
   "Enable `geiser-mode' (in a Scheme buffer)."
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 95137c4..469c0f5 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -659,7 +659,7 @@ will be set up using `geiser-connect-local' when a REPL is started.")
 
 (defun geiser-repl--connection ()
   (or (geiser-repl--connection*)
-      (error "No Geiser REPL for this buffer (try M-x run-geiser)")))
+      (error "No Geiser REPL for this buffer (try M-x geiser)")))
 
 (setq geiser-eval--default-connection-function 'geiser-repl--connection)
 
@@ -984,14 +984,14 @@ buffer."
 
 ;;; User commands
 
-(defun run-geiser (impl)
+(define-obsolete-function-alias 'geiser 'geiser "0.26")
+
+(defun geiser (impl)
   "Start a new Geiser REPL."
   (interactive
    (list (geiser-repl--get-impl "Start Geiser for scheme implementation: ")))
   (geiser-repl--start-repl impl nil))
 
-(defalias 'geiser 'run-geiser)
-
 (defun geiser-connect (impl &optional host port)
   "Start a new Geiser REPL connected to a remote Scheme process."
   (interactive
@@ -1034,7 +1034,7 @@ If REPL is the current buffer, switch to the previously used
 scheme buffer.
 
 With prefix argument, ask for which one if more than one is running.
-If no REPL is running, execute `run-geiser' to start a fresh one."
+If no REPL is running, execute `geiser' to start a fresh one."
   (interactive "P")
   (let* ((impl (or impl geiser-impl--implementation))
          (in-repl (eq major-mode 'geiser-repl-mode))
@@ -1052,8 +1052,8 @@ If no REPL is running, execute `run-geiser' to start a fresh one."
            (geiser-connect impl (geiser-repl--host) (geiser-repl--port)))
           ((geiser-repl--local-p)
            (geiser-connect-local impl geiser-repl--address))
-          (impl (run-geiser impl))
-          (t (call-interactively 'run-geiser)))
+          (impl (geiser impl))
+          (t (call-interactively 'geiser)))
     (geiser-repl--maybe-remember-scm-buffer buffer)))
 
 (define-obsolete-function-alias 'switch-to-geiser-module
@@ -1089,7 +1089,7 @@ If no REPL is running, execute `run-geiser' to start a fresh one."
       (geiser-repl--switch-to-repl nil)
       (comint-kill-subjob)
       (sit-for 0.1)) ;; ugly hack; but i don't care enough to fix it
-    (run-geiser impl)
+    (geiser impl)
     (sit-for 0.2)
     (goto-char (point-max))
     (pop-to-buffer b)))
diff --git a/elisp/geiser.el b/elisp/geiser.el
index 89aad33..5910eb7 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -74,7 +74,7 @@
   "Start a Geiser REPL, or switch to a running one." t)
 
 ;;;###autoload
-(autoload 'run-geiser "geiser-repl" "Start a Geiser REPL." t)
+(autoload 'geiser "geiser-repl" "Start a Geiser REPL." t)
 
 ;;;###autoload
 (autoload 'geiser-connect "geiser-repl"
diff --git a/news.org b/news.org
index 6a98a18..a6b95db 100644
--- a/news.org
+++ b/news.org
@@ -2,8 +2,11 @@
 
   - Ask interactively for REPL startup on C-c C-k as needed.
   - New public command geiser-repl-maybe-send.
-  - ~switch-to-geiser~ and ~switch-to-geiser-module~ deprecated in favour of
-    ~geiser-repl-switch~ and geiser-~repl-switch-to-module~.
+  - ~switch-to-geiser~ and ~switch-to-geiser-module~ obsoleted in favour of
+    ~geiser-repl-switch~ and geiser-~repl-switch-to-module~.  For implementations,
+    geiser-IMPL-switch is defined, obsoleting swith-to-IMPL.
+  - ~run-geiser~ obsoleted, just use =M-x geiser=.  For implementations,
+    geiser-IMPL is defined, obsoleting run-IMPL.
 
 * Version 0.25.1 (August 2022)