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: dired-read-dir-and-switches (was: FFAP) Date: Mon, 09 Nov 2009 12:30:57 +0200 Organization: JURTA Message-ID: <87ljigrpqa.fsf_-_@mail.jurta.org> References: <3b31caf90911051613w80af4cu61352a29ce5dcd77@mail.gmail.com> <87vdhoe73d.fsf@mail.jurta.org> <87y6mkb6qr.fsf@mail.jurta.org> <87bpjfiark.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1257763208 26321 80.91.229.12 (9 Nov 2009 10:40:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Nov 2009 10:40:08 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 09 11:40:01 2009 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 1N7RfD-0003BG-RY for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2009 11:40:00 +0100 Original-Received: from localhost ([127.0.0.1]:56685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N7RfD-0007z9-77 for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2009 05:39:59 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N7RcH-0006qE-7z for emacs-devel@gnu.org; Mon, 09 Nov 2009 05:36:57 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N7RcC-0006mc-HC for emacs-devel@gnu.org; Mon, 09 Nov 2009 05:36:56 -0500 Original-Received: from [199.232.76.173] (port=43390 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N7RcB-0006mQ-FP for emacs-devel@gnu.org; Mon, 09 Nov 2009 05:36:52 -0500 Original-Received: from smtp-out1.starman.ee ([85.253.0.3]:39965 helo=mx1.starman.ee) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N7RcA-0006MQ-US for emacs-devel@gnu.org; Mon, 09 Nov 2009 05:36:51 -0500 X-Virus-Scanned: by Amavisd-New at mx1.starman.ee Original-Received: from mail.starman.ee (62.65.208.58.cable.starman.ee [62.65.208.58]) by mx1.starman.ee (Postfix) with ESMTP id 8D6003F414F; Mon, 9 Nov 2009 12:36:45 +0200 (EET) In-Reply-To: <87bpjfiark.fsf@mail.jurta.org> (Juri Linkov's message of "Fri, 06 Nov 2009 23:19:45 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (x86_64-pc-linux-gnu) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:116740 Archived-At: Similar to `find-file-read-args' for file-reading functions, the following patch does the same for directory-reading functions. It modifies `dired-read-dir-and-switches' to allow it guessing the default value. Index: lisp/dired.el =================================================================== RCS file: /sources/emacs/emacs/lisp/dired.el,v retrieving revision 1.437 diff -c -r1.437 dired.el *** lisp/dired.el 8 Nov 2009 00:32:22 -0000 1.437 --- lisp/dired.el 9 Nov 2009 10:29:09 -0000 *************** *** 598,605 **** (if (next-read-file-uses-dialog-p) (read-directory-name (format "Dired %s(directory): " str) nil default-directory nil) ! (let ((default (and buffer-file-name ! (abbreviate-file-name buffer-file-name)))) (minibuffer-with-setup-hook (lambda () (setq minibuffer-default default)) (read-file-name (format "Dired %s(directory): " str) --- 598,639 ---- (if (next-read-file-uses-dialog-p) (read-directory-name (format "Dired %s(directory): " str) nil default-directory nil) ! (let ((default ! (cond ! ((eq major-mode 'dired-mode) ! (let ((filename (dired-get-filename nil t))) ! (when filename ! (if (file-directory-p filename) ! (file-name-as-directory ! (abbreviate-file-name filename)) ! (abbreviate-file-name filename))))) ! (buffer-file-name ! (abbreviate-file-name buffer-file-name)))) ! (file-at-point ! (cond ((fboundp 'ffap-guesser) ! ;; Most code from `dired-at-point-prompter' ! (let ((guess (ffap-guesser))) ! (setq guess ! (if (or (not guess) ! (and (fboundp 'ffap-url-p) ! (ffap-url-p guess)) ! (and (fboundp 'ffap-file-remote-p) ! (ffap-file-remote-p guess))) ! guess ! (abbreviate-file-name ! (expand-file-name guess)))) ! (when guess ! (if (file-directory-p guess) ! (file-name-as-directory guess) ! guess)))) ! ;; ((fboundp 'thing-at-point) ! ;; (thing-at-point 'filename)) ! ))) ! (when file-at-point ! (setq default ! (delq nil (delete "" (delete-dups ! (list file-at-point ! default)))))) (minibuffer-with-setup-hook (lambda () (setq minibuffer-default default)) (read-file-name (format "Dired %s(directory): " str) -- Juri Linkov http://www.jurta.org/emacs/