Attached patch cleans "./configure --help" output. Currently it's
columns are misaligned and bit hard to read.
It also includes two Sawmill->Sawfish fixes (only ones remaining in src
and lisp directories).
diff -ur sawfish.orig/configure.in sawfish/configure.in
--- sawfish.orig/configure.in 2009-12-27 13:48:25.000000000 +0200
+++ sawfish/configure.in 2009-12-27 13:58:07.000000000 +0200
@@ -68,8 +68,8 @@
CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
AC_ARG_WITH(xorg-x11r7,
- [ --with-xorg-x11r7 Use X.Org X11R7
- --without-xorg-x11r7 Use X.Org/XFree86 X11R6 instead], [],
[with_xorg_x11r7=yes])
+ [ --with-xorg-x11r7 Use X.Org X11R7
+ --without-xorg-x11r7 Use X.Org/XFree86 X11R6 instead], [],
[with_xorg_x11r7=yes])
if test "$with_xorg_x11r7" != "no"; then
@@ -176,7 +176,7 @@
dnl Checks for pango
AC_ARG_WITH(pango,
- [ --with-pango Use Pango instead of Xft
+ [ --with-pango Use Pango instead of Xft
--without-pango], [], [with_pango=yes])
if test "$with_pango" = "yes"; then
@@ -232,8 +232,8 @@
dnl Check for image handling libraries
AC_ARG_WITH(gdk-pixbuf,
- [ --with-gdk-pixbuf Use gdk-pixbuf for image management
- --without-gdk-pixbuf Use Imlib1 instead], [],
[with_gdk_pixbuf=yes])
+ [ --with-gdk-pixbuf Use gdk-pixbuf for image management
+ --without-gdk-pixbuf Use Imlib1 instead], [], [with_gdk_pixbuf=yes])
if test "$with_gdk_pixbuf" != "no"; then
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= ${GTK_MIN_VER}
@@ -264,8 +264,8 @@
dnl Check wether to add 9 mouse buttons support
AC_ARG_WITH(nine-mousebuttons,
- [ --with-nine-mousebuttons Add support for mouse-buttons 6 - 9
- --without-nine-mousebuttons], [], [with_nine_mbtns=yes])
+ [ --with-nine-mousebuttons Add support for mouse-buttons 6 - 9
+ --without-nine-mousebuttons], [], [with_nine_mbtns=yes])
if test "$with_nine_mbtns" = "yes"; then
AC_DEFINE(HAVE_NINE_MOUSEBUTTONS, 1, [Support for 9 Mouse Buttons])
@@ -277,8 +277,8 @@
dnl Check wether to install mo files
AC_ARG_WITH(nls,
- [ --with-nls Install translations
- --without-nls], [], [with_nls=yes])
+ [ --with-nls Install translations
+ --without-nls], [], [with_nls=yes])
if test "$with_nls" = "yes"; then
SUBDIRS="${SUBDIRS} po"
diff -ur sawfish.orig/lisp/sawfish/wm/workspace.jl
sawfish/lisp/sawfish/wm/workspace.jl
--- sawfish.orig/lisp/sawfish/wm/workspace.jl 2009-12-27 13:48:25.000000000
+0200
+++ sawfish/lisp/sawfish/wm/workspace.jl 2009-12-27 18:16:03.000000000
+0200
@@ -20,7 +20,7 @@
;; Commentary:
-;; Sawmill's workspace are organised as a 1-dimensional continuum, from
+;; Sawfish's workspace are organised as a 1-dimensional continuum, from
;; -infinity to +infinity. Normally the user only sees a small part of
;; this continuum, from the first non-empty workspace to the last
;; non-empty workspace
diff -ur sawfish.orig/src/display.c sawfish/src/display.c
--- sawfish.orig/src/display.c 2009-12-27 18:16:32.000000000 +0200
+++ sawfish/src/display.c 2009-12-27 18:15:45.000000000 +0200
@@ -369,7 +369,7 @@
}
/* This should _never_ be used in Real Life; only for
- debugging. Sawmill tries to work out when the error
+ debugging. Sawfish tries to work out when the error
handle might be called (i.e. after any XGet, XQuery, XFetch
type function) and then call emit_pending_destroys ()
as soon as possible, so that there's as small as possible
