comparison src/doc.c @ 112434:9de5a68b57e1

Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 18:56:06 -0800
parents 42e22c4f06b7
children
comparison
equal deleted inserted replaced
112433:7b649f6eac4f 112434:9de5a68b57e1
124 strcpy (name, SDATA (Vdoc_directory)); 124 strcpy (name, SDATA (Vdoc_directory));
125 strcat (name, SDATA (file)); 125 strcat (name, SDATA (file));
126 } 126 }
127 else 127 else
128 { 128 {
129 name = (char *) SDATA (file); 129 name = SSDATA (file);
130 } 130 }
131 131
132 fd = emacs_open (name, O_RDONLY, 0); 132 fd = emacs_open (name, O_RDONLY, 0);
133 if (fd < 0) 133 if (fd < 0)
134 { 134 {
889 bufp = buf + offset; 889 bufp = buf + offset;
890 memcpy (bufp, start, length_byte); 890 memcpy (bufp, start, length_byte);
891 bufp += length_byte; 891 bufp += length_byte;
892 nchars += length; 892 nchars += length;
893 /* Check STRING again in case gc relocated it. */ 893 /* Check STRING again in case gc relocated it. */
894 strp = (unsigned char *) SDATA (string) + idx; 894 strp = SDATA (string) + idx;
895 } 895 }
896 } 896 }
897 else if (! multibyte) /* just copy other chars */ 897 else if (! multibyte) /* just copy other chars */
898 *bufp++ = *strp++, nchars++; 898 *bufp++ = *strp++, nchars++;
899 else 899 else
936 defsubr (&Sdocumentation); 936 defsubr (&Sdocumentation);
937 defsubr (&Sdocumentation_property); 937 defsubr (&Sdocumentation_property);
938 defsubr (&Ssnarf_documentation); 938 defsubr (&Ssnarf_documentation);
939 defsubr (&Ssubstitute_command_keys); 939 defsubr (&Ssubstitute_command_keys);
940 } 940 }
941