From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: minibuffer-default-add-shell-commands Date: Sun, 30 Mar 2008 21:28:45 +0300 Organization: JURTA Message-ID: <87ve34w352.fsf@jurta.org> References: <87prtiik0l.fsf@jurta.org> <87iqz969fh.fsf@jurta.org> <87od9181m7.fsf@jurta.org> <87lk440z31.fsf@jurta.org> <8763v5axxc.fsf_-_@jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1206902911 28468 80.91.229.12 (30 Mar 2008 18:48:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 30 Mar 2008 18:48:31 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 30 20:49:02 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jg2aT-0006Do-Fc for ged-emacs-devel@m.gmane.org; Sun, 30 Mar 2008 20:49:01 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jg2Zr-0001Wq-4S for ged-emacs-devel@m.gmane.org; Sun, 30 Mar 2008 14:48:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jg2Yx-0000zE-8d for emacs-devel@gnu.org; Sun, 30 Mar 2008 14:47:27 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jg2Yt-0000xI-8B for emacs-devel@gnu.org; Sun, 30 Mar 2008 14:47:26 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jg2Yt-0000xE-07 for emacs-devel@gnu.org; Sun, 30 Mar 2008 14:47:23 -0400 Original-Received: from relay03.kiev.sovam.com ([62.64.120.201]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jg2Ys-00019W-Fe for emacs-devel@gnu.org; Sun, 30 Mar 2008 14:47:22 -0400 Original-Received: from [83.170.232.243] (helo=smtp.svitonline.com) by relay03.kiev.sovam.com with esmtp (Exim 4.67) (envelope-from ) id 1Jg2Yn-000KVe-Oo; Sun, 30 Mar 2008 21:47:20 +0300 In-Reply-To: (Stefan Monnier's message of "Sun, 30 Mar 2008 00:08:49 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (x86_64-pc-linux-gnu) X-Scanner-Signature: 3f6c5f504711b4b2e39067d20b60c9d6 X-DrWeb-checked: yes X-SpamTest-Envelope-From: juri@jurta.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 2455 [Mar 21 2008] X-SpamTest-Info: helo_type=3 X-SpamTest-Method: none X-SpamTest-Rate: 0 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0278], KAS30/Release X-detected-kernel: by monty-python.gnu.org: FreeBSD 6.x (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:93920 Archived-At: --=-=-= > That means that whenever if I ever leave a M-! prompt open and go do > something else, all my completions will now use > minibuffer-default-add-shell-commands? That's not right. > Let-binding is not right for minibuffer-default-add-function. This can be fixed by using `minibuffer-with-setup-hook'. A diff below shows differences between my previous patch and a new one: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/lisp/simple.el b/lisp/simple.el index 06f1be9..516e475 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2084,13 +2084,16 @@ (defun shell-command specifies the value of ERROR-BUFFER." (interactive - (let ((minibuffer-default-add-function - 'minibuffer-default-add-shell-commands)) - (list (read-shell-command "Shell command: " nil nil - (and buffer-file-name - (file-relative-name buffer-file-name))) - current-prefix-arg - shell-command-default-error-buffer))) + (list + (minibuffer-with-setup-hook + (lambda () + (set (make-local-variable 'minibuffer-default-add-function) + 'minibuffer-default-add-shell-commands)) + (read-shell-command "Shell command: " nil nil + (and buffer-file-name + (file-relative-name buffer-file-name)))) + current-prefix-arg + shell-command-default-error-buffer)) ;; Look for a handler in case default-directory is a remote file name. (let ((handler (find-file-name-handler (directory-file-name default-directory) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b8e2872..faf515d 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -482,8 +482,10 @@ (defun dired-read-shell-command ;;ARG is the prefix arg and may be used to indicate in the prompt which ;; files are affected. ;;This is an extra function so that you can redefine it, e.g., to use gmhist." - (let ((minibuffer-default-add-function - 'minibuffer-default-add-dired-shell-commands)) + (minibuffer-with-setup-hook + (lambda () + (set (make-local-variable 'minibuffer-default-add-function) + 'minibuffer-default-add-dired-shell-commands)) (dired-mark-pop-up nil 'shell files (function read-string) --=-=-= -- Juri Linkov http://www.jurta.org/emacs/ --=-=-=--