Commit 994a7262 authored by Richard M. Stallman's avatar Richard M. Stallman

Break line before &&, not after.

parent d6debdcd
...@@ -1248,9 +1248,9 @@ See also the function `substitute-in-file-name'. */) ...@@ -1248,9 +1248,9 @@ See also the function `substitute-in-file-name'. */)
} }
else else
#endif /* NO_HYPHENS_IN_FILENAMES */ #endif /* NO_HYPHENS_IN_FILENAMES */
if (lbrack > rbrack && if (lbrack > rbrack
((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') && && ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<')
(p[1] == '.' || p[1] == ']' || p[1] == '>'))) && (p[1] == '.' || p[1] == ']' || p[1] == '>')))
lose = 1; lose = 1;
#ifdef NO_HYPHENS_IN_FILENAMES #ifdef NO_HYPHENS_IN_FILENAMES
else else
...@@ -1619,8 +1619,8 @@ See also the function `substitute-in-file-name'. */) ...@@ -1619,8 +1619,8 @@ See also the function `substitute-in-file-name'. */)
else if (*p == '-' && *o != '.') else if (*p == '-' && *o != '.')
*--p = '.'; *--p = '.';
} }
else if (p[0] == '-' && o[-1] == '.' && else if (p[0] == '-' && o[-1] == '.'
(p[1] == '.' || p[1] == ']' || p[1] == '>')) && (p[1] == '.' || p[1] == ']' || p[1] == '>'))
/* flush .foo.- ; leave - if stopped by '[' or '<' */ /* flush .foo.- ; leave - if stopped by '[' or '<' */
{ {
do do
...@@ -1635,9 +1635,9 @@ See also the function `substitute-in-file-name'. */) ...@@ -1635,9 +1635,9 @@ See also the function `substitute-in-file-name'. */)
else else
{ {
#ifdef NO_HYPHENS_IN_FILENAMES #ifdef NO_HYPHENS_IN_FILENAMES
if (*p == '-' && if (*p == '-'
o[-1] != '[' && o[-1] != '<' && o[-1] != '.' && && o[-1] != '[' && o[-1] != '<' && o[-1] != '.'
p[1] != ']' && p[1] != '>' && p[1] != '.') && p[1] != ']' && p[1] != '>' && p[1] != '.')
*p = '_'; *p = '_';
#endif /* NO_HYPHENS_IN_FILENAMES */ #endif /* NO_HYPHENS_IN_FILENAMES */
*o++ = *p++; *o++ = *p++;
...@@ -1820,9 +1820,9 @@ See also the function `substitute-in-file-name'.") ...@@ -1820,9 +1820,9 @@ See also the function `substitute-in-file-name'.")
} }
else else
#endif /* VMS4_4 */ #endif /* VMS4_4 */
if (lbrack > rbrack && if (lbrack > rbrack
((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') && && ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<')
(p[1] == '.' || p[1] == ']' || p[1] == '>'))) && (p[1] == '.' || p[1] == ']' || p[1] == '>')))
lose = 1; lose = 1;
#ifndef VMS4_4 #ifndef VMS4_4
else else
...@@ -1991,8 +1991,8 @@ See also the function `substitute-in-file-name'.") ...@@ -1991,8 +1991,8 @@ See also the function `substitute-in-file-name'.")
else if (*p == '-' && *o != '.') else if (*p == '-' && *o != '.')
*--p = '.'; *--p = '.';
} }
else if (p[0] == '-' && o[-1] == '.' && else if (p[0] == '-' && o[-1] == '.'
(p[1] == '.' || p[1] == ']' || p[1] == '>')) && (p[1] == '.' || p[1] == ']' || p[1] == '>'))
/* flush .foo.- ; leave - if stopped by '[' or '<' */ /* flush .foo.- ; leave - if stopped by '[' or '<' */
{ {
do do
...@@ -2007,9 +2007,9 @@ See also the function `substitute-in-file-name'.") ...@@ -2007,9 +2007,9 @@ See also the function `substitute-in-file-name'.")
else else
{ {
#ifndef VMS4_4 #ifndef VMS4_4
if (*p == '-' && if (*p == '-'
o[-1] != '[' && o[-1] != '<' && o[-1] != '.' && && o[-1] != '[' && o[-1] != '<' && o[-1] != '.'
p[1] != ']' && p[1] != '>' && p[1] != '.') && p[1] != ']' && p[1] != '>' && p[1] != '.')
*p = '_'; *p = '_';
#endif /* VMS4_4 */ #endif /* VMS4_4 */
*o++ = *p++; *o++ = *p++;
...@@ -2029,8 +2029,8 @@ See also the function `substitute-in-file-name'.") ...@@ -2029,8 +2029,8 @@ See also the function `substitute-in-file-name'.")
o = target; o = target;
p++; p++;
} }
else if (p[0] == '/' && p[1] == '.' && else if (p[0] == '/' && p[1] == '.'
(p[2] == '/' || p[2] == 0)) && (p[2] == '/' || p[2] == 0))
p += 2; p += 2;
else if (!strncmp (p, "/..", 3) else if (!strncmp (p, "/..", 3)
/* `/../' is the "superroot" on certain file systems. */ /* `/../' is the "superroot" on certain file systems. */
...@@ -6201,9 +6201,9 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte ...@@ -6201,9 +6201,9 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte
{ {
Lisp_Object tem = XCAR (all); Lisp_Object tem = XCAR (all);
int len; int len;
if (STRINGP (tem) && if (STRINGP (tem)
(len = SBYTES (tem), len > 0) && && (len = SBYTES (tem), len > 0)
IS_DIRECTORY_SEP (SREF (tem, len-1))) && IS_DIRECTORY_SEP (SREF (tem, len-1)))
comp = Fcons (tem, comp); comp = Fcons (tem, comp);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment