From 574fdca333678ccf67c6f403eff6ea27197af272 Mon Sep 17 00:00:00 2001 From: dickmao Date: Sun, 14 Aug 2022 13:47:10 -0400 Subject: [PATCH] Squashed commit of the following: commit e4e6e9b16bca6754ad1d3b176e065fccd72dca98 Author: dickmao Date: Sun Aug 14 13:46:36 2022 -0400 Revert "Add variable end-of-defun-moves-to-eol" This reverts commit 50730a8b04ede381c958600a1400efe8d04d9dfc. commit fa36e511b9f348e8f3b2555b010c00516c6602aa Author: dickmao Date: Sun Aug 14 13:46:25 2022 -0400 Revert "; * lisp/emacs-lisp/lisp.el (end-of-defun-moves-to-eol): Doc fix." This reverts commit 564571f712fcf0ffcb93eeca67f7716263c9def5. (end-of-defun): --- lisp/emacs-lisp/lisp.el | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index acae1a0b0a9..4b85414943a 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -507,11 +507,6 @@ end-of-defun-function So the function can assume that point is at the beginning of the defun body. It should move point to the first position after the defun.") -(defvar end-of-defun-moves-to-eol t - "Whether `end-of-defun' moves to eol before doing anything else. -Set this to nil if this movement adversely affects the buffer's -major mode's decisions about context.") - (defun buffer-end (arg) "Return the \"far end\" position of the buffer, in direction ARG. If ARG is positive, that's the end of the buffer. @@ -543,9 +538,7 @@ end-of-defun (push-mark)) (if (or (null arg) (= arg 0)) (setq arg 1)) (let ((pos (point)) - (beg (progn (when end-of-defun-moves-to-eol - (end-of-line 1)) - (beginning-of-defun-raw 1) (point))) + (beg (progn (end-of-line 1) (beginning-of-defun-raw 1) (point))) (skip (lambda () ;; When comparing point against pos, we want to consider that ;; if point was right after the end of the function, it's -- 2.36.1