Mercurial > hg > xemacs-beta
diff src/doc.c @ 185:3d6bfa290dbd r20-3b19
Import from CVS: tag r20-3b19
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:55:28 +0200 |
parents | e121b013d1f0 |
children | 489f57a838ef |
line wrap: on
line diff
--- a/src/doc.c Mon Aug 13 09:54:24 2007 +0200 +++ b/src/doc.c Mon Aug 13 09:55:28 2007 +0200 @@ -92,7 +92,7 @@ nread = read (fd, p, space_left); if (nread < 0) { - return_me = list1 (build_string + return_me = list1 (build_string ("Read error on documentation file")); goto done; } @@ -121,7 +121,7 @@ else { int c = *(++from); - + from++; switch (c) { @@ -190,7 +190,7 @@ if (!STRINGP (file)) return Qnil; - + /* Put the file name in NAME as a C string. If it is relative, combine it with Vdoc_directory. */ @@ -381,7 +381,7 @@ else doc = Fdgettext (domain, doc); } -#endif +#endif if (NILP (raw) && STRINGP (doc)) doc = Fsubstitute_command_keys (doc); return doc; @@ -430,7 +430,7 @@ strcpy (name, "../lib-src/"); #else /* CANNOT_DUMP */ CHECK_STRING (Vdoc_directory); - name = (char *) alloca (XSTRING_LENGTH (filename) + name = (char *) alloca (XSTRING_LENGTH (filename) + XSTRING_LENGTH (Vdoc_directory) + 1); strcpy (name, (char *) XSTRING_DATA (Vdoc_directory)); @@ -481,7 +481,7 @@ goto weird; } Fput (sym, Qvariable_documentation, - ((end[1] == '*') + ((end[1] == '*') ? make_int (- XINT (offset)) : offset)); } @@ -669,7 +669,7 @@ doc = -1; tem = Fcdr (Fcdr (fun)); if (CONSP (tem) && - INTP (XCAR (tem))) + INTP (XCAR (tem))) doc = XINT (XCAR (tem)); } } @@ -728,7 +728,7 @@ Substitute key descriptions for command names in STRING. Return a new string which is STRING with substrings of the form \\=\\[COMMAND] replaced by either: a keystroke sequence that will invoke COMMAND, -or \"M-x COMMAND\" if COMMAND is not on any keys. +or "M-x COMMAND" if COMMAND is not on any keys. Substrings of the form \\=\\{MAPVAR} are replaced by summaries \(made by describe-bindings) of the value of MAPVAR, taken as a keymap. Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR @@ -794,7 +794,7 @@ for (idx = 0; idx < strlength; ) { Bufbyte *strp = strdata + idx; - + if (strp[0] != '\\') { /* just copy other chars */ @@ -834,9 +834,9 @@ while ((idx < strlength) && *strp != ']') - { - strp++; - idx++; + { + strp++; + idx++; } length = strp - start; idx++; /* skip ] */ @@ -885,9 +885,9 @@ while ((idx < strlength) && *strp != '}' && *strp != '>') - { - strp++; - idx++; + { + strp++; + idx++; } length = strp - start; idx++; /* skip } or > */