From 232b4086b923e7abb9abbbb9faf3a5a2540814a2 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 18 Jul 2024 15:13:06 +0200 Subject: [PATCH] update with-editor Signed-off-by: Andreas Gerler --- .../with-editor-pkg.el | 15 ---- .../dir | 0 .../with-editor-autoloads.el | 72 +++++++++---------- .../with-editor-pkg.el | 15 ++++ .../with-editor.el | 21 +++--- .../with-editor.info | 32 +++++---- 6 files changed, 76 insertions(+), 79 deletions(-) delete mode 100644 elpa/with-editor-20230711.1217/with-editor-pkg.el rename elpa/{with-editor-20230711.1217 => with-editor-20240415.1558}/dir (100%) rename elpa/{with-editor-20230711.1217 => with-editor-20240415.1558}/with-editor-autoloads.el (85%) create mode 100644 elpa/with-editor-20240415.1558/with-editor-pkg.el rename elpa/{with-editor-20230711.1217 => with-editor-20240415.1558}/with-editor.el (98%) rename elpa/{with-editor-20230711.1217 => with-editor-20240415.1558}/with-editor.info (95%) diff --git a/elpa/with-editor-20230711.1217/with-editor-pkg.el b/elpa/with-editor-20230711.1217/with-editor-pkg.el deleted file mode 100644 index fbb5d589..00000000 --- a/elpa/with-editor-20230711.1217/with-editor-pkg.el +++ /dev/null @@ -1,15 +0,0 @@ -(define-package "with-editor" "20230711.1217" "Use the Emacsclient as $EDITOR" - '((emacs "25.1") - (compat "29.1.4.1")) - :commit "a4853781835346aabf083d2d9cb87f656d01ccac" :authors - '(("Jonas Bernoulli" . "jonas@bernoul.li")) - :maintainers - '(("Jonas Bernoulli" . "jonas@bernoul.li")) - :maintainer - '("Jonas Bernoulli" . "jonas@bernoul.li") - :keywords - '("processes" "terminals") - :url "https://github.com/magit/with-editor") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/with-editor-20230711.1217/dir b/elpa/with-editor-20240415.1558/dir similarity index 100% rename from elpa/with-editor-20230711.1217/dir rename to elpa/with-editor-20240415.1558/dir diff --git a/elpa/with-editor-20230711.1217/with-editor-autoloads.el b/elpa/with-editor-20240415.1558/with-editor-autoloads.el similarity index 85% rename from elpa/with-editor-20230711.1217/with-editor-autoloads.el rename to elpa/with-editor-20240415.1558/with-editor-autoloads.el index bee6ae8b..216c865d 100644 --- a/elpa/with-editor-20230711.1217/with-editor-autoloads.el +++ b/elpa/with-editor-20240415.1558/with-editor-autoloads.el @@ -1,12 +1,14 @@ -;;; with-editor-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; with-editor-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "with-editor" "with-editor.el" (0 0 0 0)) ;;; Generated autoloads from with-editor.el (autoload 'with-editor-export-editor "with-editor" "\ @@ -19,39 +21,19 @@ commands to use the current Emacs instance as \"the editor\". This works in `shell-mode', `term-mode', `eshell-mode' and `vterm'. -\(fn &optional (ENVVAR \"EDITOR\"))" t nil) - +(fn &optional (ENVVAR \"EDITOR\"))" t) (autoload 'with-editor-export-git-editor "with-editor" "\ -Like `with-editor-export-editor' but always set `$GIT_EDITOR'." t nil) - +Like `with-editor-export-editor' but always set `$GIT_EDITOR'." t) (autoload 'with-editor-export-hg-editor "with-editor" "\ -Like `with-editor-export-editor' but always set `$HG_EDITOR'." t nil) - +Like `with-editor-export-editor' but always set `$HG_EDITOR'." t) (defvar shell-command-with-editor-mode nil "\ Non-nil if Shell-Command-With-Editor mode is enabled. See the `shell-command-with-editor-mode' command for a description of this minor mode.") - (custom-autoload 'shell-command-with-editor-mode "with-editor" nil) - (autoload 'shell-command-with-editor-mode "with-editor" "\ Teach `shell-command' to use current Emacs instance as editor. -This is a minor mode. If called interactively, toggle the -`Shell-Command-With-Editor mode' mode. If the prefix argument is -positive, enable the mode, and if it is zero or negative, disable -the mode. - -If called from Lisp, toggle the mode if ARG is `toggle'. Enable -the mode if ARG is nil, omitted, or is a positive number. -Disable the mode if ARG is a negative number. - -To check whether the minor mode is enabled in the current buffer, -evaluate `(default-value \\='shell-command-with-editor-mode)'. - -The mode's hook is called both when the mode is enabled and when -it is disabled. - Teach `shell-command', and all commands that ultimately call that command, to use the current Emacs instance as editor by executing \"EDITOR=CLIENT COMMAND&\" instead of just \"COMMAND&\". @@ -66,8 +48,22 @@ Alternatively you can use the `with-editor-async-shell-command', which also allows the use of another variable instead of \"EDITOR\". -\(fn &optional ARG)" t nil) +This is a global minor mode. If called interactively, toggle the +`Shell-Command-With-Editor mode' mode. If the prefix argument is +positive, enable the mode, and if it is zero or negative, disable +the mode. + +If called from Lisp, toggle the mode if ARG is `toggle'. Enable +the mode if ARG is nil, omitted, or is a positive number. +Disable the mode if ARG is a negative number. + +To check whether the minor mode is enabled in the current buffer, +evaluate `(default-value \\='shell-command-with-editor-mode)'. + +The mode's hook is called both when the mode is enabled and when +it is disabled. +(fn &optional ARG)" t) (autoload 'with-editor-async-shell-command "with-editor" "\ Like `async-shell-command' but with `$EDITOR' set. @@ -85,27 +81,25 @@ with arguments, or a script which also works over Tramp. Also see `async-shell-command' and `shell-command'. -\(fn COMMAND &optional OUTPUT-BUFFER ERROR-BUFFER ENVVAR)" t nil) - +(fn COMMAND &optional OUTPUT-BUFFER ERROR-BUFFER ENVVAR)" t) (autoload 'with-editor-shell-command "with-editor" "\ Like `shell-command' or `with-editor-async-shell-command'. If COMMAND ends with \"&\" behave like the latter, else like the former. -\(fn COMMAND &optional OUTPUT-BUFFER ERROR-BUFFER ENVVAR)" t nil) - +(fn COMMAND &optional OUTPUT-BUFFER ERROR-BUFFER ENVVAR)" t) (register-definition-prefixes "with-editor" '("server-" "shell-command--shell-command-with-editor-mode" "start-file-process--with-editor-process-filter" "with-editor")) - -;;;*** -;;;### (autoloads nil nil ("with-editor-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'with-editor-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; with-editor-autoloads.el ends here diff --git a/elpa/with-editor-20240415.1558/with-editor-pkg.el b/elpa/with-editor-20240415.1558/with-editor-pkg.el new file mode 100644 index 00000000..55681086 --- /dev/null +++ b/elpa/with-editor-20240415.1558/with-editor-pkg.el @@ -0,0 +1,15 @@ +(define-package "with-editor" "20240415.1558" "Use the Emacsclient as $EDITOR" + '((emacs "25.1") + (compat "29.1.4.1")) + :commit "1b4526453ef6bdee30635f469aa26085c02b1ac1" :authors + '(("Jonas Bernoulli" . "emacs.with-editor@jonas.bernoulli.dev")) + :maintainers + '(("Jonas Bernoulli" . "emacs.with-editor@jonas.bernoulli.dev")) + :maintainer + '("Jonas Bernoulli" . "emacs.with-editor@jonas.bernoulli.dev") + :keywords + '("processes" "terminals") + :url "https://github.com/magit/with-editor") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/with-editor-20230711.1217/with-editor.el b/elpa/with-editor-20240415.1558/with-editor.el similarity index 98% rename from elpa/with-editor-20230711.1217/with-editor.el rename to elpa/with-editor-20240415.1558/with-editor.el index c1c52602..2ecc755c 100644 --- a/elpa/with-editor-20230711.1217/with-editor.el +++ b/elpa/with-editor-20240415.1558/with-editor.el @@ -1,12 +1,12 @@ ;;; with-editor.el --- Use the Emacsclient as $EDITOR -*- lexical-binding:t -*- -;; Copyright (C) 2014-2023 The Magit Project Contributors +;; Copyright (C) 2014-2024 The Magit Project Contributors -;; Author: Jonas Bernoulli +;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/with-editor ;; Keywords: processes terminals -;; Package-Version: 3.3.0 +;; Package-Version: 3.3.2 ;; Package-Requires: ((emacs "25.1") (compat "29.1.4.1")) ;; SPDX-License-Identifier: GPL-3.0-or-later @@ -41,10 +41,10 @@ ;; `$GIT_EDITOR'. To always use these variants add this to your init ;; file: ;; -;; (define-key (current-global-map) -;; [remap async-shell-command] #'with-editor-async-shell-command) -;; (define-key (current-global-map) -;; [remap shell-command] #'with-editor-shell-command) +;; (keymap-global-set " " +;; #'with-editor-async-shell-command) +;; (keymap-global-set " " +;; #'with-editor-shell-command) ;; Alternatively use the global `shell-command-with-editor-mode', ;; which always sets `$EDITOR' for all Emacs commands which ultimately @@ -117,9 +117,10 @@ please see https://github.com/magit/magit/wiki/Emacsclient.")))) (let* ((version-lst (cl-subseq (split-string emacs-version "\\.") 0 depth)) (version-reg (concat "^" (mapconcat #'identity version-lst "\\.")))) (or (locate-file - (if (equal (downcase invocation-name) "remacs") - "remacsclient" - "emacsclient") + (cond ((equal (downcase invocation-name) "remacs") + "remacsclient") + ((bound-and-true-p emacsclient-program-name)) + ("emacsclient")) path (cl-mapcan (lambda (v) (cl-mapcar (lambda (e) (concat v e)) exec-suffixes)) diff --git a/elpa/with-editor-20230711.1217/with-editor.info b/elpa/with-editor-20240415.1558/with-editor.info similarity index 95% rename from elpa/with-editor-20230711.1217/with-editor.info rename to elpa/with-editor-20240415.1558/with-editor.info index ae33d674..6f4aaf32 100644 --- a/elpa/with-editor-20230711.1217/with-editor.info +++ b/elpa/with-editor-20240415.1558/with-editor.info @@ -1,7 +1,8 @@ This is with-editor.info, produced by makeinfo version 6.7 from with-editor.texi. - Copyright (C) 2015-2023 Jonas Bernoulli + Copyright (C) 2015-2024 Jonas Bernoulli + You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -39,9 +40,10 @@ 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.3.0. +This manual is for With-Editor version 3.3.2. - Copyright (C) 2015-2023 Jonas Bernoulli + Copyright (C) 2015-2024 Jonas Bernoulli + You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -211,10 +213,10 @@ for an alternative environment variable such as ‘$GIT_EDITOR’. To always use these variants add this to you init file: - (define-key (current-global-map) - [remap async-shell-command] 'with-editor-async-shell-command) - (define-key (current-global-map) - [remap shell-command] 'with-editor-shell-command) + (keymap-global-set " " + #'with-editor-async-shell-command) + (keymap-global-set " " + #'with-editor-shell-command) Alternatively use the global ‘shell-command-with-editor-mode’. @@ -365,14 +367,14 @@ Appendix B Variable Index  Tag Table: -Node: Top773 -Node: Using the With-Editor package2563 -Node: Configuring With-Editor3149 -Node: Using With-Editor commands7698 -Node: Using With-Editor as a library10983 -Node: Debugging13008 -Node: Function and Command Index13900 -Node: Variable Index15398 +Node: Top799 +Node: Using the With-Editor package2615 +Node: Configuring With-Editor3201 +Node: Using With-Editor commands7750 +Node: Using With-Editor as a library11051 +Node: Debugging13076 +Node: Function and Command Index13968 +Node: Variable Index15466  End Tag Table -- 2.47.3