diff options
| author | Miles Bader | 2005-10-07 07:15:40 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-10-07 07:15:40 +0000 |
| commit | 00e18f33adde1d2f196fdf9cadf11235cc4fcc8f (patch) | |
| tree | 8c553c9a361da158ba47f3d0ed0429da180d957f /src/dired.c | |
| parent | ba4c328314c2b01e6dcc3807a0666a644c3f3954 (diff) | |
| parent | 9e1cb4bc96d36af6e8b893d467970a25afead03b (diff) | |
| download | emacs-00e18f33adde1d2f196fdf9cadf11235cc4fcc8f.tar.gz emacs-00e18f33adde1d2f196fdf9cadf11235cc4fcc8f.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 569-579)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 129-132)
- Update from CVS
- Merge from emacs--cvs-trunk--0
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dired.c b/src/dired.c index 4725644ee33..eca05cde0db 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -33,7 +33,6 @@ Boston, MA 02110-1301, USA. */ | |||
| 33 | #include <grp.h> | 33 | #include <grp.h> |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | #include "systime.h" | ||
| 37 | #include <errno.h> | 36 | #include <errno.h> |
| 38 | 37 | ||
| 39 | #ifdef VMS | 38 | #ifdef VMS |
| @@ -93,6 +92,7 @@ extern struct direct *readdir (); | |||
| 93 | #endif | 92 | #endif |
| 94 | 93 | ||
| 95 | #include "lisp.h" | 94 | #include "lisp.h" |
| 95 | #include "systime.h" | ||
| 96 | #include "buffer.h" | 96 | #include "buffer.h" |
| 97 | #include "commands.h" | 97 | #include "commands.h" |
| 98 | #include "character.h" | 98 | #include "character.h" |