A slew of whitespace cleanups.

diff --git a/Makefile.am b/Makefile.am
index 1ad895a0678f64835e5af9075a922feac3dab584..ff82510c7c90b9cd6efd12e691e496f5a87b734f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,12 +13,12 @@
 ### it under the terms of the GNU General Public License as published by
 ### the Free Software Foundation; either version 2 of the License, or
 ### (at your option) any later version.
-### 
+###
 ### X tools is distributed in the hope that it will be useful,
 ### but WITHOUT ANY WARRANTY; without even the implied warranty of
 ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ### GNU General Public License for more details.
-### 
+###
 ### You should have received a copy of the GNU General Public License
 ### along with X tools; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

diff --git a/README b/README
index 705c58cbfed650399181d0832ac41ee2d3fd5faf..02c4d4a33e56783036425014c18102c2e806bd4f 100644 (file)
--- a/README
+++ b/README
@@ -79,4 +79,3 @@ Notes and things
        If anyone wants to do an Xaw version of the GTK bits then I'll
        include that in the distribution; people using Motif or Qt need
        not apply.
-

diff --git a/configure.ac b/configure.ac
index e338570d3e9347c823caaa9b1e5c1150b6d56ff7..8fee120902d47460391e1f64cb2e75049cd1eeca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,12 +13,12 @@ dnl X tools is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation; either version 2 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl X tools is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with X tools; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

diff --git a/debian/changelog b/debian/changelog
index 960db9fd0c73e39a5539c1e997a49e68ae76afc8..a3c9e933918bca3c8c7fbde729d16f765ce442fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ xtoys (1.4.1) experimental; urgency=low
 
 xtoys (1.4.0) experimental; urgency=low
 
-  * GTK-based tools now written in Python, and use GTK 2.  
+  * GTK-based tools now written in Python, and use GTK 2.
   * xtell and xwait replaced by single xatom program.
   * Internal: new build system.
 

diff --git a/debian/control b/debian/control
index 139b25a27946a777712497286291f897aecef3d4..e46350d2c1a143835c5a53fce532950077086a62 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xtoys
 Section: x11
 Priority: extra
 Build-Depends:
-       libx11-dev, mlib-dev (>= 2.0.4), debhelper (>= 5), 
+       libx11-dev, mlib-dev (>= 2.0.4), debhelper (>= 5),
        python-central, python (>= 2.4), python-gtk2
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4
@@ -25,7 +25,7 @@ Description: A collection of small X11 tools
  We have:
  xcatch -- run a program, displaying its output in a scrolling window if
    there is any
- xgetline -- pops up a dialogue, reads a line of text, and reports the 
+ xgetline -- pops up a dialogue, reads a line of text, and reports the
    entered line on stdout; can do passwords, history with optional size
    limit, or simple selection from a list
  xmsg -- pop up a dialogue showing a message and a bunch of buttons, and

diff --git a/libxatom.c b/libxatom.c
index 3bca18f2f3b2f2b9bca912201dcbc83a0a2f3fe6..5dea9efb9462bdba589ad432eab93cae276b11a9 100644 (file)
--- a/libxatom.c
+++ b/libxatom.c
@@ -82,7 +82,7 @@ Atom xatom_get(Display *d, Window w, Atom p)
                         &type, &fmt,   /* Actual type and format */
                         &n, &left,     /* Amount read, and bytes left */
                         &buf)          /* Where to put the buffer */
-        != Success ||
+       != Success ||
       type != XA_ATOM ||
       n < 1 || fmt < 32)
     return (None);

diff --git a/xatom.c b/xatom.c
index 826085cd7c0c05e87d65c1386271802a637e4e7f..e0300217f55531edfff1f14e5dbe8e6b03630f08 100644 (file)
--- a/xatom.c
+++ b/xatom.c
@@ -235,12 +235,12 @@ const struct cmd *findcmd(const char *name)
   for (c = cmds; c->name; c++) {
     if (strncmp(name, c->name, sz) == 0) {
       if (c->name[sz] == 0) {
-        chosen = c;
-        break;
+       chosen = c;
+       break;
       } else if (chosen)
-        die(EXIT_FAILURE, "ambiguous command name `%s'", name);
+       die(EXIT_FAILURE, "ambiguous command name `%s'", name);
       else
-        chosen = c;
+       chosen = c;
     }
   }
   if (!chosen)
@@ -308,10 +308,10 @@ int main(int argc, char *argv[])
 
   for (;;) {
     static struct option opt[] = {
-      { "help",        0,                      0,      'h' },
-      { "usage",       0,                      0,      'u' },
-      { "version",     0,                      0,      'v' },
-      { "display",     OPTF_ARGREQ,            0,      'd' },
+      { "help",                0,                      0,      'h' },
+      { "usage",       0,                      0,      'u' },
+      { "version",     0,                      0,      'v' },
+      { "display",     OPTF_ARGREQ,            0,      'd' },
       { "window",      OPTF_ARGREQ,            0,      'w' },
       {        0,              0,                      0,      0 }
     };

diff --git a/xcatch.1 b/xcatch.1
index 5c2067082fccf851e3d9af972fed225c96e9bc32..c7ae65fd481be01d63961abc6d8c7a16874e1f82 100644 (file)
--- a/xcatch.1
+++ b/xcatch.1
@@ -30,7 +30,7 @@ reads from its own standard input.
 .PP
 It is better to write
 .IP
-.B xcatch 
+.B xcatch
 .I command args
 .PP
 than
@@ -49,7 +49,7 @@ to put the command line in its title bar.
 .SS Options
 .TP
 .BI "\-F, \-\-font " font
-Display output text in 
+Display output text in
 .I font
 rather than GTK's default.
 .TP

diff --git a/xmsg.1 b/xmsg.1
index e5c21b43fdbf9ac3f56b2000cc29f1a9ab83f081..debc9260b6dab33ffaeb9e63cf2538c1e726fa4a 100644 (file)
--- a/xmsg.1
+++ b/xmsg.1
@@ -41,7 +41,7 @@ is
 .RB ` ! '
 then that character is removed.  (Hence, if you really wanted to show
 the message
-.RB ` \- ', 
+.RB ` \- ',
 you need to pass
 .RB ` !\- '.)
 Conscientious script authors will prefix strings appropriately.
@@ -58,7 +58,7 @@ argument has the form
 .IR label .
 The
 .I label
-is either a text string, or a GTK stock-id (e.g., 
+is either a text string, or a GTK stock-id (e.g.,
 .BR gtk-ok ).
 Mnemonic characters in button labels may be marked by prefixing them
 with underscores.  Write two underscores if you really want a literal

diff --git a/xscsize.c b/xscsize.c
index dcdbbd144ae116416291af564e1bf2e989e4a01f..15abcc0bfaee7cb2f1e78a9d4684f15f91724a07 100644 (file)
--- a/xscsize.c
+++ b/xscsize.c
@@ -86,10 +86,10 @@ int main(int argc, char *argv[])
 
   for (;;) {
     static struct option opt[] = {
-      { "help",        0,              0,      'h' },
-      { "usage",       0,              0,      'u' },
-      { "version",     0,              0,      'v' },
-      { "display",     OPTF_ARGREQ,    0,      'd' },
+      { "help",                0,              0,      'h' },
+      { "usage",       0,              0,      'u' },
+      { "version",     0,              0,      'v' },
+      { "display",     OPTF_ARGREQ,    0,      'd' },
       { "bourne-shell",        0,              0,      'b' },
       { "c-shell",     0,              0,      'c' },
       { "export",      0,              0,      'x' },