commit e4d22abcab60ead179e7d114faa4c2def559cfbb (HEAD, refs/remotes/origin/master) Merge: 1bfd89f6ce6 469bc7c9686 Author: Jim Porter Date: Sun Jul 28 09:18:02 2024 -0700 ; Merge from origin/emacs-30 The following commit was skipped: 469bc7c9686 Use 'kill-process' as a fallback when a pipe gets broken ... commit 1bfd89f6ce61b7a0b2b899d724be0f477626f372 Merge: d50c82f3e98 367c0490a82 Author: Jim Porter Date: Sun Jul 28 09:18:02 2024 -0700 Merge from origin/emacs-30 367c0490a82 ; * admin/MAINTAINERS: Note what I maintain commit d50c82f3e98e5418e5a42b48162bc26028309b89 Author: Philip Kaludercic Date: Wed Jun 5 08:26:37 2024 +0200 Simplify 'help-enable-variable-value-editing' using 'string-edit' * lisp/help-fns.el (help-fns--edit-variable): Remove variable declaration, as 'string-edit' makes manually storing the variable name unnecessary. (help-fns-edit-variable): Use 'read-string-from-buffer' instead of custom major mode. (help-fns--edit-value-mode-map, help-fns--edit-value-mode) (help-fns-edit-mode-done, help-fns-edit-mode-cancel): Remove functionality provided by 'string-edit'. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 1ffe1b16588..8ea5b301684 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -1502,60 +1502,19 @@ it is displayed along with the global value." :parent button-map "e" #'help-fns-edit-variable))))) -(defvar help-fns--edit-variable) - (put 'help-fns-edit-variable 'disabled t) (defun help-fns-edit-variable () "Edit the variable under point." (declare (completion ignore)) (interactive) - (let ((var (get-text-property (point) 'help-fns--edit-variable))) - (unless var + (let* ((val (thing-at-point 'sexp)) + (var (get-text-property 0 'help-fns--edit-variable val))) + (unless val (error "No variable under point")) - (pop-to-buffer-same-window (format "*edit %s*" (nth 0 var))) - (prin1 (nth 1 var) (current-buffer)) - (pp-buffer) - (goto-char (point-min)) - (help-fns--edit-value-mode) - (insert (format ";; Edit the `%s' variable.\n" (nth 0 var)) - (substitute-command-keys - ";; `\\[help-fns-edit-mode-done]' to update the value and exit; \ -`\\[help-fns-edit-mode-cancel]' to cancel.\n\n")) - (setq-local help-fns--edit-variable var))) - -(defvar-keymap help-fns--edit-value-mode-map - "C-c C-c" #'help-fns-edit-mode-done - "C-c C-k" #'help-fns-edit-mode-cancel) - -(define-derived-mode help-fns--edit-value-mode emacs-lisp-mode "Elisp" - :interactive nil) - -(defun help-fns-edit-mode-done (&optional kill) - "Update the value of the variable being edited and kill the edit buffer. -If KILL (the prefix), don't update the value, but just kill the -current buffer." - (interactive "P" help-fns--edit-value-mode) - (unless help-fns--edit-variable - (error "Invalid buffer")) - (goto-char (point-min)) - (cl-destructuring-bind (variable _ buffer help-buffer) - help-fns--edit-variable - (unless (buffer-live-p buffer) - (error "Original buffer is gone; can't update")) - (unless kill - (let ((value (read (current-buffer)))) - (with-current-buffer buffer - (set variable value)))) - (kill-buffer (current-buffer)) - (when (buffer-live-p help-buffer) - (with-current-buffer help-buffer - (revert-buffer))))) - -(defun help-fns-edit-mode-cancel () - "Kill the edit buffer and cancel editing of the value. -This cancels value editing without updating the value." - (interactive nil help-fns--edit-value-mode) - (help-fns-edit-mode-done t)) + (let ((str (read-string-from-buffer + (format ";; Edit the `%s' variable." (nth 0 var)) + (prin1-to-string (nth 1 var))))) + (set (nth 0 var) (read str))))) (defun help-fns--run-describe-functions (functions &rest args) (with-current-buffer standard-output commit 469bc7c96868e3cd31e03603366f32b88070f887 Author: Jim Porter Date: Sun Jul 14 16:51:43 2024 -0700 Use 'kill-process' as a fallback when a pipe gets broken in Eshell This is better than 'delete-process' since it will ensure that any stderr pipe-processes get stopped as well (bug#72117). * lisp/eshell/esh-proc.el (eshell-insertion-filter): Use 'kill-process' instead of 'delete-process'. diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 2ff41c3d409..f3a099885bb 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -483,7 +483,7 @@ output." ;; here. However, remote processes don't currently ;; support that, and not all systems have SIGPIPE in ;; the first place (e.g. MS Windows). In these - ;; cases, just delete the process; this is + ;; cases, just kill the process; this is ;; reasonably close to the right behavior, since the ;; default action for SIGPIPE is to terminate the ;; process. For use cases where SIGPIPE is truly @@ -493,7 +493,7 @@ output." (eshell-pipe-broken (if (or (process-get proc 'remote-pid) (eq system-type 'windows-nt)) - (delete-process proc) + (kill-process proc) (signal-process proc 'SIGPIPE)))))) (process-put proc :eshell-busy nil)))))) commit 367c0490a8298ec156421bf265f6e091aa2807c7 Author: Philip Kaludercic Date: Sat Jul 27 10:30:48 2024 +0200 ; * admin/MAINTAINERS: Note what I maintain diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index eb0fef665e6..b073529e94b 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -229,6 +229,12 @@ Juri Linkov lisp/tab-bar.el lisp/tab-line.el +Philip Kaludercic + lisp/emacs-lisp/package.el + lisp/emacs-lisp/package-vc.el + lisp/emacs-lisp/compat.el + lisp/net/rcirc.el + ============================================================================== 2. Areas that someone is willing to maintain, although he would not necessarily mind if someone else was the official maintainer. @@ -367,6 +373,9 @@ Juri Linkov Repeat mode lisp/repeat.el +Philip Kaludercic + lisp/epa-ks.el + ============================================================================== 3. Externally maintained packages. ============================================================================== diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 45231bd4c73..34610102aa0 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2022-2024 Free Software Foundation, Inc. ;; Author: Philip Kaludercic +;; Maintainer: Philip Kaludercic ;; Keywords: tools ;; This file is part of GNU Emacs. diff --git a/lisp/epa-ks.el b/lisp/epa-ks.el index 13840da0bd9..fcd72cc8127 100644 --- a/lisp/epa-ks.el +++ b/lisp/epa-ks.el @@ -2,7 +2,8 @@ ;; Copyright (C) 2021-2024 Free Software Foundation, Inc. -;; Author: Philip K. +;; Author: Philip Kaludercic +;; Maintainer: Philip Kaludercic ;; Keywords: PGP, GnuPG ;; Package: epa