From ed8ad89483647c3f0a68b489c86c9e24f4ada788 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Sun, 16 Mar 2025 18:02:35 +0100 Subject: [PATCH] Fix 'lisp-kill-line' with point before comment --- lisp/emacs-lisp/lisp-mode.el | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 3d9dd12a2ab..450782c1af5 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -922,19 +922,21 @@ font-lock keywords will not be case sensitive." (if (beginning-of-defun--in-emptyish-line-p) (kill-line arg) (skip-syntax-forward " -") - (while (and (condition-case nil - (progn - (forward-sexp) - (skip-syntax-forward " -") - t) - (scan-error nil)) - ;; We've skipped one sexp. - ;; Are we still on the same line? - (< (point) eol) - ;; Does the line end with a comment? - (or (not (equal (char-after) ?\;)) - ;; It does. Stop after the comment. - (prog1 nil (goto-char eol))))) + (if (equal (char-after) ?\;) + (goto-char eol) + (while (and (condition-case nil + (progn + (forward-sexp) + (skip-syntax-forward " -") + t) + (scan-error nil)) + ;; We've skipped one sexp. + ;; Are we still on the same line? + (< (point) eol) + ;; Does the line end with a comment? + (or (not (equal (char-after) ?\;)) + ;; It does. Stop after the comment. + (prog1 nil (goto-char eol)))))) (kill-region beg (point))))))) (defun lisp-tidy-sexp () -- 2.39.5