From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#46374: 28.0.50; Ask me to save buffers only if they are under callers dir Date: Wed, 28 Apr 2021 21:31:25 +0200 Message-ID: <87h7jq1a0i.fsf@gmail.com> References: <878s7z4ihk.fsf@gmail.com> <87a6sdzeh6.fsf@mail.linkov.net> <87ft16g0u2.fsf@gmail.com> <87tupmisel.fsf@mail.linkov.net> <1952f2d9-51b6-a4ba-6c9e-98594222f017@gmail.com> <87r1kpemnr.fsf@mail.linkov.net> <87mtv6yloe.fsf@gmail.com> <871rcgr4qp.fsf@mail.linkov.net> <87zgz3gfqo.fsf@mail.linkov.net> <87blbhhghk.fsf@mail.linkov.net> <87pmzsgzh3.fsf@gmail.com> <87o8fc5jq0.fsf@mail.linkov.net> <87wnsz7jmy.fsf@gmail.com> <87tunvnxfo.fsf@linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2773"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 46374@debbugs.gnu.org, Stefan Monnier , =?UTF-8?Q?Qu=C3=A1ch_?= =?UTF-8?Q?M=E1=BB=B9_?= =?UTF-8?Q?Uy=C3=AAn?= Nhi To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Apr 28 21:32:12 2021 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 1lbput-0000dc-Vq for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Apr 2021 21:32:12 +0200 Original-Received: from localhost ([::1]:46092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbput-0004vF-1l for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Apr 2021 15:32:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbpuk-0004uN-0b for bug-gnu-emacs@gnu.org; Wed, 28 Apr 2021 15:32:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lbpuj-0003UI-Nb for bug-gnu-emacs@gnu.org; Wed, 28 Apr 2021 15:32:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lbpuj-0006nv-KH for bug-gnu-emacs@gnu.org; Wed, 28 Apr 2021 15:32:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Apr 2021 19:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46374 X-GNU-PR-Package: emacs Original-Received: via spool by 46374-submit@debbugs.gnu.org id=B46374.161963830026125 (code B ref 46374); Wed, 28 Apr 2021 19:32:01 +0000 Original-Received: (at 46374) by debbugs.gnu.org; 28 Apr 2021 19:31:40 +0000 Original-Received: from localhost ([127.0.0.1]:54115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbpuO-0006nJ-1v for submit@debbugs.gnu.org; Wed, 28 Apr 2021 15:31:40 -0400 Original-Received: from mail-wm1-f46.google.com ([209.85.128.46]:42531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbpuJ-0006n2-Jt for 46374@debbugs.gnu.org; Wed, 28 Apr 2021 15:31:39 -0400 Original-Received: by mail-wm1-f46.google.com with SMTP id a22-20020a05600c2256b029014294520f18so5113832wmm.1 for <46374@debbugs.gnu.org>; Wed, 28 Apr 2021 12:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=msDiSo1F+Euw8uSa6BVTsjLQPBNnnBOZcywenYY0A6E=; b=rrgy9gF4p8jtmFFDWGPEXIssbhyO+fBpGSI2sPfVYIkMXbwPbbw4ElacCtyAFn2dvH eiYkVmtnTMlwIUuJajYY2LHMSYvmTXvz2TQaBQ+94X2oIxJb8x0SPfXsxUA/E8lLwFCz XwtN7ghpVVd2QYFSD6kWZaE4fFVW1WARk/9jK0am6ZKYj1ZpsKguhCItDy3XqXbquJUT TFqRrV7v6YdSRxs9uWP+6xMYHp/Sg4UgZo0Tbq0PVguRLurUdQZtoVrYn5lHdFi4k92A gFrJenPDnNwsEKMLYPcikwQmj7T/QdbEhD6Y8ijeWC0tNxyGtEr2S9bUhQArEYI6Z6nU p6KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=msDiSo1F+Euw8uSa6BVTsjLQPBNnnBOZcywenYY0A6E=; b=lUobxk+mIV6wFzRlpf7ySdKX97X6pjgdW9uP+Uk2W2xlAs+6j2W5LD2IgkYMPYvU03 DJVjODrKekfwayuDUmO7aF+vBhVrD/3HZoG7D1hO/eps0HS2c0FunYZ0fLyYdELmgQcP /WAri5lLcTLc9xok9G7jXDZ/qz7ukOx2lly9byS9NqFCT5/eDakU7BuiyW8fleijnG8N HhCAVojfzivqbyXIsH2nJ94k/G+vb17uM3aQL/CXlg75eUasyd6nxcdGDpH2XFdYmAbp TYkmAAmRi5rtYty1bkAVnSu7/2X6Yocp7cQXCuhNWpzkWEISMgpWTPHUSHXF8AGpDwwV S3dQ== X-Gm-Message-State: AOAM532MBZmNa8/JCM9MzfVjDwRysflH39ry4aFRy/RY2zW3lEhaT59K Jc4wYKfqvlGeRvNxuhbac+Q= X-Google-Smtp-Source: ABdhPJx3b412qhe2ShV387AbrfKPhNAcmH2ennrrRIN4SoR8TBK+GktiwBLtY8Ca/+8XmpHWoJ5qBQ== X-Received: by 2002:a1c:a50d:: with SMTP id o13mr6195371wme.161.1619638288518; Wed, 28 Apr 2021 12:31:28 -0700 (PDT) Original-Received: from localhost.example.com ([31.7.242.222]) by smtp.gmail.com with ESMTPSA id x8sm977835wru.70.2021.04.28.12.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 12:31:27 -0700 (PDT) In-Reply-To: <87tunvnxfo.fsf@linkov.net> (Juri Linkov's message of "Sun, 25 Apr 2021 01:13:13 +0300") 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" Xref: news.gmane.io gmane.emacs.bugs:205135 Archived-At: Juri Linkov writes: > Your first patch was better in terms of customizability. > but its disadvantage was that it introduced a new defcustom. > > Would it be possible to merge the advantage of your first patch > with the cleaner solution of your latest patch? Good idea. > Is it possible to add the default value as a function that returns nil? > This will implement FIXME, and will allow adding more options > with more predicates: I have found a way to merge the two approaches. Not sure if idiomatic, but it works. [The patch omits NEWS entry and documentation; I will add those once we found the implementation] --8<-----------------------------cut here---------------start------------->8--- commit 3abcf022a1fb375f15df8438ebf0cf5b67082bbc Author: Tino Calancha Date: Wed Apr 28 21:18:28 2021 +0200 Merge the two approaches * lisp/files (some-buffers-default-predicate): Redefined; store a function that builds the actual predicate used in save-some-buffers. On top of commit 0c7f1e2e42d6bf9f95e88c02d4e1ed9cb40693d8 diff --git a/lisp/files.el b/lisp/files.el index 8e8fbac8dc..707c6a77bc 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5512,19 +5512,37 @@ save-some-buffers-action-alist (defvar-local buffer-save-without-query nil "Non-nil means `save-some-buffers' should save this buffer without asking.") -(defcustom save-some-buffers-default-predicate nil - "Default predicate for `save-some-buffers'. +(defvar save-some-buffers-default-fun (lambda () nil)) -This allows you to stop `save-some-buffers' from asking -about certain files that you'd usually rather not save. +(defvar save-some-buffers-in-current-project-fun + (lambda () + (let ((project-dir (or (and (project-current) (project-root (project-current))) + default-directory))) + (lambda () (file-in-directory-p default-directory project-dir))))) -This function is called (with no parameters) from the buffer to -be saved." +(defcustom save-some-buffers-default-predicate save-some-buffers-default-fun + "Generator function of the default predicate for `save-some-buffers'. + +It must be a function with no arguments that returns a predicate. +This predicate is called (with no parameters) from the buffer to be +saved. + +This allows you to stop `save-some-buffers' from asking about certain +files that you'd usually rather not save. + +The default value builds a predicate that prompts to save any modified +file-visiting buffer. The second value restricts to buffers inside +the project from where `save-some-buffers' is invoked, or under the +caller's `default-directory' if no project is found." :group 'auto-save - ;; FIXME nil should not be a valid option, let alone the default, - ;; eg so that add-function can be used. - :type '(choice (const :tag "Default" nil) function) - :version "26.1") + :type `(choice + (function :tag "All buffers" :value ,save-some-buffers-default-fun) + (function :tag "Buffers inside current project" + :value ,save-some-buffers-in-current-project-fun)) + :version "28.1") + +(defun save-some-buffers-fun () + (funcall save-some-buffers-default-predicate)) (defun save-some-buffers (&optional arg pred) "Save some modified file-visiting buffers. Asks user about each one. @@ -5553,7 +5571,8 @@ save-some-buffers change the additional actions you can take on files." (interactive "P") (unless pred - (setq pred save-some-buffers-default-predicate)) + (setq pred (save-some-buffers-fun))) + (let* ((switched-buffer nil) (save-some-buffers--switch-window-callback (lambda (buffer) --8<-----------------------------cut here---------------end--------------->8---