[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dired.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/dired.c,v |
Date: |
Tue, 13 May 2008 04:39:33 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/05/13 04:39:32
Index: dired.c
===================================================================
RCS file: /sources/emacs/emacs/src/dired.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- dired.c 10 May 2008 08:34:33 -0000 1.147
+++ dired.c 13 May 2008 04:39:32 -0000 1.148
@@ -457,6 +457,7 @@
}
static int file_name_completion_stat ();
+Lisp_Object Qdefault_directory;
Lisp_Object
file_name_completion (file, dirname, all_flag, ver_flag, predicate)
@@ -505,6 +506,7 @@
encoded_file = encoded_dir = Qnil;
GCPRO5 (file, dirname, bestmatch, encoded_file, encoded_dir);
dirname = Fexpand_file_name (dirname, Qnil);
+ specbind (Qdefault_directory, dirname);
/* Do completion on the encoded file name
because the other names in the directory are (we presume)
@@ -667,22 +669,17 @@
/* This is a possible completion */
if (directoryp)
- {
- /* This completion is a directory; make it end with '/' */
+ /* This completion is a directory; make it end with '/'. */
name = Ffile_name_as_directory (name);
- }
/* Test the predicate, if any. */
-
if (!NILP (predicate))
{
- Lisp_Object decoded;
Lisp_Object val;
struct gcpro gcpro1;
GCPRO1 (name);
- decoded = Fexpand_file_name (name, dirname);
- val = call1 (predicate, decoded);
+ val = call1 (predicate, name);
UNGCPRO;
if (NILP (val))
@@ -1113,6 +1110,7 @@
Qfile_name_all_completions = intern ("file-name-all-completions");
Qfile_attributes = intern ("file-attributes");
Qfile_attributes_lessp = intern ("file-attributes-lessp");
+ Qdefault_directory = intern ("default-directory");
staticpro (&Qdirectory_files);
staticpro (&Qdirectory_files_and_attributes);
@@ -1120,6 +1118,7 @@
staticpro (&Qfile_name_all_completions);
staticpro (&Qfile_attributes);
staticpro (&Qfile_attributes_lessp);
+ staticpro (&Qdefault_directory);
defsubr (&Sdirectory_files);
defsubr (&Sdirectory_files_and_attributes);
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Eli Zaretskii, 2008/05/03
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Eli Zaretskii, 2008/05/09
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Eli Zaretskii, 2008/05/10
- [Emacs-diffs] Changes to emacs/src/dired.c,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Stefan Monnier, 2008/05/13
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Glenn Morris, 2008/05/14
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Eli Zaretskii, 2008/05/16