[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105689: Whitespace changes.
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105689: Whitespace changes. |
|
Date: |
Fri, 09 Sep 2011 03:06:52 +0200 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105689
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-09 03:06:52 +0200
message:
Whitespace changes.
modified:
lib-src/ebrowse.c
lib-src/etags.c
lib-src/hexl.c
lib-src/movemail.c
lib-src/pop.c
lisp/ChangeLog
nt/config.nt
src/ChangeLog
src/alloc.c
src/callproc.c
src/casefiddle.c
src/ccl.c
src/dbusbind.c
src/dired.c
src/dispextern.h
src/dispnew.c
src/doprnt.c
src/dosfns.c
src/editfns.c
src/emacs.c
src/emacsgtkfixed.c
src/eval.c
src/fileio.c
src/filelock.c
src/floatfns.c
src/fns.c
src/font.c
src/frame.c
src/fringe.c
src/getpagesize.h
src/gmalloc.c
src/gtkutil.c
src/image.c
src/insdel.c
src/keyboard.c
src/lisp.h
src/lread.c
src/m/alpha.h
src/menu.c
src/msdos.c
src/nsgui.h
src/nsterm.h
src/print.c
src/process.c
src/ralloc.c
src/regex.c
src/s/gnu-linux.h
src/s/gnu.h
src/sound.c
src/sysdep.c
src/termcap.c
src/termchar.h
src/unexaix.c
src/unexelf.c
src/unexmacosx.c
src/unexw32.c
src/vm-limit.c
src/w16select.c
src/w32.c
src/w32term.h
src/widget.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xmenu.c
src/xrdb.c
src/xselect.c
src/xsettings.c
src/xterm.c
src/xterm.h
=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2011-07-07 01:32:56 +0000
+++ b/lib-src/ebrowse.c 2011-09-09 01:06:52 +0000
@@ -45,16 +45,16 @@
/* The character used as a separator in path lists (like $PATH). */
-#if defined(__MSDOS__)
+#if defined (__MSDOS__)
#define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y) (strcasecmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y) (strcasecmp (X,Y) == 0)
#else
-#if defined(WINDOWSNT)
+#if defined (WINDOWSNT)
#define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y) (stricmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y) (stricmp (X,Y) == 0)
#else
#define PATH_LIST_SEPARATOR ':'
-#define FILENAME_EQ(X,Y) (streq(X,Y))
+#define FILENAME_EQ(X,Y) (streq (X,Y))
#endif
#endif
/* The default output file name. */
@@ -2511,7 +2511,7 @@
/* A function or class may follow. */
case TEMPLATE:
- MATCH();
+ MATCH ();
SET_FLAG (flags, F_TEMPLATE);
/* Skip over template argument list */
SKIP_MATCHING_IF ('<');
@@ -2930,7 +2930,7 @@
}
while (enter--)
- leave_namespace();
+ leave_namespace ();
return cls;
}
=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c 2011-09-07 07:28:05 +0000
+++ b/lib-src/etags.c 2011-09-09 01:06:52 +0000
@@ -103,7 +103,7 @@
# define PTR void *
# endif
#else /* no config.h */
-# if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C))
+# if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C))
# define PTR void * /* for generic pointers */
# else /* not standard C */
# define const /* remove const for old compilers' sake */
@@ -202,25 +202,25 @@
# define CTAGS FALSE
#endif
-#define streq(s,t) (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t))
-#define strcaseeq(s,t) (assert((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s,
t))
-#define strneq(s,t,n) (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
-#define strncaseeq(s,t,n) (assert((s)!=NULL && (t)!=NULL), !etags_strncasecmp
(s, t, n))
+#define streq(s,t) (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t))
+#define strcaseeq(s,t) (assert ((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s,
t))
+#define strneq(s,t,n) (assert ((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
+#define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !etags_strncasecmp
(s, t, n))
#define CHARS 256 /* 2^sizeof(char) */
#define CHAR(x) ((unsigned int)(x) & (CHARS - 1))
-#define iswhite(c) (_wht[CHAR(c)]) /* c is white (see white) */
-#define notinname(c) (_nin[CHAR(c)]) /* c is not in a name (see nonam) */
-#define begtoken(c) (_btk[CHAR(c)]) /* c can start token (see
begtk) */
-#define intoken(c) (_itk[CHAR(c)]) /* c can be in token (see
midtk) */
-#define endtoken(c) (_etk[CHAR(c)]) /* c ends tokens (see endtk) */
-
-#define ISALNUM(c) isalnum (CHAR(c))
-#define ISALPHA(c) isalpha (CHAR(c))
-#define ISDIGIT(c) isdigit (CHAR(c))
-#define ISLOWER(c) islower (CHAR(c))
-
-#define lowcase(c) tolower (CHAR(c))
+#define iswhite(c) (_wht[CHAR (c)]) /* c is white (see white) */
+#define notinname(c) (_nin[CHAR (c)]) /* c is not in a name (see nonam) */
+#define begtoken(c) (_btk[CHAR (c)]) /* c can start token (see
begtk) */
+#define intoken(c) (_itk[CHAR (c)]) /* c can be in token (see
midtk) */
+#define endtoken(c) (_etk[CHAR (c)]) /* c ends tokens (see endtk) */
+
+#define ISALNUM(c) isalnum (CHAR (c))
+#define ISALPHA(c) isalpha (CHAR (c))
+#define ISDIGIT(c) isdigit (CHAR (c))
+#define ISLOWER(c) islower (CHAR (c))
+
+#define lowcase(c) tolower (CHAR (c))
/*
@@ -1725,16 +1725,16 @@
register int i;
for (i = 0; i < CHARS; i++)
- iswhite(i) = notinname(i) = begtoken(i) = intoken(i) = endtoken(i) = FALSE;
+ iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i) =
FALSE;
for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE;
for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE;
- notinname('\0') = notinname('\n');
+ notinname ('\0') = notinname ('\n');
for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE;
- begtoken('\0') = begtoken('\n');
+ begtoken ('\0') = begtoken ('\n');
for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE;
- intoken('\0') = intoken('\n');
+ intoken ('\0') = intoken ('\n');
for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE;
- endtoken('\0') = endtoken('\n');
+ endtoken ('\0') = endtoken ('\n');
}
/*
@@ -3959,16 +3959,16 @@
)
#define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \
- ((assert("" kw), TRUE) /* syntax error if not a literal string */ \
- && strneq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \
- && notinname ((cp)[sizeof(kw)-1]) /* end of kw */ \
- && ((cp) = skip_spaces((cp)+sizeof(kw)-1))) /* skip spaces */
+ ((assert ("" kw), TRUE) /* syntax error if not a literal string */ \
+ && strneq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \
+ && notinname ((cp)[sizeof (kw)-1]) /* end of kw */ \
+ && ((cp) = skip_spaces ((cp)+sizeof (kw)-1))) /* skip spaces */
/* Similar to LOOKING_AT but does not use notinname, does not skip */
#define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */
\
- ((assert("" kw), TRUE) /* syntax error if not a literal string */
\
- && strncaseeq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \
- && ((cp) += sizeof(kw)-1)) /* skip spaces */
+ ((assert ("" kw), TRUE) /* syntax error if not a literal string */ \
+ && strncaseeq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \
+ && ((cp) += sizeof (kw)-1)) /* skip spaces */
/*
* Read a file, but do no processing. This is used to do regexp
@@ -4141,7 +4141,7 @@
readline (&lb, inf);
dbp = lb.buffer;
}
- switch (lowcase(*dbp))
+ switch (lowcase (*dbp))
{
case 'b':
if (nocase_tail ("body"))
@@ -4245,7 +4245,7 @@
}
/* We are at the beginning of a token. */
- switch (lowcase(*dbp))
+ switch (lowcase (*dbp))
{
case 'f':
if (!packages_only && nocase_tail ("function"))
@@ -4371,7 +4371,7 @@
*cp = '\0';
name = concat (package, "::", sp);
*cp = savechar;
- make_tag (name, strlen(name), TRUE,
+ make_tag (name, strlen (name), TRUE,
lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
free (name);
}
@@ -4466,9 +4466,9 @@
}
else if (LOOKING_AT (cp, "function"))
{
- if(*cp == '&')
+ if (*cp == '&')
cp = skip_spaces (cp+1);
- if(*cp != '\0')
+ if (*cp != '\0')
{
name = cp;
while (!notinname (*cp))
@@ -4509,7 +4509,7 @@
&& *cp == '$')
{
name = cp;
- while (!notinname(*cp))
+ while (!notinname (*cp))
cp++;
make_tag (name, cp - name, FALSE,
lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
@@ -4890,13 +4890,13 @@
LOOP_ON_INPUT_LINES (inf, lb, bp)
while ((bp = skip_spaces (bp))[0] != '\0')
- if (bp[0] == '\\' && iswhite(bp[1]))
+ if (bp[0] == '\\' && iswhite (bp[1]))
break; /* read next line */
- else if (bp[0] == '(' && iswhite(bp[1]))
+ else if (bp[0] == '(' && iswhite (bp[1]))
do /* skip to ) or eol */
bp++;
while (*bp != ')' && *bp != '\0');
- else if ((bp[0] == ':' && iswhite(bp[1]) && bp++)
+ else if ((bp[0] == ':' && iswhite (bp[1]) && bp++)
|| LOOKING_AT_NOCASE (bp, "constant")
|| LOOKING_AT_NOCASE (bp, "code")
|| LOOKING_AT_NOCASE (bp, "create")
@@ -5285,7 +5285,7 @@
/* Predicate or rule. Store the function name so that we
only generate a tag for the first clause. */
if (last == NULL)
- last = xnew(len + 1, char);
+ last = xnew (len + 1, char);
else if (len + 1 > allocated)
xrnew (last, len + 1, char);
allocated = len + 1;
@@ -5309,7 +5309,7 @@
return;
readline (plb, inf);
}
- while (!feof(inf));
+ while (!feof (inf));
}
/*
@@ -5368,11 +5368,11 @@
origpos = pos;
- if (ISLOWER(s[pos]) || (s[pos] == '_'))
+ if (ISLOWER (s[pos]) || (s[pos] == '_'))
{
/* The atom is unquoted. */
pos++;
- while (ISALNUM(s[pos]) || (s[pos] == '_'))
+ while (ISALNUM (s[pos]) || (s[pos] == '_'))
{
pos++;
}
@@ -5715,7 +5715,7 @@
single_line = FALSE; /* dot does not match newline */
- if (strlen(regexp_pattern) < 3)
+ if (strlen (regexp_pattern) < 3)
{
error ("null regexp", (char *)NULL);
return;
@@ -6626,7 +6626,7 @@
{
return (fn[0] == '/'
#ifdef DOS_NT
- || (ISALPHA(fn[0]) && fn[1] == ':' && fn[2] == '/')
+ || (ISALPHA (fn[0]) && fn[1] == ':' && fn[2] == '/')
#endif
);
}
@@ -6641,7 +6641,7 @@
#ifdef DOS_NT
/* Canonicalize drive letter case. */
-# define ISUPPER(c) isupper (CHAR(c))
+# define ISUPPER(c) isupper (CHAR (c))
if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0]))
fn[0] = lowcase (fn[0]);
=== modified file 'lib-src/hexl.c'
--- a/lib-src/hexl.c 2011-01-25 04:08:28 +0000
+++ b/lib-src/hexl.c 2011-09-09 01:06:52 +0000
@@ -48,7 +48,7 @@
int group_by = DEFAULT_GROUPING;
char *progname;
-void usage(void) NO_RETURN;
+void usage (void) NO_RETURN;
int
main (int argc, char **argv)
=== modified file 'lib-src/movemail.c'
--- a/lib-src/movemail.c 2011-08-28 23:57:19 +0000
+++ b/lib-src/movemail.c 2011-09-09 01:06:52 +0000
@@ -183,8 +183,8 @@
# define ARGSTR "p"
#endif /* MAIL_USE_POP */
- uid_t real_gid = getgid();
- uid_t priv_gid = getegid();
+ uid_t real_gid = getgid ();
+ uid_t priv_gid = getegid ();
#ifdef WINDOWSNT
/* Ensure all file i/o is in binary mode. */
=== modified file 'lib-src/pop.c'
--- a/lib-src/pop.c 2011-07-07 01:32:56 +0000
+++ b/lib-src/pop.c 2011-09-09 01:06:52 +0000
@@ -34,15 +34,15 @@
#include "ntlib.h"
#include <winsock.h>
#undef SOCKET_ERROR
-#define RECV(s,buf,len,flags) recv(s,buf,len,flags)
-#define SEND(s,buf,len,flags) send(s,buf,len,flags)
-#define CLOSESOCKET(s) closesocket(s)
+#define RECV(s,buf,len,flags) recv (s,buf,len,flags)
+#define SEND(s,buf,len,flags) send (s,buf,len,flags)
+#define CLOSESOCKET(s) closesocket (s)
#else
#include <netinet/in.h>
#include <sys/socket.h>
-#define RECV(s,buf,len,flags) read(s,buf,len)
-#define SEND(s,buf,len,flags) write(s,buf,len)
-#define CLOSESOCKET(s) close(s)
+#define RECV(s,buf,len,flags) read (s,buf,len)
+#define SEND(s,buf,len,flags) write (s,buf,len)
+#define CLOSESOCKET(s) close (s)
#endif
#include <pop.h>
@@ -101,7 +101,7 @@
#endif /* KERBEROS */
#ifndef WINDOWSNT
-#if !defined(HAVE_H_ERRNO) || !defined(HAVE_CONFIG_H)
+#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H)
extern int h_errno;
#endif
#endif
@@ -1067,7 +1067,7 @@
}
#ifdef HAVE_GETADDRINFO
- memset (&hints, 0, sizeof(hints));
+ memset (&hints, 0, sizeof (hints));
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_CANONNAME;
hints.ai_family = AF_INET;
@@ -1159,7 +1159,7 @@
krb5_free_context (kcontext);
strcpy (pop_error, KRB_ERROR);
strncat (pop_error, error_message (rem),
- ERROR_MAX - sizeof(KRB_ERROR));
+ ERROR_MAX - sizeof (KRB_ERROR));
CLOSESOCKET (sock);
return (-1);
}
@@ -1212,7 +1212,7 @@
ERROR_MAX - strlen (pop_error) - 1);
}
#elif defined HAVE_KRB5_ERROR_E_TEXT
- if (err_ret && err_ret->e_text && strlen(*err_ret->e_text))
+ if (err_ret && err_ret->e_text && strlen (*err_ret->e_text))
{
strncat (pop_error, " [server says '",
ERROR_MAX - strlen (pop_error) - 1);
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-09-08 15:45:20 +0000
+++ b/lisp/ChangeLog 2011-09-09 01:06:52 +0000
@@ -17,11 +17,11 @@
* window.el (frame-auto-delete): Rename to window-auto-delete.
Make it control auto-deletion of windows and/or frames.
(window-deletable-p): New argument FORCE. Rewrite conditions
- for deleting window/frame. (Bug#9419)
+ for deleting window/frame. (Bug#9419)
(switch-to-prev-buffer, replace-buffer-in-windows, quit-window):
Rewrite handling of case when window/frame can be deleted.
(delete-windows-on): Call window-deletable-p with new FORCE
- argument t. (Bug#9456)
+ argument t. (Bug#9456)
2011-09-07 Chong Yidong <address@hidden>
@@ -313,7 +313,7 @@
2011-08-28 Christoph Scholtes <address@hidden>
* help-mode.el (help-mode-map): Add special-mode-map to parent.
- (help-mode): Derive help-mode from special-mode. Don't invoke
+ (help-mode): Derive help-mode from special-mode. Don't invoke
view-mode from help-mode.
(help-xref-override-view-map): Remove.
(help-make-xrefs): Remove minor-mode-overriding-map-alist since
@@ -629,7 +629,7 @@
2011-08-19 Glenn Morris <address@hidden>
* files.el (hack-local-variables-prop-line, hack-local-variables):
- Downcase "Mode:". (Bug#9331)
+ Downcase "Mode:". (Bug#9331)
2011-08-18 Chong Yidong <address@hidden>
@@ -685,7 +685,7 @@
(epa-mail-expand-recipients-2, epa-mail-expand-recipients):
Remove.
-2011-08-16 Feng Li <address@hidden> (tiny change)
+2011-08-16 Feng Li <address@hidden> (tiny change)
* calc/calc-ext.el (math-defintegral-2): Remove nested backquote.
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2011-08-31 22:18:16 +0000
+++ b/nt/config.nt 2011-09-09 01:06:52 +0000
@@ -470,7 +470,7 @@
#define BITS_PER_LONG 32
#endif
-#if defined(__MINGW32__) || _MSC_VER >= 1400
+#if defined (__MINGW32__) || _MSC_VER >= 1400
/* Define to 1 if the system has the type `long long int'. */
# define HAVE_LONG_LONG_INT 1
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-09-08 15:45:20 +0000
+++ b/src/ChangeLog 2011-09-09 01:06:52 +0000
@@ -896,7 +896,7 @@
* nsfns.m (as_script, as_result, as_status): New static variables.
(ns_run_ascript): New function.
- (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined
+ (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined
event with data2 set to NSAPP_DATA2_RUNASSCRIPT, post it and then start
the event loop. Get status from as_status (Bug#7276).
@@ -1072,7 +1072,7 @@
* xdisp.c: Remove one-slot cache of display string positions.
(compute_display_string_pos): Accept an additional argument
- DISP_PROP_P; callers changed. Scan at most 5K characters forward
+ DISP_PROP_P; callers changed. Scan at most 5K characters forward
for a display string or property. If found, set DISP_PROP_P
non-zero.
@@ -2090,7 +2090,7 @@
(Fput_unicode_property_internal): New functions.
(syms_of_chartab): DEFSYM Qchar_code_property_table, defsubr
Sunicode_property_table_internal, Sget_unicode_property_internal,
- and Sput_unicode_property_internal. Defvar_lisp
+ and Sput_unicode_property_internal. Defvar_lisp
char-code-property-alist.
* composite.c (CHAR_COMPOSABLE_P): Adjust for the change of
@@ -2122,7 +2122,7 @@
(store_config_changed_event): Add comment.
(dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
(store_tool_bar_style_changed): New functions.
- (store_monospaced_changed): Add comment. Call dpyinfo_valid.
+ (store_monospaced_changed): Add comment. Call dpyinfo_valid.
(struct xsettings): Move font inside HAVE_XFT.
(GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
(GSETTINGS_MONO_FONT): Rename from SYSTEM_MONO_FONT.
@@ -2131,7 +2131,7 @@
Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
also.
(GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
- (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
+ (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
(something_changed_gconfCB): Rename from something_changedCB.
Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
(parse_settings): Move check for font inside HAVE_XFT.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2011-08-05 02:19:34 +0000
+++ b/src/alloc.c 2011-09-09 01:06:52 +0000
@@ -1880,7 +1880,7 @@
while (s != NULL)
{
if ((uintptr_t) s < 1024)
- abort();
+ abort ();
s = NEXT_FREE_LISP_STRING (s);
}
}
@@ -2531,17 +2531,17 @@
/ (sizeof (struct Lisp_Float) * CHAR_BIT + 1))
#define GETMARKBIT(block,n) \
- (((block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \
- >> ((n) % (sizeof(int) * CHAR_BIT))) \
+ (((block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)] \
+ >> ((n) % (sizeof (int) * CHAR_BIT))) \
& 1)
#define SETMARKBIT(block,n) \
- (block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \
- |= 1 << ((n) % (sizeof(int) * CHAR_BIT))
+ (block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)] \
+ |= 1 << ((n) % (sizeof (int) * CHAR_BIT))
#define UNSETMARKBIT(block,n) \
- (block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \
- &= ~(1 << ((n) % (sizeof(int) * CHAR_BIT)))
+ (block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)] \
+ &= ~(1 << ((n) % (sizeof (int) * CHAR_BIT)))
#define FLOAT_BLOCK(fptr) \
((struct float_block *) (((uintptr_t) (fptr)) & ~(BLOCK_ALIGN - 1)))
@@ -2553,7 +2553,7 @@
{
/* Place `floats' at the beginning, to ease up FLOAT_INDEX's job. */
struct Lisp_Float floats[FLOAT_BLOCK_SIZE];
- int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)];
+ int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof (int) * CHAR_BIT)];
struct float_block *next;
};
@@ -2659,7 +2659,7 @@
{
/* Place `conses' at the beginning, to ease up CONS_INDEX's job. */
struct Lisp_Cons conses[CONS_BLOCK_SIZE];
- int gcmarkbits[1 + CONS_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)];
+ int gcmarkbits[1 + CONS_BLOCK_SIZE / (sizeof (int) * CHAR_BIT)];
struct cons_block *next;
};
@@ -2964,7 +2964,7 @@
struct window *
allocate_window (void)
{
- return ALLOCATE_PSEUDOVECTOR(struct window, current_matrix, PVEC_WINDOW);
+ return ALLOCATE_PSEUDOVECTOR (struct window, current_matrix, PVEC_WINDOW);
}
@@ -4159,7 +4159,7 @@
break;
case MEM_TYPE_BUFFER:
- if (live_buffer_p (m, p) && !VECTOR_MARKED_P((struct buffer *)p))
+ if (live_buffer_p (m, p) && !VECTOR_MARKED_P ((struct buffer *)p))
XSETVECTOR (obj, p);
break;
=== modified file 'src/callproc.c'
--- a/src/callproc.c 2011-08-05 02:19:34 +0000
+++ b/src/callproc.c 2011-09-09 01:06:52 +0000
@@ -691,7 +691,7 @@
/* Enable sending signal if user quits below. */
call_process_exited = 0;
-#if defined(MSDOS)
+#if defined (MSDOS)
/* MSDOS needs different cleanup information. */
record_unwind_protect (call_process_cleanup,
Fcons (Fcurrent_buffer (),
@@ -1315,7 +1315,7 @@
if (err != in && err != out)
emacs_close (err);
-#if defined(USG)
+#if defined (USG)
#ifndef SETPGRP_RELEASES_CTTY
setpgrp (); /* No arguments but equivalent in this case */
#endif
=== modified file 'src/casefiddle.c'
--- a/src/casefiddle.c 2011-06-24 21:25:22 +0000
+++ b/src/casefiddle.c 2011-09-09 01:06:52 +0000
@@ -223,7 +223,7 @@
record_change (start, end - start);
start_byte = CHAR_TO_BYTE (start);
- SETUP_BUFFER_SYNTAX_TABLE(); /* For syntax_prefix_flag_p. */
+ SETUP_BUFFER_SYNTAX_TABLE (); /* For syntax_prefix_flag_p. */
while (start < end)
{
@@ -434,9 +434,9 @@
void
keys_of_casefiddle (void)
{
- initial_define_key (control_x_map, Ctl('U'), "upcase-region");
+ initial_define_key (control_x_map, Ctl ('U'), "upcase-region");
Fput (intern ("upcase-region"), Qdisabled, Qt);
- initial_define_key (control_x_map, Ctl('L'), "downcase-region");
+ initial_define_key (control_x_map, Ctl ('L'), "downcase-region");
Fput (intern ("downcase-region"), Qdisabled, Qt);
initial_define_key (meta_map, 'u', "upcase-word");
=== modified file 'src/ccl.c'
--- a/src/ccl.c 2011-08-27 07:07:32 +0000
+++ b/src/ccl.c 2011-09-09 01:06:52 +0000
@@ -61,7 +61,7 @@
/* Return a hash table of id number ID. */
#define GET_HASH_TABLE(id) \
- (XHASH_TABLE (XCDR(XVECTOR(Vtranslation_hash_table_vector)->contents[(id)])))
+ (XHASH_TABLE (XCDR (XVECTOR
(Vtranslation_hash_table_vector)->contents[(id)])))
/* CCL (Code Conversion Language) is a simple language which has
operations on one input buffer, one output buffer, and 7 registers.
@@ -706,7 +706,7 @@
ccl->status = CCL_STAT_SUCCESS; \
goto ccl_finish; \
} \
-while(0)
+while (0)
/* Suspend CCL program because of reading from empty input buffer or
writing to full output buffer. When this program is resumed, the
@@ -730,7 +730,7 @@
ccl->status = CCL_STAT_INVALID_CMD; \
goto ccl_error_handler; \
} \
-while(0)
+while (0)
#else
@@ -741,7 +741,7 @@
ccl->status = CCL_STAT_INVALID_CMD; \
goto ccl_error_handler; \
} \
-while(0)
+while (0)
#endif
@@ -1419,7 +1419,7 @@
else if (INTEGERP (content) && IN_INT_RANGE (XINT
(content)))
{
reg[RRR] = i;
- reg[rrr] = XINT(content);
+ reg[rrr] = XINT (content);
break;
}
else if (EQ (content, Qt) || EQ (content, Qlambda))
@@ -1692,7 +1692,7 @@
value = XCDR (content);
if (!INTEGERP (attrib) || !INTEGERP (value))
continue;
- reg[rrr] = XINT(value);
+ reg[rrr] = XINT (value);
break;
}
else if (SYMBOLP (content))
@@ -1729,8 +1729,8 @@
switch (ccl->status)
{
case CCL_STAT_INVALID_CMD:
- sprintf(msg, "\nCCL: Invalid command %x (ccl_code = %x) at %d.",
- code & 0x1F, code, this_ic);
+ sprintf (msg, "\nCCL: Invalid command %x (ccl_code = %x) at %d.",
+ code & 0x1F, code, this_ic);
#ifdef CCL_DEBUG
{
int i = ccl_backtrace_idx - 1;
@@ -1748,7 +1748,7 @@
if (i < 0) i = CCL_DEBUG_BACKTRACE_LEN - 1;
if (ccl_backtrace_table[i] == 0)
break;
- sprintf(msg, " %d", ccl_backtrace_table[i]);
+ sprintf (msg, " %d", ccl_backtrace_table[i]);
msglen = strlen (msg);
if (dst + msglen > (dst_bytes ? dst_end : src))
break;
@@ -1762,11 +1762,11 @@
case CCL_STAT_QUIT:
if (! ccl->quit_silently)
- sprintf(msg, "\nCCL: Quited.");
+ sprintf (msg, "\nCCL: Quited.");
break;
default:
- sprintf(msg, "\nCCL: Unknown error type (%d)", ccl->status);
+ sprintf (msg, "\nCCL: Unknown error type (%d)", ccl->status);
}
msglen = strlen (msg);
=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c 2011-09-05 09:34:18 +0000
+++ b/src/dbusbind.c 2011-09-09 01:06:52 +0000
@@ -1880,7 +1880,7 @@
busp = CDR_SAFE (busp);
}
- if (NILP(bus))
+ if (NILP (bus))
return;
/* We ignore all Lisp errors during the call. */
=== modified file 'src/dired.c'
--- a/src/dired.c 2011-06-24 21:25:22 +0000
+++ b/src/dired.c 2011-09-09 01:06:52 +0000
@@ -1003,7 +1003,7 @@
values[10] = INTEGER_TO_CONS (s.st_ino);
values[11] = INTEGER_TO_CONS (s.st_dev);
- return Flist (sizeof(values) / sizeof(values[0]), values);
+ return Flist (sizeof (values) / sizeof (values[0]), values);
}
DEFUN ("file-attributes-lessp", Ffile_attributes_lessp,
Sfile_attributes_lessp, 2, 2, 0,
=== modified file 'src/dispextern.h'
--- a/src/dispextern.h 2011-08-30 17:32:44 +0000
+++ b/src/dispextern.h 2011-09-09 01:06:52 +0000
@@ -1283,10 +1283,10 @@
unsigned padding_p : 1;
/* The GC to use for drawing this glyph string. */
-#if defined(HAVE_X_WINDOWS)
+#if defined (HAVE_X_WINDOWS)
GC gc;
#endif
-#if defined(HAVE_NTGUI)
+#if defined (HAVE_NTGUI)
XGCValues *gc;
HDC hdc;
#endif
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2011-09-01 14:44:49 +0000
+++ b/src/dispnew.c 2011-09-09 01:06:52 +0000
@@ -87,7 +87,7 @@
#endif
#endif /* not __GNU_LIBRARY__ */
-#if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
+#if defined (HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
#include <term.h> /* for tgetent */
#endif
@@ -4912,7 +4912,7 @@
/* Char insertion/deletion cost vector, from term.c */
-#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))])
+#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS ((f))])
/* Perform a frame-based update on line VPOS in frame FRAME. */
@@ -5364,7 +5364,7 @@
}
/* Add extra (default width) columns if clicked after EOL. */
- x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x);
+ x1 = max (0, it.current_x + it.pixel_width - it.first_visible_x);
if (x0 > x1)
it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
@@ -6228,7 +6228,7 @@
)
{
Vinitial_window_system = Qns;
- Vwindow_system_version = make_number(10);
+ Vwindow_system_version = make_number (10);
adjust_frame_glyphs_initially ();
return;
}
@@ -6327,7 +6327,7 @@
{
/* For the initial frame, we don't have any way of knowing what
are the foreground and background colors of the terminal. */
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR;
FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR;
=== modified file 'src/doprnt.c'
--- a/src/doprnt.c 2011-09-01 14:44:49 +0000
+++ b/src/doprnt.c 2011-09-09 01:06:52 +0000
@@ -347,7 +347,7 @@
case 'e':
case 'g':
{
- double d = va_arg(ap, double);
+ double d = va_arg (ap, double);
sprintf (sprintf_buffer, fmtcpy, d);
/* Now copy into final output, truncating as necessary. */
string = sprintf_buffer;
@@ -427,7 +427,7 @@
case 'c':
{
- int chr = va_arg(ap, int);
+ int chr = va_arg (ap, int);
tem = CHAR_STRING (chr, (unsigned char *) charbuf);
string = charbuf;
string[tem] = 0;
=== modified file 'src/dosfns.c'
--- a/src/dosfns.c 2011-04-30 10:31:17 +0000
+++ b/src/dosfns.c 2011-09-09 01:06:52 +0000
@@ -343,13 +343,13 @@
{
dpmiregs.x.ax = 0x168e;
dpmiregs.x.dx = 3; /* get VM title */
- dpmiregs.x.cx = sizeof(parent_vm_title) - 1;
+ dpmiregs.x.cx = sizeof (parent_vm_title) - 1;
dpmiregs.x.es = __tb >> 4;
dpmiregs.x.di = __tb & 15;
dpmiregs.x.sp = dpmiregs.x.ss = dpmiregs.x.flags = 0;
_go32_dpmi_simulate_int (0x2f, &dpmiregs);
if (dpmiregs.x.ax == 1)
- dosmemget (__tb, sizeof(parent_vm_title), parent_vm_title);
+ dosmemget (__tb, sizeof (parent_vm_title), parent_vm_title);
}
}
else
@@ -573,7 +573,7 @@
Fsymbol_value (intern ("before-init-time"))),
attrs);
attrs = Fcons (Fcons (Qvsize,
- make_fixnum_or_float ((unsigned long)sbrk(0)/1024)),
+ make_fixnum_or_float ((unsigned long)sbrk
(0)/1024)),
attrs);
attrs = Fcons (Fcons (Qetime, tem), attrs);
#ifndef SYSTEM_MALLOC
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2011-08-29 15:53:21 +0000
+++ b/src/editfns.c 2011-09-09 01:06:52 +0000
@@ -146,7 +146,7 @@
/* If the user name claimed in the environment vars differs from
the real uid, use the claimed name to find the full name. */
tem = Fstring_equal (Vuser_login_name, Vuser_real_login_name);
- Vuser_full_name = Fuser_full_name (NILP (tem)? make_number (geteuid())
+ Vuser_full_name = Fuser_full_name (NILP (tem)? make_number (geteuid ())
: Vuser_login_name);
p = getenv ("NAME");
@@ -3254,7 +3254,7 @@
end = buildmark (ZV, ZV_BYTE);
/* END must move forward if text is inserted at its exact location. */
- XMARKER(end)->insertion_type = 1;
+ XMARKER (end)->insertion_type = 1;
return Fcons (beg, end);
}
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2011-09-08 10:59:22 +0000
+++ b/src/emacs.c 2011-09-09 01:06:52 +0000
@@ -162,7 +162,7 @@
data on the first attempt to change it inside asynchronous code. */
int running_asynch_code;
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
/* If non-zero, -d was specified, meaning we're using some window system. */
int display_arg;
#endif
@@ -808,7 +808,7 @@
{
static char heapexec[] = "EMACS_HEAP_EXEC=true";
/* Set this so we only do this once. */
- putenv(heapexec);
+ putenv (heapexec);
/* A flag to turn off address randomization which is introduced
in linux kernel shipped with fedora core 4 */
@@ -848,7 +848,7 @@
stack allocation routine for new process that the allocation
fails if stack limit is not on page boundary. So, round up the
new limit to page boundary. */
- newlim = (newlim + getpagesize () - 1) / getpagesize () * getpagesize();
+ newlim = (newlim + getpagesize () - 1) / getpagesize () * getpagesize ();
#endif
if (newlim > rlim.rlim_max)
{
@@ -1097,7 +1097,7 @@
|| strlen (dname_arg) < 1 || strlen (dname_arg) > 70)
{
fprintf (stderr, "emacs daemon: daemon name absent or too long\n");
- exit(1);
+ exit (1);
}
dname_arg2[0] = '\0';
sscanf (dname_arg, "\n%d,%d\n%s", &(daemon_pipe[0]), &(daemon_pipe[1]),
@@ -1115,7 +1115,7 @@
fcntl (daemon_pipe[1], F_SETFD, FD_CLOEXEC);
#ifdef HAVE_SETSID
- setsid();
+ setsid ();
#endif
#else /* DOS_NT */
fprintf (stderr, "This platform does not support the -daemon flag.\n");
@@ -1316,7 +1316,7 @@
= argmatch (argv, argc, "-nsl", "--no-site-lisp", 11, NULL, &skip_args);
#ifdef HAVE_NS
- ns_alloc_autorelease_pool();
+ ns_alloc_autorelease_pool ();
if (!noninteractive)
{
#ifdef NS_IMPL_COCOA
@@ -1324,12 +1324,12 @@
{
/* FIXME: Do the right thing if getenv returns NULL, or if
chdir fails. */
- if (!strncmp(argv[skip_args], "-psn", 4))
+ if (!strncmp (argv[skip_args], "-psn", 4))
{
skip_args += 1;
chdir (getenv ("HOME"));
}
- else if (skip_args+1 < argc && !strncmp(argv[skip_args+1], "-psn",
4))
+ else if (skip_args+1 < argc && !strncmp (argv[skip_args+1], "-psn",
4))
{
skip_args += 2;
chdir (getenv ("HOME"));
@@ -1554,9 +1554,9 @@
#ifdef MSDOS
syms_of_xmenu ();
- syms_of_dosfns();
- syms_of_msdos();
- syms_of_win16select();
+ syms_of_dosfns ();
+ syms_of_msdos ();
+ syms_of_win16select ();
#endif /* MSDOS */
#ifdef HAVE_NS
@@ -1655,7 +1655,7 @@
GNU/Linux and MinGW. It might work on some other systems too.
Give it a try and tell us if it works on your system. To compile
for profiling, use the configure option --enable-profiling. */
-#if defined (__FreeBSD__) || defined (GNU_LINUX) || defined(__MINGW32__)
+#if defined (__FreeBSD__) || defined (GNU_LINUX) || defined (__MINGW32__)
#ifdef PROFILING
if (initialized)
{
=== modified file 'src/emacsgtkfixed.c'
--- a/src/emacsgtkfixed.c 2011-06-26 18:47:07 +0000
+++ b/src/emacsgtkfixed.c 2011-09-09 01:06:52 +0000
@@ -1,4 +1,4 @@
-/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
+/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
This file is only use when compiling with Gtk+ 3.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -116,10 +116,10 @@
(Bug#8919), and so users can resize our frames as they wish. */
void
-XSetWMSizeHints(Display* d,
- Window w,
- XSizeHints* hints,
- Atom prop)
+XSetWMSizeHints (Display* d,
+ Window w,
+ XSizeHints* hints,
+ Atom prop)
{
struct x_display_info *dpyinfo = x_display_info_for_display (d);
struct frame *f = x_top_window_to_frame (dpyinfo, w);
@@ -158,7 +158,7 @@
/* Override this X11 function.
This function is in the same X11 file as the one above. So we must
provide it also. */
-
+
void
XSetWMNormalHints (Display *d, Window w, XSizeHints *hints)
{
=== modified file 'src/eval.c'
--- a/src/eval.c 2011-08-29 16:01:33 +0000
+++ b/src/eval.c 2011-09-09 01:06:52 +0000
@@ -467,7 +467,7 @@
args_left = Fcdr (Fcdr (args_left));
}
- while (!NILP(args_left));
+ while (!NILP (args_left));
UNGCPRO;
return val;
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2011-09-03 05:23:17 +0000
+++ b/src/fileio.c 2011-09-09 01:06:52 +0000
@@ -1472,7 +1472,7 @@
if ((0
|| IS_DIRECTORY_SEP (p[-1]))
&& file_name_absolute_p (p)
-#if defined (WINDOWSNT) || defined(CYGWIN)
+#if defined (WINDOWSNT) || defined (CYGWIN)
/* // at start of file name is meaningful in Apollo,
WindowsNT and Cygwin systems. */
&& !(IS_DIRECTORY_SEP (p[0]) && p - 1 == nm)
@@ -2497,7 +2497,7 @@
absname = ENCODE_FILE (absname);
-#if defined(DOS_NT) || defined(macintosh)
+#if defined (DOS_NT) || defined (macintosh)
/* Under MS-DOS, Windows, and Macintosh, open does not work for
directories. */
if (access (SDATA (absname), 0) == 0)
@@ -2782,7 +2782,7 @@
}
#endif
- return Flist (sizeof(values) / sizeof(values[0]), values);
+ return Flist (sizeof (values) / sizeof (values[0]), values);
}
DEFUN ("set-file-selinux-context", Fset_file_selinux_context,
@@ -2853,7 +2853,7 @@
context_free (parsed_con);
}
else
- report_file_error("Doing lgetfilecon", Fcons (absname, Qnil));
+ report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil));
if (con)
freecon (con);
=== modified file 'src/filelock.c'
--- a/src/filelock.c 2011-08-29 16:48:19 +0000
+++ b/src/filelock.c 2011-09-09 01:06:52 +0000
@@ -630,7 +630,7 @@
b = XBUFFER (XCDR (XCAR (tail)));
if (STRINGP (BVAR (b, file_truename)) && BUF_SAVE_MODIFF (b) <
BUF_MODIFF (b))
{
- unlock_file(BVAR (b, file_truename));
+ unlock_file (BVAR (b, file_truename));
}
}
}
=== modified file 'src/floatfns.c'
--- a/src/floatfns.c 2011-09-06 20:47:45 +0000
+++ b/src/floatfns.c 2011-09-09 01:06:52 +0000
@@ -71,7 +71,7 @@
extern double logb (double);
#endif /* not HPUX and HAVE_LOGB and no logb macro */
-#if defined(DOMAIN) && defined(SING) && defined(OVERFLOW)
+#if defined (DOMAIN) && defined (SING) && defined (OVERFLOW)
/* If those are defined, then this is probably a `matherr' machine. */
# ifndef HAVE_MATHERR
# define HAVE_MATHERR
@@ -519,7 +519,7 @@
if (f1 == 0.0 && f2 == 0.0)
f1 = 1.0;
#ifdef FLOAT_CHECK_DOMAIN
- else if ((f1 == 0.0 && f2 < 0.0) || (f1 < 0 && f2 != floor(f2)))
+ else if ((f1 == 0.0 && f2 < 0.0) || (f1 < 0 && f2 != floor (f2)))
domain_error2 ("expt", arg1, arg2);
#endif
IN_FLOAT2 (f3 = pow (f1, f2), "expt", arg1, arg2);
=== modified file 'src/fns.c'
--- a/src/fns.c 2011-08-05 02:15:35 +0000
+++ b/src/fns.c 2011-09-09 01:06:52 +0000
@@ -4704,13 +4704,13 @@
force_raw_text = 1;
}
- if (NILP (coding_system) && !NILP (Fbuffer_file_name(object)))
+ if (NILP (coding_system) && !NILP (Fbuffer_file_name (object)))
{
/* Check file-coding-system-alist. */
Lisp_Object args[4], val;
args[0] = Qwrite_region; args[1] = start; args[2] = end;
- args[3] = Fbuffer_file_name(object);
+ args[3] = Fbuffer_file_name (object);
val = Ffind_operation_coding_system (4, args);
if (CONSP (val) && !NILP (XCDR (val)))
coding_system = XCDR (val);
=== modified file 'src/font.c'
--- a/src/font.c 2011-09-01 14:44:49 +0000
+++ b/src/font.c 2011-09-09 01:06:52 +0000
@@ -1334,7 +1334,7 @@
{
int decimal = 0, size_found = 1;
for (q = p + 1; *q && *q != ':'; q++)
- if (! isdigit(*q))
+ if (! isdigit (*q))
{
if (*q != '.' || decimal)
{
@@ -3239,7 +3239,7 @@
if (INTEGERP (height))
pt = XINT (height);
else
- abort(); /* We should never end up here. */
+ abort (); /* We should never end up here. */
}
pt /= 10;
@@ -3247,7 +3247,7 @@
#ifdef HAVE_NS
if (size == 0)
{
- Lisp_Object ffsize = get_frame_param(f, Qfontsize);
+ Lisp_Object ffsize = get_frame_param (f, Qfontsize);
size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) :
0;
}
#endif
=== modified file 'src/frame.c'
--- a/src/frame.c 2011-08-29 18:52:26 +0000
+++ b/src/frame.c 2011-09-09 01:06:52 +0000
@@ -4370,7 +4370,7 @@
DEFVAR_LISP ("default-frame-scroll-bars", Vdefault_frame_scroll_bars,
doc: /* Default position of scroll bars on this window-system.
*/);
#ifdef HAVE_WINDOW_SYSTEM
-#if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) || (defined(USE_GTK) &&
defined(USE_TOOLKIT_SCROLL_BARS))
+#if defined (HAVE_NTGUI) || defined (NS_IMPL_COCOA) || (defined (USE_GTK) &&
defined (USE_TOOLKIT_SCROLL_BARS))
/* MS-Windows, Mac OS X, and GTK have scroll bars on the right by
default. */
Vdefault_frame_scroll_bars = Qright;
=== modified file 'src/fringe.c'
--- a/src/fringe.c 2011-07-28 23:47:01 +0000
+++ b/src/fringe.c 2011-09-09 01:06:52 +0000
@@ -456,7 +456,7 @@
#define NO_FRINGE_BITMAP 0
#define UNDEF_FRINGE_BITMAP 1
-#define MAX_STANDARD_FRINGE_BITMAPS
(sizeof(standard_bitmaps)/sizeof(standard_bitmaps[0]))
+#define MAX_STANDARD_FRINGE_BITMAPS (sizeof (standard_bitmaps)/sizeof
(standard_bitmaps[0]))
static struct fringe_bitmap **fringe_bitmaps;
static Lisp_Object *fringe_faces;
@@ -1165,7 +1165,7 @@
}
else if ((!row->reversed_p && row->truncated_on_left_p)
|| (row->reversed_p && row->truncated_on_right_p))
- left = LEFT_FRINGE(0, Qtruncation, 0);
+ left = LEFT_FRINGE (0, Qtruncation, 0);
else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
{
left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
@@ -1787,7 +1787,7 @@
int bt;
for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
- init_fringe_bitmap(bt, &standard_bitmaps[bt], 1);
+ init_fringe_bitmap (bt, &standard_bitmaps[bt], 1);
}
void
=== modified file 'src/getpagesize.h'
--- a/src/getpagesize.h 2011-01-25 04:08:28 +0000
+++ b/src/getpagesize.h 2011-09-09 01:06:52 +0000
@@ -21,7 +21,7 @@
# include <unistd.h>
# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
+# define getpagesize() sysconf (_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
=== modified file 'src/gmalloc.c'
--- a/src/gmalloc.c 2011-08-16 20:31:32 +0000
+++ b/src/gmalloc.c 2011-09-09 01:06:52 +0000
@@ -102,7 +102,7 @@
receive a fragment of a block. Fragment sizes are powers of two,
and all fragments of a block are the same size. When all the
fragments in a block have been freed, the block itself is freed. */
-#define INT_BIT (CHAR_BIT * sizeof(int))
+#define INT_BIT (CHAR_BIT * sizeof (int))
#define BLOCKLOG (INT_BIT > 16 ? 12 : 9)
#define BLOCKSIZE (1 << BLOCKLOG)
#define BLOCKIFY(SIZE) (((SIZE) + BLOCKSIZE - 1) / BLOCKSIZE)
@@ -445,7 +445,7 @@
}
}
-#define PROTECT_MALLOC_STATE(PROT) protect_malloc_state(PROT)
+#define PROTECT_MALLOC_STATE(PROT) protect_malloc_state (PROT)
#else
#define PROTECT_MALLOC_STATE(PROT) /* empty */
@@ -1541,7 +1541,7 @@
{
__ptr_t result;
- LOCK();
+ LOCK ();
result = _realloc_internal_nolock (ptr, size);
UNLOCK ();
@@ -1625,7 +1625,7 @@
/* uClibc defines __GNU_LIBRARY__, but it is not completely
compatible. */
-#if !defined(__GNU_LIBRARY__) || defined(__UCLIBC__)
+#if !defined (__GNU_LIBRARY__) || defined (__UCLIBC__)
#define __sbrk sbrk
#else /* __GNU_LIBRARY__ && ! defined (__UCLIBC__) */
/* It is best not to declare this and cast its result on foreign operating
@@ -1647,7 +1647,7 @@
__malloc_ptrdiff_t increment;
{
__ptr_t result;
-#if defined(CYGWIN)
+#if defined (CYGWIN)
if (!bss_sbrk_did_unexec)
{
return bss_sbrk (increment);
@@ -1830,7 +1830,7 @@
#endif
#else
#include "getpagesize.h"
-#define __getpagesize() getpagesize()
+#define __getpagesize() getpagesize ()
#endif
#ifndef _MALLOC_INTERNAL
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2011-09-07 17:25:24 +0000
+++ b/src/gtkutil.c 2011-09-09 01:06:52 +0000
@@ -422,7 +422,7 @@
static void
xg_set_cursor (GtkWidget *w, GdkCursor *cursor)
{
- GdkWindow *window = gtk_widget_get_window(w);
+ GdkWindow *window = gtk_widget_get_window (w);
GList *children = gdk_window_peek_children (window);
gdk_window_set_cursor (window, cursor);
=== modified file 'src/image.c'
--- a/src/image.c 2011-08-30 18:15:53 +0000
+++ b/src/image.c 2011-09-09 01:06:52 +0000
@@ -56,7 +56,7 @@
#define COLOR_TABLE_SUPPORT 1
typedef struct x_bitmap_record Bitmap_Record;
-#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
+#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
#define NO_PIXMAP None
#define RGB_PIXEL_COLOR unsigned long
@@ -74,7 +74,7 @@
#undef COLOR_TABLE_SUPPORT
typedef struct w32_bitmap_record Bitmap_Record;
-#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y)
+#define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
#define NO_PIXMAP 0
#define RGB_PIXEL_COLOR COLORREF
@@ -106,7 +106,7 @@
typedef struct ns_bitmap_record Bitmap_Record;
-#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
+#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
#define NO_PIXMAP 0
#define RGB_PIXEL_COLOR unsigned long
@@ -115,7 +115,7 @@
#define PIX_MASK_RETAIN 0
#define PIX_MASK_DRAW 1
-#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO(f)->visual
+#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO (f)->visual
#define x_defined_color(f, name, color_def, alloc) \
ns_defined_color (f, name, color_def, alloc, 0)
#define FRAME_X_SCREEN(f) 0
@@ -1106,8 +1106,8 @@
because a typical font is `top-heavy' (due to the presence
uppercase letters), so the image placement should err towards
being top-heavy too. It also just generally looks better. */
- ascent = (height + FONT_BASE(face->font)
- - FONT_DESCENT(face->font) + 1) / 2;
+ ascent = (height + FONT_BASE (face->font)
+ - FONT_DESCENT (face->font) + 1) / 2;
#endif /* HAVE_NTGUI */
}
else
@@ -5545,7 +5545,7 @@
/* In libpng version 1.5, the jmpbuf member is hidden. (Bug#7908) */
#define PNG_LONGJMP(ptr) (fn_png_longjmp ((ptr), 1))
#define PNG_JMPBUF(ptr) \
- (*fn_png_set_longjmp_fn((ptr), longjmp, sizeof (jmp_buf)))
+ (*fn_png_set_longjmp_fn ((ptr), longjmp, sizeof (jmp_buf)))
#endif
/* Error and warning handlers installed when the PNG library
@@ -5966,9 +5966,9 @@
static int
png_load (struct frame *f, struct image *img)
{
- return ns_load_image(f, img,
- image_spec_value (img->spec, QCfile, NULL),
- image_spec_value (img->spec, QCdata, NULL));
+ return ns_load_image (f, img,
+ image_spec_value (img->spec, QCfile, NULL),
+ image_spec_value (img->spec, QCdata, NULL));
}
#endif /* HAVE_NS */
@@ -6115,7 +6115,7 @@
#else
-#define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress(a)
+#define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress (a)
#define fn_jpeg_start_decompress jpeg_start_decompress
#define fn_jpeg_finish_decompress jpeg_finish_decompress
#define fn_jpeg_destroy_decompress jpeg_destroy_decompress
@@ -7623,7 +7623,7 @@
return 0;
}
- if (MagickGetNumberImages(ping_wand) > 1)
+ if (MagickGetNumberImages (ping_wand) > 1)
img->lisp_data =
Fcons (Qcount,
Fcons (make_number (MagickGetNumberImages (ping_wand)),
@@ -7648,7 +7648,7 @@
if (im_image == NULL)
goto imagemagick_no_wand;
image_wand = NewMagickWandFromImage (im_image);
- DestroyImage(im_image);
+ DestroyImage (im_image);
}
else
{
@@ -7769,7 +7769,7 @@
#ifdef COLOR_TABLE_SUPPORT
free_color_table ();
#endif
- image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
+ image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
goto imagemagick_error;
}
@@ -7823,7 +7823,7 @@
#ifdef COLOR_TABLE_SUPPORT
free_color_table ();
#endif
- image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
+ image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
goto imagemagick_error;
}
=== modified file 'src/insdel.c'
--- a/src/insdel.c 2011-06-24 21:25:22 +0000
+++ b/src/insdel.c 2011-09-09 01:06:52 +0000
@@ -329,7 +329,7 @@
- disordered overlays in the slot `overlays_before' of current_buffer. */
if (adjusted)
{
- fix_start_end_in_overlays(from, to);
+ fix_start_end_in_overlays (from, to);
fix_overlays_before (current_buffer, from, to);
}
}
@@ -1606,7 +1606,7 @@
to_byte = CHAR_TO_BYTE (to);
deletion = del_range_2 (from, from_byte, to, to_byte, ret_string);
- GCPRO1(deletion);
+ GCPRO1 (deletion);
signal_after_change (from, to - from, 0);
update_compositions (from, from, CHECK_HEAD);
UNGCPRO;
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2011-08-31 20:02:51 +0000
+++ b/src/keyboard.c 2011-09-09 01:06:52 +0000
@@ -408,7 +408,7 @@
/* If we support a window system, turn on the code to poll periodically
to detect C-g. It isn't actually used when doing interrupt input. */
-#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
+#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_ASYNC_EVENTS)
#define POLL_FOR_INPUT
#endif
@@ -3955,7 +3955,7 @@
kbd_fetch_ptr = event + 1;
}
#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
- || defined(HAVE_NS) || defined (USE_GTK)
+ || defined (HAVE_NS) || defined (USE_GTK)
else if (event->kind == MENU_BAR_ACTIVATE_EVENT)
{
kbd_fetch_ptr = event + 1;
@@ -4065,7 +4065,7 @@
obj = make_lispy_event (event);
#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
- || defined(HAVE_NS) || defined (USE_GTK)
+ || defined (HAVE_NS) || defined (USE_GTK)
/* If this was a menu selection, then set the flag to inhibit
writing to last_nonmenu_event. Don't do this if the event
we're returning is (menu-bar), though; that indicates the
@@ -5881,7 +5881,7 @@
#endif /* HAVE_MOUSE */
#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
- || defined(HAVE_NS) || defined (USE_GTK)
+ || defined (HAVE_NS) || defined (USE_GTK)
case MENU_BAR_EVENT:
if (EQ (event->arg, event->frame_or_window))
/* This is the prefix key. We translate this to
@@ -5996,7 +5996,7 @@
}
}
-#if defined(HAVE_MOUSE) || defined(HAVE_GPM)
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
static Lisp_Object
make_lispy_movement (FRAME_PTR frame, Lisp_Object bar_window, enum
scroll_bar_part part,
@@ -7008,7 +7008,7 @@
if (n_to_read > sizeof cbuf)
n_to_read = sizeof cbuf;
#else /* no FIONREAD */
-#if defined (USG) || defined(CYGWIN)
+#if defined (USG) || defined (CYGWIN)
/* Read some input if available, but don't wait. */
n_to_read = sizeof cbuf;
fcntl (fileno (tty->input), F_SETFL, O_NDELAY);
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2011-09-01 14:44:49 +0000
+++ b/src/lisp.h 2011-09-09 01:06:52 +0000
@@ -132,9 +132,9 @@
#define eassert(X) ((void) (0 && (X))) /* Check that X compiles. */
#else /* ENABLE_CHECKING */
#if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__)
-#define eassert(cond) CHECK(cond,"assertion failed: " #cond)
+#define eassert(cond) CHECK (cond, "assertion failed: " #cond)
#else
-#define eassert(cond) CHECK(cond,"assertion failed")
+#define eassert(cond) CHECK (cond, "assertion failed")
#endif
#endif /* ENABLE_CHECKING */
@@ -584,20 +584,20 @@
/* Extract a value or address from a Lisp_Object. */
-#define XCONS(a) (eassert (CONSP(a)),(struct Lisp_Cons *) XPNTR(a))
-#define XVECTOR(a) (eassert (VECTORLIKEP(a)),(struct Lisp_Vector *) XPNTR(a))
-#define XSTRING(a) (eassert (STRINGP(a)),(struct Lisp_String *) XPNTR(a))
-#define XSYMBOL(a) (eassert (SYMBOLP(a)),(struct Lisp_Symbol *) XPNTR(a))
-#define XFLOAT(a) (eassert (FLOATP(a)),(struct Lisp_Float *) XPNTR(a))
+#define XCONS(a) (eassert (CONSP (a)), (struct Lisp_Cons *) XPNTR (a))
+#define XVECTOR(a) (eassert (VECTORLIKEP (a)), (struct Lisp_Vector *) XPNTR
(a))
+#define XSTRING(a) (eassert (STRINGP (a)), (struct Lisp_String *) XPNTR (a))
+#define XSYMBOL(a) (eassert (SYMBOLP (a)), (struct Lisp_Symbol *) XPNTR (a))
+#define XFLOAT(a) (eassert (FLOATP (a)), (struct Lisp_Float *) XPNTR (a))
/* Misc types. */
-#define XMISC(a) ((union Lisp_Misc *) XPNTR(a))
-#define XMISCANY(a) (eassert (MISCP (a)), &(XMISC(a)->u_any))
+#define XMISC(a) ((union Lisp_Misc *) XPNTR (a))
+#define XMISCANY(a) (eassert (MISCP (a)), &(XMISC (a)->u_any))
#define XMISCTYPE(a) (XMISCANY (a)->type)
-#define XMARKER(a) (eassert (MARKERP (a)), &(XMISC(a)->u_marker))
-#define XOVERLAY(a) (eassert (OVERLAYP (a)), &(XMISC(a)->u_overlay))
-#define XSAVE_VALUE(a) (eassert (SAVE_VALUEP (a)), &(XMISC(a)->u_save_value))
+#define XMARKER(a) (eassert (MARKERP (a)), &(XMISC (a)->u_marker))
+#define XOVERLAY(a) (eassert (OVERLAYP (a)), &(XMISC (a)->u_overlay))
+#define XSAVE_VALUE(a) (eassert (SAVE_VALUEP (a)), &(XMISC (a)->u_save_value))
/* Forwarding object types. */
@@ -612,14 +612,14 @@
/* Pseudovector types. */
-#define XPROCESS(a) (eassert (PROCESSP(a)),(struct Lisp_Process *) XPNTR(a))
-#define XWINDOW(a) (eassert (WINDOWP(a)),(struct window *) XPNTR(a))
-#define XTERMINAL(a) (eassert (TERMINALP(a)),(struct terminal *) XPNTR(a))
-#define XSUBR(a) (eassert (SUBRP(a)),(struct Lisp_Subr *) XPNTR(a))
-#define XBUFFER(a) (eassert (BUFFERP(a)),(struct buffer *) XPNTR(a))
-#define XCHAR_TABLE(a) (eassert (CHAR_TABLE_P (a)), (struct Lisp_Char_Table *)
XPNTR(a))
-#define XSUB_CHAR_TABLE(a) (eassert (SUB_CHAR_TABLE_P (a)), (struct
Lisp_Sub_Char_Table *) XPNTR(a))
-#define XBOOL_VECTOR(a) (eassert (BOOL_VECTOR_P (a)), (struct Lisp_Bool_Vector
*) XPNTR(a))
+#define XPROCESS(a) (eassert (PROCESSP (a)), (struct Lisp_Process *) XPNTR (a))
+#define XWINDOW(a) (eassert (WINDOWP (a)), (struct window *) XPNTR (a))
+#define XTERMINAL(a) (eassert (TERMINALP (a)), (struct terminal *) XPNTR (a))
+#define XSUBR(a) (eassert (SUBRP (a)), (struct Lisp_Subr *) XPNTR (a))
+#define XBUFFER(a) (eassert (BUFFERP (a)), (struct buffer *) XPNTR (a))
+#define XCHAR_TABLE(a) (eassert (CHAR_TABLE_P (a)), (struct Lisp_Char_Table *)
XPNTR (a))
+#define XSUB_CHAR_TABLE(a) (eassert (SUB_CHAR_TABLE_P (a)), (struct
Lisp_Sub_Char_Table *) XPNTR (a))
+#define XBOOL_VECTOR(a) (eassert (BOOL_VECTOR_P (a)), (struct Lisp_Bool_Vector
*) XPNTR (a))
/* Construct a Lisp_Object from a value or address. */
@@ -637,7 +637,7 @@
/* Pseudovector types. */
-#define XSETPVECTYPE(v, code) XSETTYPED_PVECTYPE(v, header.size, code)
+#define XSETPVECTYPE(v, code) XSETTYPED_PVECTYPE (v, header.size, code)
#define XSETTYPED_PVECTYPE(v, size_member, code) \
((v)->size_member |= PSEUDOVECTOR_FLAG | (code))
#define XSETPVECTYPESIZE(v, code, sizeval) \
@@ -749,8 +749,8 @@
#endif
/* Use these from normal code. */
-#define XCAR(c) LISP_MAKE_RVALUE(XCAR_AS_LVALUE(c))
-#define XCDR(c) LISP_MAKE_RVALUE(XCDR_AS_LVALUE(c))
+#define XCAR(c) LISP_MAKE_RVALUE (XCAR_AS_LVALUE (c))
+#define XCDR(c) LISP_MAKE_RVALUE (XCDR_AS_LVALUE (c))
/* Use these to set the fields of a cons cell.
@@ -758,8 +758,8 @@
should not be read after 'c' is first modified. Also, neither
argument should be evaluated more than once; side effects are
especially common in the second argument. */
-#define XSETCAR(c,n) (XCAR_AS_LVALUE(c) = (n))
-#define XSETCDR(c,n) (XCDR_AS_LVALUE(c) = (n))
+#define XSETCAR(c,n) (XCAR_AS_LVALUE (c) = (n))
+#define XSETCDR(c,n) (XCDR_AS_LVALUE (c) = (n))
/* Take the car or cdr of something whose type is not known. */
#define CAR(c) \
@@ -872,14 +872,14 @@
of the shortest vector that would hold that struct. */
#define VECSIZE(type) ((sizeof (type) \
- offsetof (struct Lisp_Vector, contents[0]) \
- + sizeof(Lisp_Object) - 1) /* round up */ \
+ + sizeof (Lisp_Object) - 1) /* round up */ \
/ sizeof (Lisp_Object))
/* Like VECSIZE, but used when the pseudo-vector has non-Lisp_Object fields
at the end and we need to compute the number of Lisp_Object fields (the
ones that the GC needs to trace). */
#define PSEUDOVECSIZE(type, nonlispfield) \
- ((offsetof(type, nonlispfield) - offsetof(struct Lisp_Vector, contents[0])) \
+ ((offsetof (type, nonlispfield) - offsetof (struct Lisp_Vector,
contents[0])) \
/ sizeof (Lisp_Object))
/* A char-table is a kind of vectorlike, with contents are like a
@@ -3296,7 +3296,7 @@
/* Defined in emacs.c */
extern char **initial_argv;
extern int initial_argc;
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
extern int display_arg;
#endif
extern Lisp_Object decode_env_path (const char *, const char *);
@@ -3642,7 +3642,7 @@
/* We used to use `abs', but that clashes with system headers on some
platforms, and using a name reserved by Standard C is a bad idea
anyway. */
-#if !defined(eabs)
+#if !defined (eabs)
#define eabs(x) ((x) < 0 ? -(x) : (x))
#endif
=== modified file 'src/lread.c'
--- a/src/lread.c 2011-08-29 18:55:58 +0000
+++ b/src/lread.c 2011-09-09 01:06:52 +0000
@@ -1284,7 +1284,7 @@
}
if (! NILP (Vpurify_flag))
- Vpreloaded_file_list = Fcons (Fpurecopy(file), Vpreloaded_file_list);
+ Vpreloaded_file_list = Fcons (Fpurecopy (file), Vpreloaded_file_list);
if (NILP (nomessage) || force_load_messages)
{
=== modified file 'src/m/alpha.h'
--- a/src/m/alpha.h 2011-02-16 01:35:20 +0000
+++ b/src/m/alpha.h 2011-09-09 01:06:52 +0000
@@ -31,7 +31,7 @@
#ifdef __ELF__
-#if !defined(GNU_LINUX) && !defined(__NetBSD__)
+#if !defined (GNU_LINUX) && !defined (__NetBSD__)
#define DATA_START 0x140000000
#endif
=== modified file 'src/menu.c'
--- a/src/menu.c 2011-06-11 21:31:32 +0000
+++ b/src/menu.c 2011-09-09 01:06:52 +0000
@@ -364,7 +364,7 @@
return;
}
-#if defined(HAVE_X_WINDOWS) || defined(MSDOS)
+#if defined (HAVE_X_WINDOWS) || defined (MSDOS)
#ifndef HAVE_BOXES
/* Simulate radio buttons and toggle boxes by putting a prefix in
front of them. */
@@ -977,7 +977,7 @@
prefix = entry = Qnil;
i = 0;
subprefix_stack =
- (Lisp_Object *)alloca(menu_items_used * sizeof (Lisp_Object));
+ (Lisp_Object *)alloca (menu_items_used * sizeof (Lisp_Object));
while (i < menu_items_used)
{
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2011-06-24 21:25:22 +0000
+++ b/src/msdos.c 2011-09-09 01:06:52 +0000
@@ -296,7 +296,7 @@
FOR_EACH_FRAME (tail, frame)
XFRAME (frame)->mouse_moved = 0;
- *f = SELECTED_FRAME();
+ *f = SELECTED_FRAME ();
*bar_window = Qnil;
mouse_get_xy (&ix, &iy);
*time = event_timestamp ();
@@ -310,7 +310,7 @@
int x, y;
mouse_get_xy (&x, &y);
- SELECTED_FRAME()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
+ SELECTED_FRAME ()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
mouse_last_x = x;
mouse_last_y = y;
}
@@ -582,7 +582,7 @@
/* If the dimensions changed, the mouse highlight info is invalid. */
if (current_rows != *rows || current_cols != *cols)
{
- struct frame *f = SELECTED_FRAME();
+ struct frame *f = SELECTED_FRAME ();
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
Lisp_Object window = hlinfo->mouse_face_window;
@@ -639,7 +639,7 @@
/* Avoid the costly BIOS call if F isn't the currently selected
frame. Allow for NULL as unconditionally meaning the selected
frame. */
- if (f && f != SELECTED_FRAME())
+ if (f && f != SELECTED_FRAME ())
return;
if (tty->termscript)
@@ -776,7 +776,7 @@
static void
IT_set_face (int face)
{
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
struct face *fp = FACE_FROM_ID (sf, face);
struct face *dfp = FACE_FROM_ID (sf, DEFAULT_FACE_ID);
unsigned long fg, bg, dflt_fg, dflt_bg;
@@ -868,7 +868,7 @@
if (str_len <= 0) return;
- sf = SELECTED_FRAME();
+ sf = SELECTED_FRAME ();
/* Since faces get cached and uncached behind our back, we can't
rely on their indices in the cache being consistent across
@@ -1755,7 +1755,7 @@
if (redraw)
{
face_change_count++; /* forces xdisp.c to recompute basic faces */
- if (f == SELECTED_FRAME())
+ if (f == SELECTED_FRAME ())
redraw_frame (f);
}
}
@@ -1772,7 +1772,7 @@
{
static int init_needed = 1;
char *term = getenv ("TERM"), *colors;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
struct tty_display_info *tty;
#ifdef HAVE_X_WINDOWS
@@ -1923,7 +1923,7 @@
void
check_x (void)
{
- if (! FRAME_MSDOS_P (SELECTED_FRAME()))
+ if (! FRAME_MSDOS_P (SELECTED_FRAME ()))
error ("Not running under a window system");
}
@@ -2442,12 +2442,12 @@
{
struct input_event event;
union REGS regs;
- Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME());
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME ());
EVENT_INIT (event);
#ifndef HAVE_X_WINDOWS
/* Maybe put the cursor where it should be. */
- IT_cmgoto (SELECTED_FRAME());
+ IT_cmgoto (SELECTED_FRAME ());
#endif
/* The following condition is equivalent to `kbhit ()', except that
@@ -2692,7 +2692,7 @@
/* Generate SELECT_WINDOW_EVENTs when needed. */
if (!NILP (Vmouse_autoselect_window))
{
- mouse_window = window_from_coordinates (SELECTED_FRAME(),
+ mouse_window = window_from_coordinates (SELECTED_FRAME (),
mouse_last_x,
mouse_last_y,
0, 0);
@@ -2718,7 +2718,7 @@
previous_help_echo_string = help_echo_string;
help_echo_string = help_echo_object = help_echo_window = Qnil;
help_echo_pos = -1;
- note_mouse_highlight (SELECTED_FRAME(), mouse_last_x, mouse_last_y);
+ note_mouse_highlight (SELECTED_FRAME (), mouse_last_x, mouse_last_y);
/* If the contents of the global variable help_echo has
changed, generate a HELP_EVENT. */
if (!NILP (help_echo_string) || !NILP (previous_help_echo_string))
@@ -2913,7 +2913,7 @@
int i, j, face, width, mx, my, enabled, mousehere, row, col;
struct glyph *text, *p;
const unsigned char *q;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
menu_help_message = NULL;
@@ -3092,7 +3092,7 @@
int statecount, x, y, i, b, screensize, leave, result, onepane;
int title_faces[4]; /* face to display the menu title */
int faces[4], buffers_num_deleted = 0;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
Lisp_Object saved_echo_area_message, selectface;
/* Just in case we got here without a mouse present... */
@@ -3539,10 +3539,10 @@
/* Some lusers set TMPDIR=e:, probably because some losing
programs cannot handle multiple slashes if they use e:/.
e: fails in `access' below, so we interpret e: as e:/. */
- tmp_len = strlen(tmp);
+ tmp_len = strlen (tmp);
if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\')
{
- strcpy(buf, tmp);
+ strcpy (buf, tmp);
buf[tmp_len++] = '/', buf[tmp_len] = 0;
tmp = buf;
}
=== modified file 'src/nsgui.h'
--- a/src/nsgui.h 2011-07-08 08:42:58 +0000
+++ b/src/nsgui.h 2011-09-09 01:06:52 +0000
@@ -134,7 +134,7 @@
} XRectangle;
#ifndef __OBJC__
-#if defined(__LP64__) && __LP64__
+#if defined (__LP64__) && __LP64__
typedef double CGFloat;
#else
typedef float CGFloat;
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2011-08-15 05:30:45 +0000
+++ b/src/nsterm.h 2011-09-09 01:06:52 +0000
@@ -362,7 +362,7 @@
#endif
#ifndef NS_HAVE_NSINTEGER
-#if defined(__LP64__) && __LP64__
+#if defined (__LP64__) && __LP64__
typedef double CGFloat;
typedef long NSInteger;
typedef unsigned long NSUInteger;
=== modified file 'src/print.c'
--- a/src/print.c 2011-09-04 19:18:28 +0000
+++ b/src/print.c 2011-09-09 01:06:52 +0000
@@ -2020,9 +2020,9 @@
case Lisp_Misc_Save_Value:
strout ("#<save_value ", -1, -1, printcharfun);
- sprintf(buf, "ptr=%p int=%"pD"d",
- XSAVE_VALUE (obj)->pointer,
- XSAVE_VALUE (obj)->integer);
+ sprintf (buf, "ptr=%p int=%"pD"d",
+ XSAVE_VALUE (obj)->pointer,
+ XSAVE_VALUE (obj)->integer);
strout (buf, -1, -1, printcharfun);
PRINTCHAR ('>');
break;
=== modified file 'src/process.c'
--- a/src/process.c 2011-08-29 19:46:15 +0000
+++ b/src/process.c 2011-09-09 01:06:52 +0000
@@ -54,16 +54,16 @@
#endif
#include <sys/ioctl.h>
-#if defined(HAVE_NET_IF_H)
+#if defined (HAVE_NET_IF_H)
#include <net/if.h>
#endif /* HAVE_NET_IF_H */
-#if defined(HAVE_IFADDRS_H)
+#if defined (HAVE_IFADDRS_H)
/* Must be after net/if.h */
#include <ifaddrs.h>
/* We only use structs from this header when we use getifaddrs. */
-#if defined(HAVE_NET_IF_DL_H)
+#if defined (HAVE_NET_IF_DL_H)
#include <net/if_dl.h>
#endif
@@ -256,7 +256,7 @@
/* If we support a window system, turn on the code to poll periodically
to detect C-g. It isn't actually used when doing interrupt input. */
-#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
+#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_ASYNC_EVENTS)
#define POLL_FOR_INPUT
#endif
@@ -2921,7 +2921,7 @@
{
/* Don't support network sockets when non-blocking mode is
not available, since a blocked Emacs is not useful. */
-#if !defined(O_NONBLOCK) && !defined(O_NDELAY)
+#if !defined (O_NONBLOCK) && !defined (O_NDELAY)
error ("Network servers not supported");
#else
is_server = 1;
@@ -2975,7 +2975,7 @@
tem = Fplist_get (contact, QCfamily);
if (NILP (tem))
{
-#if defined(HAVE_GETADDRINFO) && defined(AF_INET6)
+#if defined (HAVE_GETADDRINFO) && defined (AF_INET6)
family = AF_UNSPEC;
#else
family = AF_INET;
@@ -3560,7 +3560,7 @@
}
-#if defined(HAVE_NET_IF_H)
+#if defined (HAVE_NET_IF_H)
#ifdef SIOCGIFCONF
DEFUN ("network-interface-list", Fnetwork_interface_list,
Snetwork_interface_list, 0, 0, 0,
@@ -3631,7 +3631,7 @@
}
#endif /* SIOCGIFCONF */
-#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
+#if defined (SIOCGIFADDR) || defined (SIOCGIFHWADDR) || defined (SIOCGIFFLAGS)
struct ifflag_def {
int flag_bit;
@@ -3738,7 +3738,7 @@
return Qnil;
elt = Qnil;
-#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ_IFR_FLAGS)
+#if defined (SIOCGIFFLAGS) && defined (HAVE_STRUCT_IFREQ_IFR_FLAGS)
if (ioctl (s, SIOCGIFFLAGS, &rq) == 0)
{
int flags = rq.ifr_flags;
@@ -3772,7 +3772,7 @@
res = Fcons (elt, res);
elt = Qnil;
-#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_HWADDR)
+#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR)
if (ioctl (s, SIOCGIFHWADDR, &rq) == 0)
{
Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
@@ -3784,7 +3784,7 @@
p->contents[n] = make_number (((unsigned char
*)&rq.ifr_hwaddr.sa_data[0])[n]);
elt = Fcons (make_number (rq.ifr_hwaddr.sa_family), hwaddr);
}
-#elif defined(HAVE_GETIFADDRS) && defined(LLADDR)
+#elif defined (HAVE_GETIFADDRS) && defined (LLADDR)
if (getifaddrs (&ifap) != -1)
{
Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
@@ -3802,7 +3802,7 @@
|| sdl->sdl_alen != 6)
continue;
- memcpy (linkaddr, LLADDR(sdl), sdl->sdl_alen);
+ memcpy (linkaddr, LLADDR (sdl), sdl->sdl_alen);
for (n = 0; n < 6; n++)
p->contents[n] = make_number (linkaddr[n]);
@@ -3819,7 +3819,7 @@
res = Fcons (elt, res);
elt = Qnil;
-#if defined(SIOCGIFNETMASK) && (defined(HAVE_STRUCT_IFREQ_IFR_NETMASK) ||
defined(HAVE_STRUCT_IFREQ_IFR_ADDR))
+#if defined (SIOCGIFNETMASK) && (defined (HAVE_STRUCT_IFREQ_IFR_NETMASK) ||
defined (HAVE_STRUCT_IFREQ_IFR_ADDR))
if (ioctl (s, SIOCGIFNETMASK, &rq) == 0)
{
any = 1;
@@ -3833,7 +3833,7 @@
res = Fcons (elt, res);
elt = Qnil;
-#if defined(SIOCGIFBRDADDR) && defined(HAVE_STRUCT_IFREQ_IFR_BROADADDR)
+#if defined (SIOCGIFBRDADDR) && defined (HAVE_STRUCT_IFREQ_IFR_BROADADDR)
if (ioctl (s, SIOCGIFBRDADDR, &rq) == 0)
{
any = 1;
@@ -3843,7 +3843,7 @@
res = Fcons (elt, res);
elt = Qnil;
-#if defined(SIOCGIFADDR) && defined(HAVE_STRUCT_IFREQ_IFR_ADDR)
+#if defined (SIOCGIFADDR) && defined (HAVE_STRUCT_IFREQ_IFR_ADDR)
if (ioctl (s, SIOCGIFADDR, &rq) == 0)
{
any = 1;
@@ -3857,7 +3857,7 @@
return any ? res : Qnil;
}
#endif
-#endif /* defined(HAVE_NET_IF_H) */
+#endif /* defined (HAVE_NET_IF_H) */
/* Turn off input and output for process PROC. */
@@ -7280,7 +7280,7 @@
#ifdef HAVE_GETSOCKNAME
ADD_SUBFEATURE (QCservice, Qt);
#endif
-#if defined(O_NONBLOCK) || defined(O_NDELAY)
+#if defined (O_NONBLOCK) || defined (O_NDELAY)
ADD_SUBFEATURE (QCserver, Qt);
#endif
@@ -7472,14 +7472,14 @@
defsubr (&Sset_network_process_option);
defsubr (&Smake_network_process);
defsubr (&Sformat_network_address);
-#if defined(HAVE_NET_IF_H)
+#if defined (HAVE_NET_IF_H)
#ifdef SIOCGIFCONF
defsubr (&Snetwork_interface_list);
#endif
-#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
+#if defined (SIOCGIFADDR) || defined (SIOCGIFHWADDR) || defined (SIOCGIFFLAGS)
defsubr (&Snetwork_interface_info);
#endif
-#endif /* defined(HAVE_NET_IF_H) */
+#endif /* defined (HAVE_NET_IF_H) */
#ifdef DATAGRAM_SOCKETS
defsubr (&Sprocess_datagram_address);
defsubr (&Sset_process_datagram_address);
=== modified file 'src/ralloc.c'
--- a/src/ralloc.c 2011-07-10 08:52:10 +0000
+++ b/src/ralloc.c 2011-09-09 01:06:52 +0000
@@ -100,7 +100,7 @@
& ~(page_size - 1))
#define ROUND_TO_PAGE(addr) (addr & (~(page_size - 1)))
-#define MEM_ALIGN sizeof(double)
+#define MEM_ALIGN sizeof (double)
#define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \
& ~(MEM_ALIGN - 1))
@@ -468,7 +468,7 @@
/* No need to ever call this if arena is frozen, bug somewhere! */
if (r_alloc_freeze_level)
- abort();
+ abort ();
while (b)
{
@@ -592,7 +592,7 @@
/* No need to ever call this if arena is frozen, bug somewhere! */
if (r_alloc_freeze_level)
- abort();
+ abort ();
if (bloc == NIL_BLOC || size == bloc->size)
return 1;
=== modified file 'src/regex.c'
--- a/src/regex.c 2011-08-04 20:43:14 +0000
+++ b/src/regex.c 2011-09-09 01:06:52 +0000
@@ -67,7 +67,7 @@
# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
# define regerror(err_code, preg, errbuf, errbuf_size) \
- __regerror(err_code, preg, errbuf, errbuf_size)
+ __regerror (err_code, preg, errbuf, errbuf_size)
# define re_set_registers(bu, re, nu, st, en) \
__re_set_registers (bu, re, nu, st, en)
# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
@@ -376,12 +376,12 @@
# define ISUPPER(c) isupper (c)
# define ISXDIGIT(c) isxdigit (c)
-# define ISWORD(c) ISALPHA(c)
+# define ISWORD(c) ISALPHA (c)
# ifdef _tolower
-# define TOLOWER(c) _tolower(c)
+# define TOLOWER(c) _tolower (c)
# else
-# define TOLOWER(c) tolower(c)
+# define TOLOWER(c) tolower (c)
# endif
/* How many characters in the character set. */
@@ -2112,7 +2112,7 @@
case RECC_WORD: return ISWORD (ch) != 0;
case RECC_ERROR: return false;
default:
- abort();
+ abort ();
}
}
@@ -2133,7 +2133,7 @@
case RECC_ASCII: case RECC_DIGIT: case RECC_XDIGIT: case RECC_CNTRL:
case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0;
default:
- abort();
+ abort ();
}
}
#endif
@@ -4537,10 +4537,10 @@
/* Declarations and macros for re_match_2. */
-static int bcmp_translate _RE_ARGS((re_char *s1, re_char *s2,
- register ssize_t len,
- RE_TRANSLATE_TYPE translate,
- const int multibyte));
+static int bcmp_translate _RE_ARGS ((re_char *s1, re_char *s2,
+ register ssize_t len,
+ RE_TRANSLATE_TYPE translate,
+ const int multibyte));
/* This converts PTR, a pointer into one of the search strings `string1'
and `string2' into an offset from the beginning of that string. */
@@ -6276,7 +6276,7 @@
goto fail;
default:
- abort();
+ abort ();
}
assert (p >= bufp->buffer && p <= pend);
=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2011-03-17 05:15:08 +0000
+++ b/src/s/gnu-linux.h 2011-09-09 01:06:52 +0000
@@ -103,7 +103,7 @@
/* This is needed for dispnew.c:update_frame. */
#ifdef emacs
#include <stdio.h> /* Get the definition of _IO_STDIO_H. */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
/* New C libio names. */
#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
=== modified file 'src/s/gnu.h'
--- a/src/s/gnu.h 2011-01-25 04:08:28 +0000
+++ b/src/s/gnu.h 2011-09-09 01:06:52 +0000
@@ -37,7 +37,7 @@
#ifdef emacs
#include <stdio.h> /* Get the definition of _IO_STDIO_H. */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
/* new C libio names */
#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
=== modified file 'src/sound.c'
--- a/src/sound.c 2011-06-24 21:25:22 +0000
+++ b/src/sound.c 2011-09-09 01:06:52 +0000
@@ -1013,7 +1013,7 @@
err = snd_pcm_hw_params_get_buffer_size (p->hwparams, &buffer_size);
if (err < 0)
- alsa_sound_perror("Unable to get buffer size for playback", err);
+ alsa_sound_perror ("Unable to get buffer size for playback", err);
err = snd_pcm_sw_params_current (p->handle, p->swparams);
if (err < 0)
@@ -1071,7 +1071,7 @@
snd_mixer_selem_set_playback_volume (e, chn, vol);
}
}
- snd_mixer_close(handle);
+ snd_mixer_close (handle);
}
}
}
@@ -1182,7 +1182,7 @@
else if (err == -ESTRPIPE)
{
while ((err = snd_pcm_resume (p->handle)) == -EAGAIN)
- sleep(1); /* wait until the suspend flag is released */
+ sleep (1); /* wait until the suspend flag is released */
if (err < 0)
{
err = snd_pcm_prepare (p->handle);
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2011-08-31 22:18:16 +0000
+++ b/src/sysdep.c 2011-09-09 01:06:52 +0000
@@ -300,7 +300,7 @@
{
while (1)
{
-#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__)
+#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined (__GNU__)
/* Note that kill returns -1 even if the process is just a zombie now.
But inevitably a SIGCHLD interrupt should be generated
and child_sig will do wait3 and make the process go away. */
@@ -1326,7 +1326,7 @@
Since the latter lossage is more benign, we may as well
lose that way. -- cph */
#ifdef FIONBIO
-#if defined(UNIX98_PTYS)
+#if defined (UNIX98_PTYS)
{
int on = 1;
ioctl (fd, FIONBIO, &on);
@@ -1499,7 +1499,7 @@
after a signal that sets the interrupt_input_pending flag. */
/* Non-interactive keyboard input goes through stdio, where we always
want restartable system calls. */
-# if defined (BROKEN_SA_RESTART) || defined(SYNC_INPUT)
+# if defined (BROKEN_SA_RESTART) || defined (SYNC_INPUT)
if (noninteractive)
# endif
new_action.sa_flags = SA_RESTART;
@@ -2040,7 +2040,7 @@
#endif
-#if defined(HPUX) && !defined(HAVE_PERROR)
+#if defined (HPUX) && !defined (HAVE_PERROR)
/* HPUX curses library references perror, but as far as we know
it won't be called. Anyway this definition will do for now. */
=== modified file 'src/termcap.c'
--- a/src/termcap.c 2011-08-05 02:15:35 +0000
+++ b/src/termcap.c 2011-09-09 01:06:52 +0000
@@ -400,7 +400,7 @@
if (termcap_name && (*termcap_name == '\\'
|| *termcap_name == '/'
|| termcap_name[1] == ':'))
- dostounix_filename(termcap_name);
+ dostounix_filename (termcap_name);
#endif
filep = termcap_name && valid_filename_p (termcap_name);
=== modified file 'src/termchar.h'
--- a/src/termchar.h 2011-03-09 02:12:00 +0000
+++ b/src/termchar.h 2011-09-09 01:06:52 +0000
@@ -207,6 +207,6 @@
(((f)->output_method == output_termcap \
|| (f)->output_method == output_msdos_raw) \
? (f)->terminal->display_info.tty \
- : (abort(), (struct tty_display_info *) 0))
+ : (abort (), (struct tty_display_info *) 0))
#define CURTTY() FRAME_TTY (SELECTED_FRAME())
=== modified file 'src/unexaix.c'
--- a/src/unexaix.c 2011-03-17 20:18:59 +0000
+++ b/src/unexaix.c 2011-09-09 01:06:52 +0000
@@ -221,24 +221,24 @@
}
#define CHECK_SCNHDR(ptr, name, flags) \
- if (strcmp(s->s_name, name) == 0) { \
+ if (strcmp (s->s_name, name) == 0) { \
if (s->s_flags != flags) { \
- fprintf(stderr, "unexec: %lx flags where %x expected in %s section.\n", \
- (unsigned long)s->s_flags, flags, name); \
+ fprintf (stderr, "unexec: %lx flags where %x expected in %s section.\n",
\
+ (unsigned long)s->s_flags, flags, name); \
} \
if (ptr) { \
- fprintf(stderr, "unexec: duplicate section header for section %s.\n", \
- name); \
+ fprintf (stderr, "unexec: duplicate section header for section %s.\n", \
+ name); \
} \
ptr = s; \
}
- CHECK_SCNHDR(f_thdr, _TEXT, STYP_TEXT);
- CHECK_SCNHDR(f_dhdr, _DATA, STYP_DATA);
- CHECK_SCNHDR(f_bhdr, _BSS, STYP_BSS);
- CHECK_SCNHDR(f_lhdr, _LOADER, STYP_LOADER);
- CHECK_SCNHDR(f_dbhdr, _DEBUG, STYP_DEBUG);
- CHECK_SCNHDR(f_tchdr, _TYPCHK, STYP_TYPCHK);
- CHECK_SCNHDR(f_xhdr, _EXCEPT, STYP_EXCEPT);
+ CHECK_SCNHDR (f_thdr, _TEXT, STYP_TEXT);
+ CHECK_SCNHDR (f_dhdr, _DATA, STYP_DATA);
+ CHECK_SCNHDR (f_bhdr, _BSS, STYP_BSS);
+ CHECK_SCNHDR (f_lhdr, _LOADER, STYP_LOADER);
+ CHECK_SCNHDR (f_dbhdr, _DEBUG, STYP_DEBUG);
+ CHECK_SCNHDR (f_tchdr, _TYPCHK, STYP_TYPCHK);
+ CHECK_SCNHDR (f_xhdr, _EXCEPT, STYP_EXCEPT);
}
if (f_thdr == 0)
@@ -541,7 +541,7 @@
#else
/* This worked (and was needed) before AIX 4.2.
I have no idea why. -- Mike */
- ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2);
+ ulong d_reloc = (ulong) &_data - ALIGN (f_ohdr.data_start, 2);
#endif
int * p;
=== modified file 'src/unexelf.c'
--- a/src/unexelf.c 2011-07-19 17:33:06 +0000
+++ b/src/unexelf.c 2011-09-09 01:06:52 +0000
@@ -453,7 +453,7 @@
long cbRfdOffset;
long cbExtOffset;
} HDRR, *pHDRR;
-#define cbHDRR sizeof(HDRR)
+#define cbHDRR sizeof (HDRR)
#define hdrNil ((pHDRR)0)
#endif
@@ -549,11 +549,11 @@
*/
#define OLD_SECTION_H(n) \
- (*(ElfW(Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize * (n)))
+ (*(ElfW (Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize *
(n)))
#define NEW_SECTION_H(n) \
- (*(ElfW(Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize * (n)))
+ (*(ElfW (Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize *
(n)))
#define NEW_PROGRAM_H(n) \
- (*(ElfW(Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize * (n)))
+ (*(ElfW (Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize *
(n)))
#define PATCH_INDEX(n) \
do { \
@@ -563,8 +563,8 @@
/* Round X up to a multiple of Y. */
-static ElfW(Addr)
-round_up (ElfW(Addr) x, ElfW(Addr) y)
+static ElfW (Addr)
+round_up (ElfW (Addr) x, ElfW (Addr) y)
{
int rem = x % y;
if (rem == 0)
@@ -581,7 +581,7 @@
static int
find_section (const char *name, const char *section_names, const char
*file_name,
- ElfW(Ehdr) *old_file_h, ElfW(Shdr) *old_section_h, int noerror)
+ ElfW (Ehdr) *old_file_h, ElfW (Shdr) *old_section_h, int noerror)
{
int idx;
@@ -635,19 +635,19 @@
/* Pointers to the file, program and section headers for the old and
new files. */
- ElfW(Ehdr) *old_file_h, *new_file_h;
- ElfW(Phdr) *old_program_h, *new_program_h;
- ElfW(Shdr) *old_section_h, *new_section_h;
+ ElfW (Ehdr) *old_file_h, *new_file_h;
+ ElfW (Phdr) *old_program_h, *new_program_h;
+ ElfW (Shdr) *old_section_h, *new_section_h;
/* Point to the section name table in the old file. */
char *old_section_names;
- ElfW(Addr) old_bss_addr, new_bss_addr;
- ElfW(Word) old_bss_size, new_data2_size;
- ElfW(Off) new_data2_offset;
- ElfW(Addr) new_data2_addr;
- ElfW(Off) old_bss_offset;
- ElfW(Word) new_data2_incr;
+ ElfW (Addr) old_bss_addr, new_bss_addr;
+ ElfW (Word) old_bss_size, new_data2_size;
+ ElfW (Off) new_data2_offset;
+ ElfW (Addr) new_data2_addr;
+ ElfW (Off) old_bss_offset;
+ ElfW (Word) new_data2_incr;
int n, nn;
int old_bss_index, old_sbss_index, old_plt_index;
@@ -690,9 +690,9 @@
/* Get pointers to headers & section names */
- old_file_h = (ElfW(Ehdr) *) old_base;
- old_program_h = (ElfW(Phdr) *) ((byte *) old_base + old_file_h->e_phoff);
- old_section_h = (ElfW(Shdr) *) ((byte *) old_base + old_file_h->e_shoff);
+ old_file_h = (ElfW (Ehdr) *) old_base;
+ old_program_h = (ElfW (Phdr) *) ((byte *) old_base + old_file_h->e_phoff);
+ old_section_h = (ElfW (Shdr) *) ((byte *) old_base + old_file_h->e_shoff);
old_section_names = (char *) old_base
+ OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset;
@@ -759,7 +759,7 @@
#if defined (emacs) || !defined (DEBUG)
new_break = sbrk (0);
- new_bss_addr = (ElfW(Addr)) new_break;
+ new_bss_addr = (ElfW (Addr)) new_break;
#else
new_bss_addr = old_bss_addr + old_bss_size + 0x1234;
#endif
@@ -806,9 +806,9 @@
if (new_base == MAP_FAILED)
fatal ("Can't allocate buffer for %s\n", old_name, 0);
- new_file_h = (ElfW(Ehdr) *) new_base;
- new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
- new_section_h = (ElfW(Shdr) *)
+ new_file_h = (ElfW (Ehdr) *) new_base;
+ new_program_h = (ElfW (Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
+ new_section_h = (ElfW (Shdr) *)
((byte *) new_base + old_file_h->e_shoff + new_data2_incr);
/* Make our new file, program and section headers as copies of the
@@ -844,7 +844,7 @@
for (n = new_file_h->e_phnum - 1; n >= 0; n--)
{
/* Compute maximum of all requirements for alignment of section. */
- ElfW(Word) alignment = (NEW_PROGRAM_H (n)).p_align;
+ ElfW (Word) alignment = (NEW_PROGRAM_H (n)).p_align;
if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
@@ -1078,8 +1078,8 @@
if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
&& old_mdebug_index != -1)
{
- int diff = NEW_SECTION_H(nn).sh_offset
- - OLD_SECTION_H(old_mdebug_index).sh_offset;
+ int diff = NEW_SECTION_H (nn).sh_offset
+ - OLD_SECTION_H (old_mdebug_index).sh_offset;
HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
if (diff)
@@ -1158,9 +1158,9 @@
if (NEW_SECTION_H (nn).sh_type == SHT_SYMTAB
|| NEW_SECTION_H (nn).sh_type == SHT_DYNSYM)
{
- ElfW(Shdr) *spt = &NEW_SECTION_H (nn);
+ ElfW (Shdr) *spt = &NEW_SECTION_H (nn);
unsigned int num = spt->sh_size / spt->sh_entsize;
- ElfW(Sym) * sym = (ElfW(Sym) *) (NEW_SECTION_H (nn).sh_offset +
+ ElfW (Sym) * sym = (ElfW (Sym) *) (NEW_SECTION_H (nn).sh_offset +
new_base);
for (; num--; sym++)
{
@@ -1178,7 +1178,7 @@
for (n = new_file_h->e_shnum - 1; n; n--)
{
byte *symnames;
- ElfW(Sym) *symp, *symendp;
+ ElfW (Sym) *symp, *symendp;
if (NEW_SECTION_H (n).sh_type != SHT_DYNSYM
&& NEW_SECTION_H (n).sh_type != SHT_SYMTAB)
@@ -1186,8 +1186,8 @@
symnames = ((byte *) new_base
+ NEW_SECTION_H (NEW_SECTION_H (n).sh_link).sh_offset);
- symp = (ElfW(Sym) *) (NEW_SECTION_H (n).sh_offset + new_base);
- symendp = (ElfW(Sym) *) ((byte *)symp + NEW_SECTION_H (n).sh_size);
+ symp = (ElfW (Sym) *) (NEW_SECTION_H (n).sh_offset + new_base);
+ symendp = (ElfW (Sym) *) ((byte *)symp + NEW_SECTION_H (n).sh_size);
for (; symp < symendp; symp ++)
{
@@ -1231,7 +1231,7 @@
that it can undo relocations performed by the runtime linker. */
for (n = new_file_h->e_shnum - 1; n; n--)
{
- ElfW(Shdr) section = NEW_SECTION_H (n);
+ ElfW (Shdr) section = NEW_SECTION_H (n);
/* Cause a compilation error if anyone uses n instead of nn below. */
#define n ((void) 0);
@@ -1263,21 +1263,21 @@
|| !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
".data1"))
{
- ElfW(Addr) offset = (NEW_SECTION_H (nn).sh_addr
+ ElfW (Addr) offset = (NEW_SECTION_H (nn).sh_addr
- NEW_SECTION_H (nn).sh_offset);
caddr_t reloc = old_base + section.sh_offset, end;
for (end = reloc + section.sh_size; reloc < end;
reloc += section.sh_entsize)
{
- ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
+ ElfW (Addr) addr = ((ElfW (Rel) *) reloc)->r_offset - offset;
#ifdef __alpha__
/* The Alpha ELF binutils currently have a bug that
sometimes results in relocs that contain all
zeroes. Work around this for now... */
- if (((ElfW(Rel) *) reloc)->r_offset == 0)
+ if (((ElfW (Rel) *) reloc)->r_offset == 0)
continue;
#endif
- memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
+ memcpy (new_base + addr, old_base + addr, sizeof (ElfW
(Addr)));
}
}
break;
=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c 2011-08-09 22:13:11 +0000
+++ b/src/unexmacosx.c 2011-09-09 01:06:52 +0000
@@ -478,7 +478,7 @@
{
num_unexec_regions = 0;
- emacs_zone->introspect->enumerator (mach_task_self(), 0,
+ emacs_zone->introspect->enumerator (mach_task_self (), 0,
MALLOC_PTR_REGION_RANGE_TYPE
| MALLOC_ADMIN_REGION_RANGE_TYPE,
(vm_address_t) emacs_zone,
=== modified file 'src/unexw32.c'
--- a/src/unexw32.c 2011-03-25 15:39:59 +0000
+++ b/src/unexw32.c 2011-09-09 01:06:52 +0000
@@ -123,8 +123,8 @@
is finished. */
#ifdef HAVE_NTGUI
/* determine WinMain args like crt0.c does */
- hinst = GetModuleHandle(NULL);
- lpCmdLine = GetCommandLine();
+ hinst = GetModuleHandle (NULL);
+ lpCmdLine = GetCommandLine ();
nCmdShow = SW_SHOWDEFAULT;
#endif
mainCRTStartup ();
@@ -326,7 +326,7 @@
#define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL))
#define RVA_TO_PTR(var,section,filedata) \
- ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
+ ((void *)(RVA_TO_OFFSET (var,section) + (filedata).file_base))
#define PTR_TO_OFFSET(ptr, pfile_data) \
((unsigned char *)(ptr) - (pfile_data)->file_base)
=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c 2011-06-14 04:49:24 +0000
+++ b/src/vm-limit.c 2011-09-09 01:06:52 +0000
@@ -237,7 +237,7 @@
(*warn_function) ("Warning: memory in use exceeds lisp pointer size");
}
-#if !defined(CANNOT_DUMP) || !defined(SYSTEM_MALLOC)
+#if !defined (CANNOT_DUMP) || !defined (SYSTEM_MALLOC)
/* Some systems that cannot dump also cannot implement these. */
/*
=== modified file 'src/w16select.c'
--- a/src/w16select.c 2011-01-25 04:08:28 +0000
+++ b/src/w16select.c 2011-09-09 01:06:52 +0000
@@ -110,7 +110,7 @@
<> 1700H: AL = Major version number
AH = Minor version number */
regs.x.ax = 0x1700;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
return regs.x.ax;
}
@@ -133,7 +133,7 @@
Return Values AX == 0: Clipboard already open
<> 0: Clipboard opened */
regs.x.ax = 0x1701;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
return regs.x.ax;
}
@@ -147,7 +147,7 @@
Return Values AX == 0: Error occurred
<> 0: OK, Clipboard emptied */
regs.x.ax = 0x1702;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
return regs.x.ax;
}
@@ -294,7 +294,7 @@
regs.x.cx = truelen & 0xffff;
regs.x.es = xbuf_addr >> 4;
regs.x.bx = xbuf_addr & 15;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
free_xfer_buf ();
@@ -320,7 +320,7 @@
the clipboard. */
regs.x.ax = 0x1704;
regs.x.dx = Format;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
return ( (((unsigned)regs.x.dx) << 16) | regs.x.ax);
}
@@ -353,7 +353,7 @@
regs.x.dx = Format;
regs.x.es = xbuf_addr >> 4;
regs.x.bx = xbuf_addr & 15;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
if (regs.x.ax != 0)
{
unsigned char null_char = '\0';
@@ -415,7 +415,7 @@
Return Values AX == 0: Error occurred
<> 0: OK */
regs.x.ax = 0x1708;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
return regs.x.ax;
}
@@ -432,7 +432,7 @@
regs.x.ax = 0x1709;
regs.x.si = Size >> 16;
regs.x.cx = Size & 0xffff;
- __dpmi_int(0x2f, ®s);
+ __dpmi_int (0x2f, ®s);
return ((unsigned)regs.x.dx << 16) | regs.x.ax;
}
=== modified file 'src/w32.c'
--- a/src/w32.c 2011-07-09 07:00:58 +0000
+++ b/src/w32.c 2011-09-09 01:06:52 +0000
@@ -95,7 +95,7 @@
#include <tlhelp32.h>
#include <psapi.h>
#include <w32api.h>
-#if !defined(__MINGW32__) || __W32API_MAJOR_VERSION < 3 ||
(__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
+#if !defined (__MINGW32__) || __W32API_MAJOR_VERSION < 3 ||
(__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
/* This either is not in psapi.h or guarded by higher value of
_WIN32_WINNT than what we use. w32api supplied with MinGW 3.15
defines it in psapi.h */
@@ -6212,7 +6212,7 @@
for (;;)
{
- n = sys_read(fd, (char*)buf, sz);
+ n = sys_read (fd, (char*)buf, sz);
if (n >= 0)
return n;
@@ -6222,7 +6222,7 @@
if (err == EWOULDBLOCK)
{
/* Set a small timeout. */
- EMACS_SET_SECS_USECS(timeout, 1, 0);
+ EMACS_SET_SECS_USECS (timeout, 1, 0);
FD_ZERO (&fdset);
FD_SET ((int)fd, &fdset);
@@ -6252,7 +6252,7 @@
{
struct Lisp_Process *process = (struct Lisp_Process *)p;
int fd = process->outfd;
- ssize_t n = sys_write(fd, buf, sz);
+ ssize_t n = sys_write (fd, buf, sz);
/* 0 or more bytes written means everything went fine. */
if (n >= 0)
=== modified file 'src/w32term.h'
--- a/src/w32term.h 2011-06-22 06:16:16 +0000
+++ b/src/w32term.h 2011-09-09 01:06:52 +0000
@@ -68,7 +68,7 @@
#endif
};
-extern void w32_regenerate_palette(struct frame *f);
+extern void w32_regenerate_palette (struct frame *f);
/* For each display (currently only one on w32), we have a structure that
=== modified file 'src/widget.c'
--- a/src/widget.c 2011-07-10 08:20:10 +0000
+++ b/src/widget.c 2011-09-09 01:06:52 +0000
@@ -86,12 +86,12 @@
#undef XtOffset
#define XtOffset(p_type,field) \
((Cardinal) (((char *) (&(((p_type)0)->field))) - ((char *)0)))
-#define offset(field) XtOffset(EmacsFrame, emacs_frame.field)
+#define offset(field) XtOffset (EmacsFrame, emacs_frame.field)
static XtResource resources[] = {
- {XtNgeometry, XtCGeometry, XtRString, sizeof(String),
+ {XtNgeometry, XtCGeometry, XtRString, sizeof (String),
offset (geometry), XtRString, (XtPointer) 0},
- {XtNiconic, XtCIconic, XtRBoolean, sizeof(Boolean),
+ {XtNiconic, XtCIconic, XtRBoolean, sizeof (Boolean),
offset (iconic), XtRImmediate, (XtPointer) False},
{XtNemacsFrame, XtCEmacsFrame, XtRPointer, sizeof (XtPointer),
@@ -105,12 +105,12 @@
offset (internal_border_width), XtRImmediate, (XtPointer)4},
{XtNinterline, XtCInterline, XtRInt, sizeof (int),
offset (interline), XtRImmediate, (XtPointer)0},
- {XtNfont, XtCFont, XtRFontStruct, sizeof(struct font *),
- offset(font),XtRString, DEFAULT_FACE_FONT},
- {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
- offset(foreground_pixel), XtRString, "XtDefaultForeground"},
- {XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel),
- offset(cursor_color), XtRString, "XtDefaultForeground"},
+ {XtNfont, XtCFont, XtRFontStruct, sizeof (struct font *),
+ offset (font),XtRString, DEFAULT_FACE_FONT},
+ {XtNforeground, XtCForeground, XtRPixel, sizeof (Pixel),
+ offset (foreground_pixel), XtRString, "XtDefaultForeground"},
+ {XtNcursorColor, XtCForeground, XtRPixel, sizeof (Pixel),
+ offset (cursor_color), XtRString, "XtDefaultForeground"},
{XtNbarCursor, XtCBarCursor, XtRBoolean, sizeof (Boolean),
offset (bar_cursor), XtRImmediate, (XtPointer)0},
{XtNvisualBell, XtCVisualBell, XtRBoolean, sizeof (Boolean),
@@ -141,7 +141,7 @@
{ /* core fields */
/* superclass */ &widgetClassRec,
/* class_name */ "EmacsFrame",
- /* widget_size */ sizeof(EmacsFrameRec),
+ /* widget_size */ sizeof (EmacsFrameRec),
/* class_initialize */ 0,
/* class_part_initialize */ 0,
/* class_inited */ FALSE,
@@ -151,7 +151,7 @@
/* actions */ 0, /*emacsFrameActionsTable*/
/* num_actions */ 0, /*XtNumber (emacsFrameActionsTable)*/
/* resources */ resources,
- /* resource_count */ XtNumber(resources),
+ /* resource_count */ XtNumber (resources),
/* xrm_class */ NULLQUARK,
/* compress_motion */ TRUE,
/* compress_exposure */ TRUE,
@@ -574,7 +574,7 @@
never actually get used as a background tile!
*/
blank_tile
- = XCreatePixmapFromBitmapData (XtDisplay(ew),
+ = XCreatePixmapFromBitmapData (XtDisplay (ew),
RootWindowOfScreen (XtScreen (ew)),
setup_frame_cursor_bits, 2, 2,
0, 1, ew->core.depth);
=== modified file 'src/window.c'
--- a/src/window.c 2011-09-08 15:45:20 +0000
+++ b/src/window.c 2011-09-09 01:06:52 +0000
@@ -775,7 +775,7 @@
}
static void
-calc_absolute_offset(struct window *w, int *add_x, int *add_y)
+calc_absolute_offset (struct window *w, int *add_x, int *add_y)
{
struct frame *f = XFRAME (w->frame);
*add_y = f->top_pos;
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2011-09-07 18:14:26 +0000
+++ b/src/xdisp.c 2011-09-09 01:06:52 +0000
@@ -606,7 +606,7 @@
if (CACHE) \
bidi_unshelve_cache (CACHE, 1); \
ITCOPY = ITORIG; \
- CACHE = bidi_shelve_cache(); \
+ CACHE = bidi_shelve_cache (); \
} while (0)
#define RESTORE_IT(pITORIG,pITCOPY,CACHE) \
@@ -1916,7 +1916,7 @@
rectangle as wide as the glyph, but use a canonical character
width instead. */
wd = glyph->pixel_width - 1;
-#if defined(HAVE_NTGUI) || defined(HAVE_NS)
+#if defined (HAVE_NTGUI) || defined (HAVE_NS)
wd++; /* Why? */
#endif
=== modified file 'src/xfaces.c'
--- a/src/xfaces.c 2011-08-29 19:58:56 +0000
+++ b/src/xfaces.c 2011-09-09 01:06:52 +0000
@@ -2579,7 +2579,7 @@
}
else if (EQ (keyword, QCstipple))
{
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
Lisp_Object pixmap_p = Fbitmap_spec_p (value);
if (!NILP (pixmap_p))
to[LFACE_STIPPLE_INDEX] = value;
@@ -3095,7 +3095,7 @@
}
else if (EQ (attr, QCstipple))
{
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
&& !NILP (value)
&& NILP (Fbitmap_spec_p (value)))
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2011-08-29 19:59:51 +0000
+++ b/src/xfns.c 2011-09-09 01:06:52 +0000
@@ -105,7 +105,7 @@
#include "../lwlib/xlwmenu.h"
#endif
-#if !defined(NO_EDITRES)
+#if !defined (NO_EDITRES)
#define HACK_EDITRES
extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
#endif /* not defined NO_EDITRES */
@@ -3274,7 +3274,7 @@
"internalBorderWidth", "internalBorderWidth",
RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qvertical_scroll_bars,
-#if defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS)
+#if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
Qright,
#else
Qleft,
@@ -3443,7 +3443,7 @@
BLOCK_INPUT;
/* Set machine name and pid for the purpose of window managers. */
- set_machine_and_pid_properties(f);
+ set_machine_and_pid_properties (f);
/* Set the WM leader property. GTK does this itself, so this is not
needed when using GTK. */
@@ -5594,7 +5594,7 @@
BLOCK_INPUT;
- GCPRO2(font_param, font);
+ GCPRO2 (font_param, font);
XSETFONT (font, FRAME_FONT (f));
font_param = Ffont_get (font, intern (":name"));
=== modified file 'src/xmenu.c'
--- a/src/xmenu.c 2011-07-10 16:55:22 +0000
+++ b/src/xmenu.c 2011-09-09 01:06:52 +0000
@@ -1947,7 +1947,7 @@
LWLIB_ID dialog_id;
if (!FRAME_X_P (f))
- abort();
+ abort ();
dialog_id = widget_id_tick++;
#ifdef USE_LUCID
@@ -2095,7 +2095,7 @@
/* Frame title: 'Q' = Question, 'I' = Information.
Can also have 'E' = Error if, one day, we want
a popup for errors. */
- if (NILP(header))
+ if (NILP (header))
dialog_name[0] = 'Q';
else
dialog_name[0] = 'I';
=== modified file 'src/xrdb.c'
--- a/src/xrdb.c 2011-08-05 02:15:35 +0000
+++ b/src/xrdb.c 2011-09-09 01:06:52 +0000
@@ -602,8 +602,8 @@
XrmClass classlist[100];
XrmRepresentation type;
- XrmStringToNameList(name, namelist);
- XrmStringToClassList(class, classlist);
+ XrmStringToNameList (name, namelist);
+ XrmStringToClassList (class, classlist);
if (XrmQGetResource (rdb, namelist, classlist, &type, &value) == True
&& (type == expected_type))
=== modified file 'src/xselect.c'
--- a/src/xselect.c 2011-08-16 18:44:32 +0000
+++ b/src/xselect.c 2011-09-09 01:06:52 +0000
@@ -592,7 +592,8 @@
#endif /* TRACE_SELECTION */
static void
-x_reply_selection_request (struct input_event *event, struct x_display_info
*dpyinfo)
+x_reply_selection_request (struct input_event *event,
+ struct x_display_info *dpyinfo)
{
XEvent reply_base;
XSelectionEvent *reply = &(reply_base.xselection);
@@ -1079,7 +1080,8 @@
this awaited property change. */
static struct prop_location *
-expect_property_change (Display *display, Window window, Atom property, int
state)
+expect_property_change (Display *display, Window window,
+ Atom property, int state)
{
struct prop_location *pl = (struct prop_location *) xmalloc (sizeof *pl);
pl->identifier = ++prop_location_identifier;
@@ -2472,7 +2474,8 @@
/* Convert an XClientMessageEvent to a Lisp event of type DRAG_N_DROP_EVENT.
*/
int
-x_handle_dnd_message (struct frame *f, XClientMessageEvent *event, struct
x_display_info *dpyinfo, struct input_event *bufp)
+x_handle_dnd_message (struct frame *f, XClientMessageEvent *event,
+ struct x_display_info *dpyinfo, struct input_event *bufp)
{
Lisp_Object vec;
Lisp_Object frame;
@@ -2550,22 +2553,24 @@
with the high 16 bits from the car and the lower 16 bit from the cdr.
If more values than fits into the event is given, the excessive values
are ignored. */)
- (Lisp_Object display, Lisp_Object dest, Lisp_Object from, Lisp_Object
message_type, Lisp_Object format, Lisp_Object values)
+ (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
+ Lisp_Object message_type, Lisp_Object format, Lisp_Object values)
{
struct x_display_info *dpyinfo = check_x_display_info (display);
CHECK_STRING (message_type);
- x_send_client_event(display, dest, from,
- XInternAtom (dpyinfo->display,
- SSDATA (message_type),
- False),
- format, values);
+ x_send_client_event (display, dest, from,
+ XInternAtom (dpyinfo->display,
+ SSDATA (message_type),
+ False),
+ format, values);
return Qnil;
}
void
-x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
Atom message_type, Lisp_Object format, Lisp_Object values)
+x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
+ Atom message_type, Lisp_Object format, Lisp_Object values)
{
struct x_display_info *dpyinfo = check_x_display_info (display);
Window wdest;
=== modified file 'src/xsettings.c'
--- a/src/xsettings.c 2011-07-12 16:47:56 +0000
+++ b/src/xsettings.c 2011-09-09 01:06:52 +0000
@@ -812,7 +812,7 @@
g_type_init ();
#endif
- schemas = g_settings_list_schemas();
+ schemas = g_settings_list_schemas ();
if (schemas == NULL) return;
while (! schema_found && *schemas != NULL)
schema_found = strcmp (*schemas++, GSETTINGS_SCHEMA) == 0;
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2011-09-01 14:44:49 +0000
+++ b/src/xterm.c 2011-09-09 01:06:52 +0000
@@ -100,7 +100,7 @@
#endif
#ifdef USE_X_TOOLKIT
-#if !defined(NO_EDITRES)
+#if !defined (NO_EDITRES)
#define HACK_EDITRES
extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
#endif /* not NO_EDITRES */
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2011-08-29 20:04:46 +0000
+++ b/src/xterm.h 2011-09-09 01:06:52 +0000
@@ -682,7 +682,7 @@
#define GDK_WINDOW_XID(w) GDK_WINDOW_XWINDOW (w)
#define DEFAULT_GDK_DISPLAY() GDK_DISPLAY ()
#define gtk_widget_get_preferred_size(a, ign, b) \
- gtk_widget_size_request(a, b)
+ gtk_widget_size_request (a, b)
#endif
#define GTK_WIDGET_TO_X_WIN(w) \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105689: Whitespace changes.,
Juanma Barranquero <=