From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#28864: 25.3.50; next-error-no-select does select Date: Sun, 29 Oct 2017 23:42:29 +0200 Organization: LINKOV.NET Message-ID: <87efplk4vu.fsf@localhost> References: <87bml72qck.fsf@gmail.com> <4045abe7-1acb-314b-b9ac-72b62db30570@yandex.ru> <87sheh270d.fsf@gmail.com> <6f3b7c2c-31af-8eb2-8f13-a9ba17d3d8e6@yandex.ru> <87mv4m5lok.fsf@gmail.com> <87d15h5f97.fsf@gmail.com> <874lqreyj5.fsf@localhost> <7f67cb1c-062f-44fa-ba8e-9ac0cab220a3@yandex.ru> <87po9del14.fsf@localhost> <5c524170-7ba7-8279-41b5-b4286c2980f0@yandex.ru> <87tvyomh37.fsf@localhost> <7821c28e-3bf5-0bab-46ab-23f3a02566a8@yandex.ru> <87po97vuoh.fsf@localhost> <87778f88-a6e6-06d5-f5ad-8a46d73144cc@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1509313575 26483 195.159.176.226 (29 Oct 2017 21:46:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 29 Oct 2017 21:46:15 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (x86_64-pc-linux-gnu) Cc: 28864@debbugs.gnu.org, Noam Postavsky , Tino Calancha To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 29 22:46:11 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8vPB-000613-W0 for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Oct 2017 22:46:06 +0100 Original-Received: from localhost ([::1]:37834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8vPJ-0008N3-79 for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Oct 2017 17:46:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8vPC-0008Mv-3p for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2017 17:46:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8vP8-0000af-UA for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2017 17:46:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e8vP8-0000aV-PA for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2017 17:46:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e8vP8-0000DJ-8J for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2017 17:46: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: Sun, 29 Oct 2017 21:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28864 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 28864-submit@debbugs.gnu.org id=B28864.150931351229914 (code B ref 28864); Sun, 29 Oct 2017 21:46:02 +0000 Original-Received: (at 28864) by debbugs.gnu.org; 29 Oct 2017 21:45:12 +0000 Original-Received: from localhost ([127.0.0.1]:41042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8vOJ-0007lh-AY for submit@debbugs.gnu.org; Sun, 29 Oct 2017 17:45:12 -0400 Original-Received: from sub3.mail.dreamhost.com ([69.163.253.7]:56265 helo=homiemail-a76.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e8vOH-0007jN-J0 for 28864@debbugs.gnu.org; Sun, 29 Oct 2017 17:45:10 -0400 Original-Received: from homiemail-a76.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a76.g.dreamhost.com (Postfix) with ESMTP id CE3D145807B; Sun, 29 Oct 2017 14:45:07 -0700 (PDT) Original-Received: from localhost.linkov.net (m91-131-180-239.cust.tele2.ee [91.131.180.239]) (Authenticated sender: jurta@jurta.org) by homiemail-a76.g.dreamhost.com (Postfix) with ESMTPA id 9037A458079; Sun, 29 Oct 2017 14:45:06 -0700 (PDT) In-Reply-To: <87778f88-a6e6-06d5-f5ad-8a46d73144cc@yandex.ru> (Dmitry Gutov's message of "Sun, 29 Oct 2017 01:46:48 +0300") 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: 208.118.235.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:139169 Archived-At: --=-=-= Content-Type: text/plain >> I believe this patch is a change for the better: > > Could you resend it as unified diff? Or push to > a branch. diff-context->unified doesn't seem to work on the patch you sent. I thought maybe context diff is easier to read in this case, but here is unified diff below. >> 1. makes next-error-function buffer-local > > Interesting. > >> 2. sets both buffer-local and global values > > Why? If next-error-find-buffer-function can find the appropriate buffer, it > can use the local value in it. We need the global value as well to get the last next-error buffer when there is no buffer-local value yet in the current buffer. >> 3. adds customizable next-error-find-buffer-function >> >> 4. moves window-on-frame-visibility code to separate function >> that can be used to customize for backward-compatibility > > Do we get a built-in alternative to this value? If we just provide > a customization point, that nice, but not a significant improvement. You mean to remove next-error-buffer-on-selected-frame? Or maybe to do the other way: add more predefined functions like a function to use window-local navigation as an alternative. >> 5. adds next-error-select-buffer to manually switch to another >> next-error capable buffer > > Not having tried the patch yet... Will the user have to do that after > semi-accidentally opening a changelog-mode buffer, in order not to switch > to its error list? When the user visits a ChangeLog buffer from *grep*, then next-error continues the *grep* navigation. When the user visit a ChangeLog file by any other command, then next-error navigates entries in that ChangeLog buffer. But in case when the user changes mind and decides to switch from *grep* navigation to ChangeLog navigation, there is this new command. >> 6. message to show which next-error buffer is currently used > > Every time we call `next-error'? That's right. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=next-error-2.patch diff --git a/lisp/simple.el b/lisp/simple.el index 12d65e5..55de17d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -143,6 +143,7 @@ next-error-last-buffer A buffer becomes most recent when its compilation, grep, or similar mode is started, or when it is used with \\[next-error] or \\[compile-goto-error].") +(make-variable-buffer-local 'next-error-function) (defvar next-error-function nil "Function to use to find the next error in the current buffer. @@ -191,6 +192,30 @@ next-error-buffer-p (and extra-test-inclusive (funcall extra-test-inclusive)))))) +(defcustom next-error-find-buffer-function nil + "Function called to find a `next-error' capable buffer." + :type '(choice (const :tag "Buffer on selected frame" next-error-buffer-on-selected-frame) + (const :tag "No default" nil) + (function :tag "Other function")) + :group 'next-error + :version "27.1") + +(defun next-error-buffer-on-selected-frame (&optional avoid-current + extra-test-inclusive + extra-test-exclusive) + "Return a single visible next-error buffer on the selected frame." + (let ((window-buffers + (delete-dups + (delq nil (mapcar (lambda (w) + (if (next-error-buffer-p + (window-buffer w) + avoid-current + extra-test-inclusive extra-test-exclusive) + (window-buffer w))) + (window-list)))))) + (if (eq (length window-buffers) 1) + (car window-buffers)))) + (defun next-error-find-buffer (&optional avoid-current extra-test-inclusive extra-test-exclusive) @@ -207,18 +232,11 @@ next-error-find-buffer that would normally be considered usable. If it returns nil, that buffer is rejected." (or - ;; 1. If one window on the selected frame displays such buffer, return it. - (let ((window-buffers - (delete-dups - (delq nil (mapcar (lambda (w) - (if (next-error-buffer-p - (window-buffer w) - avoid-current - extra-test-inclusive extra-test-exclusive) - (window-buffer w))) - (window-list)))))) - (if (eq (length window-buffers) 1) - (car window-buffers))) + ;; 1. If a customizable function returns a buffer, use it. + (when next-error-find-buffer-function + (funcall next-error-find-buffer-function avoid-current + extra-test-inclusive + extra-test-exclusive)) ;; 2. If next-error-last-buffer is an acceptable buffer, use that. (if (and next-error-last-buffer (next-error-buffer-p next-error-last-buffer avoid-current @@ -279,23 +297,43 @@ next-error `compilation-error-regexp-alist'." (interactive "P") (if (consp arg) (setq reset t arg nil)) - (when (setq next-error-last-buffer (next-error-find-buffer)) + (let ((next-error-buffer (next-error-find-buffer))) + (when next-error-buffer + ;; we know here that next-error-function is a valid symbol we can funcall + (with-current-buffer next-error-last-buffer + (funcall next-error-function (prefix-numeric-value arg) reset) + ;; next-error-function might change the value of + ;; next-error-last-buffer, so set it later + (setq next-error-last-buffer next-error-buffer) + (setq-default next-error-last-buffer next-error-last-buffer) + (when next-error-recenter + (recenter next-error-recenter)) + (message "Next error buffer from %s" next-error-last-buffer) + (run-hooks 'next-error-hook))))) + +(defun next-error-internal () + "Visit the source code corresponding to the `next-error' message at point." + (let ((next-error-buffer (current-buffer))) ;; we know here that next-error-function is a valid symbol we can funcall - (with-current-buffer next-error-last-buffer - (funcall next-error-function (prefix-numeric-value arg) reset) + (with-current-buffer next-error-buffer + (funcall next-error-function 0 nil) + ;; next-error-function might change the value of + ;; next-error-last-buffer, so set it later + (setq next-error-last-buffer next-error-buffer) + (setq-default next-error-last-buffer next-error-last-buffer) (when next-error-recenter (recenter next-error-recenter)) + (message "Next error buffer from %s" next-error-last-buffer) (run-hooks 'next-error-hook)))) -(defun next-error-internal () - "Visit the source code corresponding to the `next-error' message at point." - (setq next-error-last-buffer (current-buffer)) - ;; we know here that next-error-function is a valid symbol we can funcall - (with-current-buffer next-error-last-buffer - (funcall next-error-function 0 nil) - (when next-error-recenter - (recenter next-error-recenter)) - (run-hooks 'next-error-hook))) +(defun next-error-select-buffer (next-error-buffer) + "Select a `next-error' capable buffer and set it as the last used." + (interactive + (list (get-buffer + (read-buffer "Select next-error buffer: " nil nil + (lambda (b) (next-error-buffer-p (cdr b))))))) + (setq next-error-last-buffer next-error-buffer) + (setq-default next-error-last-buffer next-error-last-buffer)) (defalias 'goto-next-locus 'next-error) (defalias 'next-match 'next-error) --=-=-=--