summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2022-08-28 22:13:45 +0300
committerJuri Linkov <juri@linkov.net>2022-08-28 22:13:45 +0300
commit35af917f187719fecadde278a51fd10bf47eed07 (patch)
tree1e3ee86698bac982336179ae1598f8e73c20d082
parent3edee9a6a352d0c352a29d6590233b412bd1ab04 (diff)
downloademacs-35af917f187719fecadde278a51fd10bf47eed07.tar.gz
Revert parts of 3f076a8e44 that caused test failures
* lisp/simple.el (line-move-finish): * lisp/window.el (scroll-command--goto-goal-column): Revert back to using truncate-partial-width-windows instead of truncated-partial-width-window-p. This change caused test failures in lisp/ls-lisp-tests.log and lisp/emacs-lisp/edebug-tests.log.
-rw-r--r--lisp/simple.el2
-rw-r--r--lisp/window.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index ceb29b1e30a..daacf697ff3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7973,7 +7973,7 @@ If NOERROR, don't signal an error if we can't move that many lines."
;; Move to the desired column.
(if (and line-move-visual
- (not (or truncate-lines (truncated-partial-width-window-p))))
+ (not (or truncate-lines truncate-partial-width-windows)))
;; Under line-move-visual, goal-column should be
;; interpreted in units of the frame's canonical character
;; width, which is exactly what vertical-motion does.
diff --git a/lisp/window.el b/lisp/window.el
index db69379e692..ec2b0a69302 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -10137,7 +10137,7 @@ semipermanent goal column for this command."
(when goal-column
;; Move to the desired column.
(if (and line-move-visual
- (not (or truncate-lines (truncated-partial-width-window-p))))
+ (not (or truncate-lines truncate-partial-width-windows)))
;; Under line-move-visual, goal-column should be
;; interpreted in units of the frame's canonical character
;; width, which is exactly what vertical-motion does.