From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#35860: Delayed window positioning after buffer display Date: Tue, 11 Jun 2019 23:53:00 +0300 Organization: LINKOV.NET Message-ID: <875zpb4zdw.fsf@mail.linkov.net> References: <87o93ucjsi.fsf@mail.linkov.net> <83ef4p7prf.fsf@gnu.org> <87a7fc51qm.fsf@mail.linkov.net> <83k1eg5pmx.fsf@gnu.org> <87k1efhkgp.fsf@mail.linkov.net> <2347769f-9ab3-c1b6-699e-4e89a7d8eb1c@gmx.at> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="3469"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: 35860@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 11 23:53:41 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1haoi4-0000bn-Bl for geb-bug-gnu-emacs@m.gmane.org; Tue, 11 Jun 2019 23:53:41 +0200 Original-Received: from localhost ([::1]:55560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haohy-0005G7-DY for geb-bug-gnu-emacs@m.gmane.org; Tue, 11 Jun 2019 17:53:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40364) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haohX-0005Fn-8U for bug-gnu-emacs@gnu.org; Tue, 11 Jun 2019 17:53:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haohV-0000Wt-A5 for bug-gnu-emacs@gnu.org; Tue, 11 Jun 2019 17:53:07 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46775) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1haohS-0000VE-Dk for bug-gnu-emacs@gnu.org; Tue, 11 Jun 2019 17:53:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1haohS-0002F4-BU for bug-gnu-emacs@gnu.org; Tue, 11 Jun 2019 17:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 11 Jun 2019 21:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35860 X-GNU-PR-Package: emacs Original-Received: via spool by 35860-submit@debbugs.gnu.org id=B35860.15602899288527 (code B ref 35860); Tue, 11 Jun 2019 21:53:02 +0000 Original-Received: (at 35860) by debbugs.gnu.org; 11 Jun 2019 21:52:08 +0000 Original-Received: from localhost ([127.0.0.1]:60315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1haogZ-0002DT-J5 for submit@debbugs.gnu.org; Tue, 11 Jun 2019 17:52:07 -0400 Original-Received: from bonobo.elm.relay.mailchannels.net ([23.83.212.22]:55168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1haogW-0002DJ-L8 for 35860@debbugs.gnu.org; Tue, 11 Jun 2019 17:52:06 -0400 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 769D250146D; Tue, 11 Jun 2019 21:52:03 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a2.g.dreamhost.com (100-96-28-110.trex.outbound.svc.cluster.local [100.96.28.110]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id C666D50128E; Tue, 11 Jun 2019 21:52:02 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a2.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.17.2); Tue, 11 Jun 2019 21:52:03 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Cooing-Callous: 44fabbab4defd69d_1560289923218_417272002 X-MC-Loop-Signature: 1560289923218:2652606790 X-MC-Ingress-Time: 1560289923218 Original-Received: from pdx1-sub0-mail-a2.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a2.g.dreamhost.com (Postfix) with ESMTP id EFB237FD8B; Tue, 11 Jun 2019 14:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=gs0nUoqrOxhdAGAt4BFcmdxd9qc=; b= I+oMdEb5H86n+zW5vDf81xjjHRYbpiVjooxQsQPSB70Cn2EU1ccuNkscxYS+tr+m sYJr0Oa4fbP5mgFZDNEUbwBY84NtN5QC6ya0kkulinies8AVknMuJwq/dKCrfZhq FA2jiKRnZCQxaQjD1Ytd9KYLVG9bOtO9b4JgmObLPig= Original-Received: from mail.jurta.org (m91-129-109-209.cust.tele2.ee [91.129.109.209]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a2.g.dreamhost.com (Postfix) with ESMTPSA id 837C77FD98; Tue, 11 Jun 2019 14:51:54 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a2 In-Reply-To: <2347769f-9ab3-c1b6-699e-4e89a7d8eb1c@gmx.at> (martin rudalics's message of "Sat, 25 May 2019 09:58:14 +0200") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduuddrudehhedgudegkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuohhfffgjkfgfgggtsehmtderredtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecukfhppeeluddruddvledruddtledrvddtleenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrddutdelrddvtdelpdhrvghtuhhrnhdqphgrthhhpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhhrtghpthhtoheprhhuuggrlhhitghssehgmhigrdgrthenucevlhhushhtvghrufhiiigvpedt X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:160413 Archived-At: --=-=-= Content-Type: text/plain >> 0. emacs -Q >> 1. C-h l >> >> Then point in the *Help* buffer should be at the bottom, >> but when setting switch-to-buffer-preserve-window-point to nil >> instead of using set-marker, point still is at the top of the buffer. > > I'm confused. Here point in the *Help* buffer is always at bottom > regardless of how 'switch-to-buffer-preserve-window-point' is set. Dmitry reverted my patch in bug#35624 because of no progress here, so I needed to implement this quickly. It generalizes help-window-point-marker to a more general variable useful not only in the Help buffer but everywhere, and all my tests show that it works well: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=window-start-and-point.patch diff --git a/lisp/help.el b/lisp/help.el index 42ff375565..c046fe6a49 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -37,15 +37,7 @@ (add-hook 'temp-buffer-setup-hook 'help-mode-setup) (add-hook 'temp-buffer-show-hook 'help-mode-finish) -;; `help-window-point-marker' is a marker you can move to a valid -;; position of the buffer shown in the help window in order to override -;; the standard positioning mechanism (`point-min') chosen by -;; `with-output-to-temp-buffer' and `with-temp-buffer-window'. -;; `with-help-window' has this point nowhere before exiting. Currently -;; used by `view-lossage' to assert that the last keystrokes are always -;; visible. -(defvar help-window-point-marker (make-marker) - "Marker to override default `window-point' in help windows.") +(defvaralias 'help-window-point-marker 'window-point) (defvar help-window-old-frame nil "Frame selected at the time `with-help-window' is invoked.") @@ -481,7 +473,8 @@ view-lossage (comment-indent) (forward-line 1))) ;; Show point near the end of "lossage", as we did in Emacs 24. - (set-marker help-window-point-marker (point))))) + (setq window-point (point)) + (setq window-start (save-excursion (forward-line (- 5 (window-height))) (point)))))) ;; Key bindings @@ -1249,12 +1242,6 @@ help-window-setup (frame (window-frame window))) (when help-buffer - ;; Handle `help-window-point-marker'. - (when (eq (marker-buffer help-window-point-marker) help-buffer) - (set-window-point window help-window-point-marker) - ;; Reset `help-window-point-marker'. - (set-marker help-window-point-marker nil)) - ;; If the help window appears on another frame, select it if ;; `help-window-select' is non-nil and give that frame input focus ;; too. See also Bug#19012. @@ -1327,7 +1314,7 @@ help-window-setup ;; (3) An option (customizable via `help-window-select') to select the ;; help window automatically. -;; (4) A marker (`help-window-point-marker') to move point in the help +;; (4) A marker (`window-point') to move point in the help ;; window to an arbitrary buffer position. (defmacro with-help-window (buffer-or-name &rest body) "Evaluate BODY, send output to BUFFER-OR-NAME and show in a help window. @@ -1339,9 +1326,9 @@ with-help-window Most of this is done by `help-window-setup', which see." (declare (indent 1) (debug t)) `(progn - ;; Make `help-window-point-marker' point nowhere. The only place + ;; Make `window-point' point nowhere. The only place ;; where this should be set to a buffer position is within BODY. - (set-marker help-window-point-marker nil) + (when window-point (setq window-point nil)) (let ((temp-buffer-window-setup-hook (cons 'help-mode-setup temp-buffer-window-setup-hook)) (temp-buffer-window-show-hook diff --git a/lisp/window.el b/lisp/window.el index 69b1299dbd..e2796cecba 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -6795,6 +6795,22 @@ window--even-window-sizes (/ (- (window-total-height window) (window-total-height)) 2)) (error nil)))))) +(defvar window-point nil + "Marker to override default `window-point' in help windows. +`window-point' is a buffer-local marker you can move to a valid position of +the buffer shown in the window in order to override the standard +positioning mechanism (`point-min') chosen by window displaying functions.") +(make-variable-buffer-local 'window-point) +(put 'window-point 'permanent-local t) + +(defvar window-start nil + "Marker to override default `window-start' in help windows. +`window-start' is a buffer-local marker you can move to a valid position of +the buffer shown in the window in order to override the standard +positioning mechanism (`point-min') chosen by window displaying functions.") +(make-variable-buffer-local 'window-start) +(put 'window-start 'permanent-local t) + (defun window--display-buffer (buffer window type &optional alist) "Display BUFFER in WINDOW. WINDOW must be a live window chosen by a buffer display action @@ -6913,6 +6929,15 @@ window--display-buffer (when (consp preserve-size) (window-preserve-size window t (car preserve-size)) (window-preserve-size window nil (cdr preserve-size))))) + + (when window-start + (set-window-start window window-start) + (setq window-start nil)) + + (when window-point + (set-window-point window window-point) + (setq window-point nil)) + ;; Assign any window parameters specified. (let ((parameters (cdr (assq 'window-parameters alist)))) (dolist (parameter parameters) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 61c13026cc..20a67dd6a7 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1017,9 +1017,11 @@ vc-git-print-log ;; If the buffer exists from a previous invocation it might be ;; read-only. (let ((inhibit-read-only t)) - (with-current-buffer - buffer - (apply 'vc-git-command buffer + (with-current-buffer buffer + (insert (propertize "(Press 'd' here to see the diff against the current working revision)\n" + 'font-lock-face 'shadow)) + (setq window-start (point)) + (apply 'vc-git-command buffer 'async files (append '("log" "--no-color") --=-=-=--