Mercurial > hg > xemacs-beta
diff src/editfns.c @ 400:a86b2b5e0111 r21-2-30
Import from CVS: tag r21-2-30
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:14:34 +0200 |
| parents | 74fd4e045ea6 |
| children | 2f8bb876ab1d |
line wrap: on
line diff
--- a/src/editfns.c Mon Aug 13 11:13:33 2007 +0200 +++ b/src/editfns.c Mon Aug 13 11:14:34 2007 +0200 @@ -779,10 +779,10 @@ /* #### - Stig sez: this should return nil instead of "unknown" when pw==0 */ /* Ben sez: bad idea because it's likely to break something */ #ifndef AMPERSAND_FULL_NAME - p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */ + p = pw ? USER_FULL_NAME : "unknown"; /* don't gettext */ q = strchr (p, ','); #else - p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */ + p = pw ? USER_FULL_NAME : "unknown"; /* don't gettext */ q = strchr (p, ','); #endif tem = ((!NILP (user) && !pw) @@ -855,12 +855,12 @@ */ if (initial_directory[0] != '\0') { - cached_home_directory = initial_directory; + cached_home_directory = (Extbyte*) initial_directory; } else { /* This will probably give the wrong value */ - cached_home_directory = getcwd (NULL, 0); + cached_home_directory = (Extbyte*) getcwd (NULL, 0); } # else /*