From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#33871: 27.0.50; Revert Dired window saved in window configuration Date: Sun, 18 Feb 2024 09:39:31 +0200 Organization: LINKOV.NET Message-ID: <86wmr2w7to.fsf@mail.linkov.net> References: <87bm59mglk.fsf@mail.linkov.net> <86h792x3wv.fsf@mail.linkov.net> <119a9c2c-e27f-6c3a-07ad-66bc76fc58cf@gmx.at> <861r05co9l.fsf@mail.linkov.net> <86zgmsne32.fsf@mail.linkov.net> <86sfsi29yc.fsf@mail.linkov.net> <1830e7af-27a8-ac7f-ba6f-fa2006139208@gmx.at> <86fsohmqn9.fsf@mail.linkov.net> <9df28298-fedc-0cfe-7243-c04868115e90@gmx.at> <86fsoezsw3.fsf@mail.linkov.net> <86sfsewvxr.fsf@mail.linkov.net> <9d741b43-e3bb-669b-b345-6b877c902b33@gmx.at> <86fsoaq4lo.fsf@mail.linkov.net> <86tucp7dbp.fsf@mail.linkov.net> <37e2129c-464f-7f0a-0870-f7360ca21dc3@gmx.at> <86zfw07tbw.fsf@mail.linkov.net> <96fd3170-e5d2-4d16-93ec-c6fff3efb787@gmx.at> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16158"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 33871@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 18 08:48:54 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rbbuw-00044U-DM for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Feb 2024 08:48:54 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbbum-0002Bd-2d; Sun, 18 Feb 2024 02:48:44 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbbuj-0002B5-Ld for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 02:48:41 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbbuj-0007Gk-DZ for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 02:48:41 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbbv3-0003o4-Nj for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 02:49:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Feb 2024 07:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33871 X-GNU-PR-Package: emacs Original-Received: via spool by 33871-submit@debbugs.gnu.org id=B33871.170824248414280 (code B ref 33871); Sun, 18 Feb 2024 07:49:01 +0000 Original-Received: (at 33871) by debbugs.gnu.org; 18 Feb 2024 07:48:04 +0000 Original-Received: from localhost ([127.0.0.1]:34121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbbu7-0003iF-Ir for submit@debbugs.gnu.org; Sun, 18 Feb 2024 02:48:04 -0500 Original-Received: from relay8-d.mail.gandi.net ([217.70.183.201]:43417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbbu5-0003hV-ML for 33871@debbugs.gnu.org; Sun, 18 Feb 2024 02:48:02 -0500 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 4B0691BF203; Sun, 18 Feb 2024 07:47:13 +0000 (UTC) In-Reply-To: <96fd3170-e5d2-4d16-93ec-c6fff3efb787@gmx.at> (martin rudalics's message of "Fri, 16 Feb 2024 10:41:01 +0100") X-GND-Sasl: juri@linkov.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:280161 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit > + (with-selected-window w > + (when (functionp window-set-context-function) > > and > > + (with-selected-window w > + (when-let ((context (window-parameter w 'context))) > > would set up a precedence case for the future use of > 'window-set-context-function'. Are you sure that you always want to > select the window in question here or would it suffice to pass the > window as argument to the context function? Ok, let's add the WINDOW argument. This means that most hooks will need to call 'with-selected-window' explicitly. But maybe there will be hooks that don't need to select a window. So here how a bookmark-like default context could look. I'm still not sure whether it's a good idea to enable this by default. #+begin_src emacs-lisp ;; Like ‘bookmark-make-record-default’ (setq-default window-set-context-function (lambda (w) (with-selected-window w `((front-context-string . ,(buffer-substring-no-properties (point) (min (+ (point) 16) (point-max)))) (rear-context-string . ,(buffer-substring-no-properties (point) (max (- (point) 16) (point-min)))))))) ;; Like ‘bookmark-default-handler’ (setq-default window-use-context-function (lambda (w context) (with-selected-window w (when-let ((f (alist-get 'front-context-string context))) (search-forward f (point-max) t) (goto-char (match-beginning 0))) (when-let ((r (alist-get 'rear-context-string context))) (search-backward r (point-min) t) (goto-char (match-end 0)))))) #+end_src And here is the patch that at least handles the dired revert. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=window-context-function.patch diff --git a/lisp/dired.el b/lisp/dired.el index 9e3b888df14..dd397eb5c46 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2743,6 +2745,19 @@ dired-mode '(dired-font-lock-keywords t nil nil beginning-of-line)) (setq-local desktop-save-buffer 'dired-desktop-buffer-misc-data) (setq-local grep-read-files-function #'dired-grep-read-files) + (setq-local window-set-context-function + (lambda (w) + (with-selected-window w + (if-let ((f (dired-get-filename nil t))) + `((dired-filename . ,f)) + `((position . ,(point))))))) + (setq-local window-use-context-function + (lambda (w context) + (with-selected-window w + (if-let ((f (alist-get 'dired-filename context))) + (dired-goto-file f) + (when-let ((p (alist-get 'position context))) + (goto-char p)))))) (setq dired-switches-alist nil) (hack-dir-local-variables-non-file-buffer) ; before sorting (dired-sort-other dired-actual-switches t) diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 3e1d8278b04..7718262acbb 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -1283,6 +1283,10 @@ frameset-filter-tabs (push '(tabs . frameset-filter-tabs) frameset-filter-alist) +(defvar window-set-context-function nil) +(defvar window-use-context-function nil) +(add-to-list 'window-persistent-parameters '(context . writable)) + (defun tab-bar--tab (&optional frame) "Make a new tab data structure that can be added to tabs on the FRAME." (let* ((tab (tab-bar--current-tab-find nil frame)) @@ -1292,6 +1296,14 @@ tab-bar--tab frame 'buffer-list))) (bbl (seq-filter #'buffer-live-p (frame-parameter frame 'buried-buffer-list)))) + (walk-windows + (lambda (w) + (when-let (((functionp window-set-context-function)) + (context (funcall window-set-context-function w))) + (set-window-parameter + w 'context (cons (buffer-name (window-buffer w)) context)))) + 'nomini) + `(tab (name . ,(if tab-explicit-name (alist-get 'name tab) @@ -1479,6 +1491,14 @@ tab-bar-select-tab (select-window (get-mru-window))) (window-state-put ws nil 'safe))) + (walk-windows + (lambda (w) + (when-let (((functionp window-use-context-function)) + (context (window-parameter w 'context)) + ((equal (buffer-name (window-buffer w)) (car context)))) + (funcall window-use-context-function w (cdr context)))) + 'nomini) + ;; Select the minibuffer when it was active before switching tabs (when (and minibuffer-was-active (active-minibuffer-window)) (select-window (active-minibuffer-window))) --=-=-=--