comparison 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
comparison
equal deleted inserted replaced
399:376370fb5946 400:a86b2b5e0111
777 } 777 }
778 778
779 /* #### - Stig sez: this should return nil instead of "unknown" when pw==0 */ 779 /* #### - Stig sez: this should return nil instead of "unknown" when pw==0 */
780 /* Ben sez: bad idea because it's likely to break something */ 780 /* Ben sez: bad idea because it's likely to break something */
781 #ifndef AMPERSAND_FULL_NAME 781 #ifndef AMPERSAND_FULL_NAME
782 p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */ 782 p = pw ? USER_FULL_NAME : "unknown"; /* don't gettext */
783 q = strchr (p, ','); 783 q = strchr (p, ',');
784 #else 784 #else
785 p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */ 785 p = pw ? USER_FULL_NAME : "unknown"; /* don't gettext */
786 q = strchr (p, ','); 786 q = strchr (p, ',');
787 #endif 787 #endif
788 tem = ((!NILP (user) && !pw) 788 tem = ((!NILP (user) && !pw)
789 ? Qnil 789 ? Qnil
790 : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)), 790 : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
853 * This preserves the existing XEmacs behavior, but is different 853 * This preserves the existing XEmacs behavior, but is different
854 * from NT Emacs. 854 * from NT Emacs.
855 */ 855 */
856 if (initial_directory[0] != '\0') 856 if (initial_directory[0] != '\0')
857 { 857 {
858 cached_home_directory = initial_directory; 858 cached_home_directory = (Extbyte*) initial_directory;
859 } 859 }
860 else 860 else
861 { 861 {
862 /* This will probably give the wrong value */ 862 /* This will probably give the wrong value */
863 cached_home_directory = getcwd (NULL, 0); 863 cached_home_directory = (Extbyte*) getcwd (NULL, 0);
864 } 864 }
865 # else 865 # else
866 /* 866 /*
867 * This is NT Emacs behavior 867 * This is NT Emacs behavior
868 */ 868 */