/[emacs]/emacs/src/lread.c
ViewVC logotype

Diff of /emacs/src/lread.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.317.2.2 by handa, Fri Apr 16 12:50:48 2004 UTC revision 1.317.2.3 by miles, Mon Jun 28 07:29:21 2004 UTC
# Line 2122  read1 (readcharfun, pch, first_in_list) Line 2122  read1 (readcharfun, pch, first_in_list)
2122            if (c == '"')            if (c == '"')
2123              {              {
2124                Lisp_Object tmp, val;                Lisp_Object tmp, val;
2125                int size_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1)                int size_in_chars
2126                                     / BITS_PER_CHAR);                  = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1)
2127                       / BOOL_VECTOR_BITS_PER_CHAR);
2128    
2129                UNREAD (c);                UNREAD (c);
2130                tmp = read1 (readcharfun, pch, first_in_list);                tmp = read1 (readcharfun, pch, first_in_list);
# Line 2134  read1 (readcharfun, pch, first_in_list) Line 2135  read1 (readcharfun, pch, first_in_list)
2135                           Accept such input in case it came from an old                           Accept such input in case it came from an old
2136                           version.  */                           version.  */
2137                        && ! (XFASTINT (length)                        && ! (XFASTINT (length)
2138                              == (SCHARS (tmp) - 1) * BITS_PER_CHAR)))                              == (SCHARS (tmp) - 1) * BOOL_VECTOR_BITS_PER_CHAR)))
2139                  Fsignal (Qinvalid_read_syntax,                  Fsignal (Qinvalid_read_syntax,
2140                           Fcons (make_string ("#&...", 5), Qnil));                           Fcons (make_string ("#&...", 5), Qnil));
2141    
# Line 2142  read1 (readcharfun, pch, first_in_list) Line 2143  read1 (readcharfun, pch, first_in_list)
2143                bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data,                bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data,
2144                       size_in_chars);                       size_in_chars);
2145                /* Clear the extraneous bits in the last byte.  */                /* Clear the extraneous bits in the last byte.  */
2146                if (XINT (length) != size_in_chars * BITS_PER_CHAR)                if (XINT (length) != size_in_chars * BOOL_VECTOR_BITS_PER_CHAR)
2147                  XBOOL_VECTOR (val)->data[size_in_chars - 1]                  XBOOL_VECTOR (val)->data[size_in_chars - 1]
2148                    &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1;                    &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
2149                return val;                return val;
2150              }              }
2151            Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5),            Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5),
# Line 3814  init_lread () Line 3815  init_lread ()
3815      }      }
3816  #endif  #endif
3817    
3818  #ifndef WINDOWSNT  #if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON))))
3819    /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is    /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
3820       almost never correct, thereby causing a warning to be printed out that       almost never correct, thereby causing a warning to be printed out that
3821       confuses users.  Since PATH_LOADSEARCH is always overridden by the       confuses users.  Since PATH_LOADSEARCH is always overridden by the
3822       EMACSLOADPATH environment variable below, disable the warning on NT.  */       EMACSLOADPATH environment variable below, disable the warning on NT.  
3823         Also, when using the "self-contained" option for Carbon Emacs for MacOSX,
3824         the "standard" paths may not exist and would be overridden by
3825         EMACSLOADPATH as on NT.  Since this depends on how the executable
3826         was build and packaged, turn off the warnings in general */
3827    
3828    /* Warn if dirs in the *standard* path don't exist.  */    /* Warn if dirs in the *standard* path don't exist.  */
3829    if (!turn_off_warning)    if (!turn_off_warning)
# Line 3840  init_lread () Line 3845  init_lread ()
3845              }              }
3846          }          }
3847      }      }
3848  #endif /* WINDOWSNT */  #endif /* !(WINDOWSNT || HAVE_CARBON) */
3849    
3850    /* If the EMACSLOADPATH environment variable is set, use its value.    /* If the EMACSLOADPATH environment variable is set, use its value.
3851       This doesn't apply if we're dumping.  */       This doesn't apply if we're dumping.  */

Legend:
Removed from v.1.317.2.2  
changed lines
  Added in v.1.317.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26