diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /src/mac.c | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'src/mac.c')
| -rw-r--r-- | src/mac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mac.c b/src/mac.c index 7a08d828725..5084a02b27d 100644 --- a/src/mac.c +++ b/src/mac.c @@ -1,6 +1,6 @@ /* Unix emulation routines for GNU Emacs on the Mac OS. Copyright (C) 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2261,7 +2261,7 @@ sys_open (const char *path, int oflag) int res = open (mac_pathname, oflag); /* if (oflag == O_WRONLY || oflag == O_RDWR) */ if (oflag & O_CREAT) - fsetfileinfo (mac_pathname, 'EMAx', 'TEXT'); + fsetfileinfo (mac_pathname, MAC_EMACS_CREATOR_CODE, 'TEXT'); return res; #else /* not __MRC__ */ return open (mac_pathname, oflag); @@ -2287,7 +2287,7 @@ sys_creat (const char *path, mode_t mode) { #ifdef __MRC__ int result = creat (mac_pathname); - fsetfileinfo (mac_pathname, 'EMAx', 'TEXT'); + fsetfileinfo (mac_pathname, MAC_EMACS_CREATOR_CODE, 'TEXT'); return result; #else /* not __MRC__ */ return creat (mac_pathname, mode); @@ -2415,7 +2415,7 @@ sys_fopen (const char *name, const char *mode) { #ifdef __MRC__ if (mode[0] == 'w' || mode[0] == 'a') - fsetfileinfo (mac_pathname, 'EMAx', 'TEXT'); + fsetfileinfo (mac_pathname, MAC_EMACS_CREATOR_CODE, 'TEXT'); #endif /* not __MRC__ */ return fopen (mac_pathname, mode); } @@ -4316,7 +4316,7 @@ assumed. Return non-nil if successful. */) OSType cCode; CHECK_STRING (filename); - cCode = mac_get_code_from_arg(code, 'EMAx'); + cCode = mac_get_code_from_arg(code, MAC_EMACS_CREATOR_CODE); if (NILP(Ffile_exists_p(filename)) || !NILP(Ffile_directory_p(filename))) { return Qnil; |