Mercurial > emacs
changeset 55150:f78c7b75f616
lread.c (init_lread): Fixing typo HAVE_CARBON test logic
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Mon, 26 Apr 2004 18:44:22 +0000 |
| parents | d5f4f3846c40 |
| children | b702b580608d |
| files | src/ChangeLog src/lread.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Apr 26 11:12:27 2004 +0000 +++ b/src/ChangeLog Mon Apr 26 18:44:22 2004 +0000 @@ -1,3 +1,7 @@ +2004-04-26 Steven Tamm <tamm@Steven-Tamms-Computer.local> + + * lread.c (init_lread): Fixing typo HAVE_CARBON test logic + 2004-04-26 Miles Bader <miles@gnu.org> * lisp.h (CYCLE_CHECK): Macro moved from xfaces.c.
--- a/src/lread.c Mon Apr 26 11:12:27 2004 +0000 +++ b/src/lread.c Mon Apr 26 18:44:22 2004 +0000 @@ -3676,7 +3676,7 @@ } #endif -#if (!(defined(WINDOWSNT) && (defined(HAVE_CARBON)) )) +#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)))) /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is almost never correct, thereby causing a warning to be printed out that confuses users. Since PATH_LOADSEARCH is always overridden by the @@ -3706,7 +3706,7 @@ } } } -#endif /* WINDOWSNT && HAVE_CARBON*/ +#endif /* !(WINDOWSNT || HAVE_CARBON) */ /* If the EMACSLOADPATH environment variable is set, use its value. This doesn't apply if we're dumping. */