diff options
| author | Miles Bader | 2007-06-11 01:00:07 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-11 01:00:07 +0000 |
| commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
| tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /src/s | |
| parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/ms-w32.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 75888f2df2a..57c3cdfcd43 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -255,7 +255,6 @@ Boston, MA 02110-1301, USA. */ | |||
| 255 | 255 | ||
| 256 | #undef TM_IN_SYS_TIME | 256 | #undef TM_IN_SYS_TIME |
| 257 | #undef HAVE_TM_ZONE | 257 | #undef HAVE_TM_ZONE |
| 258 | #define HAVE_TZNAME 1 | ||
| 259 | 258 | ||
| 260 | #define HAVE_LONG_FILE_NAMES 1 | 259 | #define HAVE_LONG_FILE_NAMES 1 |
| 261 | 260 | ||