aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2006-11-21 01:34:30 +0000
committerRichard M. Stallman2006-11-21 01:34:30 +0000
commit994a72627ca3a63532fbb6ac50efc38d92bec508 (patch)
tree05c65ed95ae9479a0ad8c609870a0a52bd362d9b /src
parentd6debdcd4b050f12ccda943e188036bcc920237b (diff)
downloademacs-994a72627ca3a63532fbb6ac50efc38d92bec508.tar.gz
emacs-994a72627ca3a63532fbb6ac50efc38d92bec508.zip
Break line before &&, not after.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 37afd37ad46..d63828ba974 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1248,9 +1248,9 @@ See also the function `substitute-in-file-name'. */)
1248 } 1248 }
1249 else 1249 else
1250#endif /* NO_HYPHENS_IN_FILENAMES */ 1250#endif /* NO_HYPHENS_IN_FILENAMES */
1251 if (lbrack > rbrack && 1251 if (lbrack > rbrack
1252 ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') && 1252 && ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<')
1253 (p[1] == '.' || p[1] == ']' || p[1] == '>'))) 1253 && (p[1] == '.' || p[1] == ']' || p[1] == '>')))
1254 lose = 1; 1254 lose = 1;
1255#ifdef NO_HYPHENS_IN_FILENAMES 1255#ifdef NO_HYPHENS_IN_FILENAMES
1256 else 1256 else
@@ -1619,8 +1619,8 @@ See also the function `substitute-in-file-name'. */)
1619 else if (*p == '-' && *o != '.') 1619 else if (*p == '-' && *o != '.')
1620 *--p = '.'; 1620 *--p = '.';
1621 } 1621 }
1622 else if (p[0] == '-' && o[-1] == '.' && 1622 else if (p[0] == '-' && o[-1] == '.'
1623 (p[1] == '.' || p[1] == ']' || p[1] == '>')) 1623 && (p[1] == '.' || p[1] == ']' || p[1] == '>'))
1624 /* flush .foo.- ; leave - if stopped by '[' or '<' */ 1624 /* flush .foo.- ; leave - if stopped by '[' or '<' */
1625 { 1625 {
1626 do 1626 do
@@ -1635,9 +1635,9 @@ See also the function `substitute-in-file-name'. */)
1635 else 1635 else
1636 { 1636 {
1637#ifdef NO_HYPHENS_IN_FILENAMES 1637#ifdef NO_HYPHENS_IN_FILENAMES
1638 if (*p == '-' && 1638 if (*p == '-'
1639 o[-1] != '[' && o[-1] != '<' && o[-1] != '.' && 1639 && o[-1] != '[' && o[-1] != '<' && o[-1] != '.'
1640 p[1] != ']' && p[1] != '>' && p[1] != '.') 1640 && p[1] != ']' && p[1] != '>' && p[1] != '.')
1641 *p = '_'; 1641 *p = '_';
1642#endif /* NO_HYPHENS_IN_FILENAMES */ 1642#endif /* NO_HYPHENS_IN_FILENAMES */
1643 *o++ = *p++; 1643 *o++ = *p++;
@@ -1820,9 +1820,9 @@ See also the function `substitute-in-file-name'.")
1820 } 1820 }
1821 else 1821 else
1822#endif /* VMS4_4 */ 1822#endif /* VMS4_4 */
1823 if (lbrack > rbrack && 1823 if (lbrack > rbrack
1824 ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') && 1824 && ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<')
1825 (p[1] == '.' || p[1] == ']' || p[1] == '>'))) 1825 && (p[1] == '.' || p[1] == ']' || p[1] == '>')))
1826 lose = 1; 1826 lose = 1;
1827#ifndef VMS4_4 1827#ifndef VMS4_4
1828 else 1828 else
@@ -1991,8 +1991,8 @@ See also the function `substitute-in-file-name'.")
1991 else if (*p == '-' && *o != '.') 1991 else if (*p == '-' && *o != '.')
1992 *--p = '.'; 1992 *--p = '.';
1993 } 1993 }
1994 else if (p[0] == '-' && o[-1] == '.' && 1994 else if (p[0] == '-' && o[-1] == '.'
1995 (p[1] == '.' || p[1] == ']' || p[1] == '>')) 1995 && (p[1] == '.' || p[1] == ']' || p[1] == '>'))
1996 /* flush .foo.- ; leave - if stopped by '[' or '<' */ 1996 /* flush .foo.- ; leave - if stopped by '[' or '<' */
1997 { 1997 {
1998 do 1998 do
@@ -2007,9 +2007,9 @@ See also the function `substitute-in-file-name'.")
2007 else 2007 else
2008 { 2008 {
2009#ifndef VMS4_4 2009#ifndef VMS4_4
2010 if (*p == '-' && 2010 if (*p == '-'
2011 o[-1] != '[' && o[-1] != '<' && o[-1] != '.' && 2011 && o[-1] != '[' && o[-1] != '<' && o[-1] != '.'
2012 p[1] != ']' && p[1] != '>' && p[1] != '.') 2012 && p[1] != ']' && p[1] != '>' && p[1] != '.')
2013 *p = '_'; 2013 *p = '_';
2014#endif /* VMS4_4 */ 2014#endif /* VMS4_4 */
2015 *o++ = *p++; 2015 *o++ = *p++;
@@ -2029,8 +2029,8 @@ See also the function `substitute-in-file-name'.")
2029 o = target; 2029 o = target;
2030 p++; 2030 p++;
2031 } 2031 }
2032 else if (p[0] == '/' && p[1] == '.' && 2032 else if (p[0] == '/' && p[1] == '.'
2033 (p[2] == '/' || p[2] == 0)) 2033 && (p[2] == '/' || p[2] == 0))
2034 p += 2; 2034 p += 2;
2035 else if (!strncmp (p, "/..", 3) 2035 else if (!strncmp (p, "/..", 3)
2036 /* `/../' is the "superroot" on certain file systems. */ 2036 /* `/../' 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 { 6201 {
6202 Lisp_Object tem = XCAR (all); 6202 Lisp_Object tem = XCAR (all);
6203 int len; 6203 int len;
6204 if (STRINGP (tem) && 6204 if (STRINGP (tem)
6205 (len = SBYTES (tem), len > 0) && 6205 && (len = SBYTES (tem), len > 0)
6206 IS_DIRECTORY_SEP (SREF (tem, len-1))) 6206 && IS_DIRECTORY_SEP (SREF (tem, len-1)))
6207 comp = Fcons (tem, comp); 6207 comp = Fcons (tem, comp);
6208 } 6208 }
6209 } 6209 }