From e27c54538ad561e7de19ea79bbe388e89c8b48e1 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 24 Dec 2025 15:21:35 +0100 Subject: [PATCH] update with-editor --- .../dir | 0 .../with-editor-autoloads.el | 0 .../with-editor-pkg.el | 8 ++++---- .../with-editor.el | 17 +++++++++++------ .../with-editor.info | 6 +++--- 5 files changed, 18 insertions(+), 13 deletions(-) rename elpa/{with-editor-20250509.1455 => with-editor-20251101.2100}/dir (100%) rename elpa/{with-editor-20250509.1455 => with-editor-20251101.2100}/with-editor-autoloads.el (100%) rename elpa/{with-editor-20250509.1455 => with-editor-20251101.2100}/with-editor-pkg.el (70%) rename elpa/{with-editor-20250509.1455 => with-editor-20251101.2100}/with-editor.el (98%) rename elpa/{with-editor-20250509.1455 => with-editor-20251101.2100}/with-editor.info (99%) diff --git a/elpa/with-editor-20250509.1455/dir b/elpa/with-editor-20251101.2100/dir similarity index 100% rename from elpa/with-editor-20250509.1455/dir rename to elpa/with-editor-20251101.2100/dir diff --git a/elpa/with-editor-20250509.1455/with-editor-autoloads.el b/elpa/with-editor-20251101.2100/with-editor-autoloads.el similarity index 100% rename from elpa/with-editor-20250509.1455/with-editor-autoloads.el rename to elpa/with-editor-20251101.2100/with-editor-autoloads.el diff --git a/elpa/with-editor-20250509.1455/with-editor-pkg.el b/elpa/with-editor-20251101.2100/with-editor-pkg.el similarity index 70% rename from elpa/with-editor-20250509.1455/with-editor-pkg.el rename to elpa/with-editor-20251101.2100/with-editor-pkg.el index d3087432..52271d8f 100644 --- a/elpa/with-editor-20250509.1455/with-editor-pkg.el +++ b/elpa/with-editor-20251101.2100/with-editor-pkg.el @@ -1,11 +1,11 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "with-editor" "20250509.1455" +(define-package "with-editor" "20251101.2100" "Use the Emacsclient as $EDITOR." '((emacs "26.1") - (compat "30.0.0.0")) + (compat "30.1")) :url "https://github.com/magit/with-editor" - :commit "cc86ac08bdea5bbe2503ac1df3506b5e81330e16" - :revdesc "cc86ac08bdea" + :commit "dbc694406c2fd8e9d3e6ffbc4f8aff4e8c28029f" + :revdesc "dbc694406c2f" :keywords '("processes" "terminals") :authors '(("Jonas Bernoulli" . "emacs.with-editor@jonas.bernoulli.dev")) :maintainers '(("Jonas Bernoulli" . "emacs.with-editor@jonas.bernoulli.dev"))) diff --git a/elpa/with-editor-20250509.1455/with-editor.el b/elpa/with-editor-20251101.2100/with-editor.el similarity index 98% rename from elpa/with-editor-20250509.1455/with-editor.el rename to elpa/with-editor-20251101.2100/with-editor.el index 0b172302..73f7e719 100644 --- a/elpa/with-editor-20250509.1455/with-editor.el +++ b/elpa/with-editor-20251101.2100/with-editor.el @@ -6,9 +6,9 @@ ;; Homepage: https://github.com/magit/with-editor ;; Keywords: processes terminals -;; Package-Version: 20250509.1455 -;; Package-Revision: cc86ac08bdea -;; Package-Requires: ((emacs "26.1") (compat "30.0.0.0")) +;; Package-Version: 20251101.2100 +;; Package-Revision: dbc694406c2f +;; Package-Requires: ((emacs "26.1") (compat "30.1")) ;; SPDX-License-Identifier: GPL-3.0-or-later @@ -159,10 +159,15 @@ please see https://github.com/magit/magit/wiki/Emacsclient.")))) (let ((dir (expand-file-name "bin" invocation-directory))) (when (file-directory-p dir) (push dir path))) - (when (string-search "Cellar" invocation-directory) + (cond + ((string-search "Cellar" invocation-directory) (let ((dir (expand-file-name "../../../bin" invocation-directory))) (when (file-directory-p dir) - (push dir path)))))) + (push dir path)))) + ((string-search "Emacs.app" invocation-directory) + (let ((dir (expand-file-name "../../../../bin" invocation-directory))) + (when (file-directory-p dir) + (push dir path))))))) (cl-remove-duplicates path :test #'equal))) (defcustom with-editor-emacsclient-executable (with-editor-locate-emacsclient) @@ -776,7 +781,7 @@ This works in `shell-mode', `term-mode', `eshell-mode' and (when-let ((v (getenv "EMACS_SERVER_FILE"))) (vterm-send-string (format " export EMACS_SERVER_FILE=%S" v)) (vterm-send-return)) - (vterm-send-string "clear") + (vterm-send-string " clear") (vterm-send-return)) (error "Cannot use sleeping editor in this buffer"))) (t diff --git a/elpa/with-editor-20250509.1455/with-editor.info b/elpa/with-editor-20251101.2100/with-editor.info similarity index 99% rename from elpa/with-editor-20250509.1455/with-editor.info rename to elpa/with-editor-20251101.2100/with-editor.info index fe78f80b..d9630595 100644 --- a/elpa/with-editor-20250509.1455/with-editor.info +++ b/elpa/with-editor-20251101.2100/with-editor.info @@ -1,7 +1,7 @@ This is with-editor.info, produced by makeinfo version 6.8 from with-editor.texi. - Copyright (C) 2015-2024 Jonas Bernoulli + Copyright (C) 2015-2025 Jonas Bernoulli You can redistribute this document and/or modify it under the terms @@ -40,9 +40,9 @@ library is made available as a separate package. It also defines some additional functionality which makes it useful even for end-users, who don’t use Magit or another package which uses it internally. -This manual is for With-Editor version 3.4.3. +This manual is for With-Editor version 3.4.7. - Copyright (C) 2015-2024 Jonas Bernoulli + Copyright (C) 2015-2025 Jonas Bernoulli You can redistribute this document and/or modify it under the terms -- 2.47.3