diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/dired.c | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/dired.c b/src/dired.c index 8afba247e61..00f9a5b0765 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Lisp functions for making directory listings. | 1 | /* Lisp functions for making directory listings. |
| 2 | Copyright (C) 1985-1986, 1993-1994, 1999-2014 Free Software | 2 | Copyright (C) 1985-1986, 1993-1994, 1999-2015 Free Software |
| 3 | Foundation, Inc. | 3 | Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -51,13 +51,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 51 | #include "msdos.h" /* for fstatat */ | 51 | #include "msdos.h" /* for fstatat */ |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | static Lisp_Object Qdirectory_files; | ||
| 55 | static Lisp_Object Qdirectory_files_and_attributes; | ||
| 56 | static Lisp_Object Qfile_name_completion; | ||
| 57 | static Lisp_Object Qfile_name_all_completions; | ||
| 58 | static Lisp_Object Qfile_attributes; | ||
| 59 | static Lisp_Object Qfile_attributes_lessp; | ||
| 60 | |||
| 61 | static ptrdiff_t scmp (const char *, const char *, ptrdiff_t); | 54 | static ptrdiff_t scmp (const char *, const char *, ptrdiff_t); |
| 62 | static Lisp_Object file_attributes (int, char const *, Lisp_Object); | 55 | static Lisp_Object file_attributes (int, char const *, Lisp_Object); |
| 63 | 56 | ||
| @@ -450,7 +443,6 @@ These are all file names in directory DIRECTORY which begin with FILE. */) | |||
| 450 | } | 443 | } |
| 451 | 444 | ||
| 452 | static int file_name_completion_stat (int, struct dirent *, struct stat *); | 445 | static int file_name_completion_stat (int, struct dirent *, struct stat *); |
| 453 | static Lisp_Object Qdefault_directory; | ||
| 454 | 446 | ||
| 455 | static Lisp_Object | 447 | static Lisp_Object |
| 456 | file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag, | 448 | file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag, |