sawfish r4345 - in trunk: . lisp/sawfish lisp/sawfish/wm lisp/sawfish/wm/animation lisp/sawfish/wm/commands lisp/sawfish/wm/ext lisp/sawfish/wm/gnome lisp/sawfish/wm/placement lisp/sawfish/wm/session lisp/sawfish/wm/state lisp/sawfish/wm/theming lisp/sawfish/wm/util man src



Author: chrisb
Date: Tue Dec 30 20:27:38 2008
New Revision: 4345
URL: http://svn.gnome.org/viewvc/sawfish?rev=4345&view=rev

Log:
fully renamed to sawfish from sawmill
- any reference in the copyright header
- any function
- any other occurence of sawmill
- any file with sawmill in it's name

** You might need to run 'make distclean' before you can compile sawfish again,
** If you got this revision via 'svn up'


Added:
   trunk/man/sawfish.texi   (props changed)
      - copied unchanged from r4332, /trunk/man/sawmill.texi
   trunk/src/sawfish.h   (contents, props changed)
      - copied, changed from r4332, /trunk/src/sawmill.h
   trunk/src/sawfish_subrs.h   (contents, props changed)
      - copied, changed from r4332, /trunk/src/sawmill_subrs.h
Removed:
   trunk/man/sawmill.texi
   trunk/src/sawmill.h
   trunk/src/sawmill_subrs.h
Modified:
   trunk/ChangeLog
   trunk/Makedefs.in
   trunk/lisp/sawfish/wm.jl
   trunk/lisp/sawfish/wm/animation/outline.jl
   trunk/lisp/sawfish/wm/autoload.jl
   trunk/lisp/sawfish/wm/commands/cycle.jl
   trunk/lisp/sawfish/wm/commands/describe.jl
   trunk/lisp/sawfish/wm/commands/gnome.jl
   trunk/lisp/sawfish/wm/commands/groups.jl
   trunk/lisp/sawfish/wm/commands/help.jl
   trunk/lisp/sawfish/wm/commands/move-cursor.jl
   trunk/lisp/sawfish/wm/commands/move-resize.jl
   trunk/lisp/sawfish/wm/commands/raise-commands.jl
   trunk/lisp/sawfish/wm/commands/size-window.jl
   trunk/lisp/sawfish/wm/commands/slide-window.jl
   trunk/lisp/sawfish/wm/commands/viewport-linear.jl
   trunk/lisp/sawfish/wm/commands/x-cycle.jl
   trunk/lisp/sawfish/wm/cursors.jl
   trunk/lisp/sawfish/wm/custom-defaults.jl
   trunk/lisp/sawfish/wm/custom.jl
   trunk/lisp/sawfish/wm/customize.jl
   trunk/lisp/sawfish/wm/defaults.jl
   trunk/lisp/sawfish/wm/ext/3d-hack.jl
   trunk/lisp/sawfish/wm/ext/audio-events.jl
   trunk/lisp/sawfish/wm/ext/auto-raise.jl
   trunk/lisp/sawfish/wm/ext/beos-window-menu.jl
   trunk/lisp/sawfish/wm/ext/edge-flip.jl
   trunk/lisp/sawfish/wm/ext/error-handler.jl
   trunk/lisp/sawfish/wm/ext/hide-dialogs.jl
   trunk/lisp/sawfish/wm/ext/match-window.jl
   trunk/lisp/sawfish/wm/ext/old-window-menu.jl
   trunk/lisp/sawfish/wm/ext/shade-hover.jl
   trunk/lisp/sawfish/wm/ext/tooltips.jl
   trunk/lisp/sawfish/wm/ext/window-history.jl
   trunk/lisp/sawfish/wm/focus.jl
   trunk/lisp/sawfish/wm/frames.jl
   trunk/lisp/sawfish/wm/gaol.jl
   trunk/lisp/sawfish/wm/gnome/integration.jl
   trunk/lisp/sawfish/wm/gnome/match-window.jl
   trunk/lisp/sawfish/wm/gnome/menus.jl
   trunk/lisp/sawfish/wm/keymaps.jl
   trunk/lisp/sawfish/wm/menus.jl
   trunk/lisp/sawfish/wm/misc.jl
   trunk/lisp/sawfish/wm/placement.jl
   trunk/lisp/sawfish/wm/placement/smart.jl
   trunk/lisp/sawfish/wm/server.jl
   trunk/lisp/sawfish/wm/session/init.jl
   trunk/lisp/sawfish/wm/session/load.jl
   trunk/lisp/sawfish/wm/session/save.jl
   trunk/lisp/sawfish/wm/stacking.jl
   trunk/lisp/sawfish/wm/state/configure.jl
   trunk/lisp/sawfish/wm/state/gnome.jl
   trunk/lisp/sawfish/wm/state/iconify.jl
   trunk/lisp/sawfish/wm/state/ignored.jl
   trunk/lisp/sawfish/wm/state/maximize.jl
   trunk/lisp/sawfish/wm/state/mwm.jl
   trunk/lisp/sawfish/wm/state/open-look.jl
   trunk/lisp/sawfish/wm/state/shading.jl
   trunk/lisp/sawfish/wm/state/transient.jl
   trunk/lisp/sawfish/wm/state/wm-spec.jl
   trunk/lisp/sawfish/wm/theming/make-theme-preview.jl
   trunk/lisp/sawfish/wm/theming/make-theme.jl
   trunk/lisp/sawfish/wm/user.jl
   trunk/lisp/sawfish/wm/util/compat.jl
   trunk/lisp/sawfish/wm/util/decode-events.jl
   trunk/lisp/sawfish/wm/util/edges.jl
   trunk/lisp/sawfish/wm/util/groups.jl
   trunk/lisp/sawfish/wm/util/gtkrc.jl
   trunk/lisp/sawfish/wm/util/keymap.jl
   trunk/lisp/sawfish/wm/util/play-audio.jl
   trunk/lisp/sawfish/wm/util/prompt-extras.jl
   trunk/lisp/sawfish/wm/util/prompt-wm.jl
   trunk/lisp/sawfish/wm/util/rects.jl
   trunk/lisp/sawfish/wm/util/window-order.jl
   trunk/lisp/sawfish/wm/util/window-outline.jl
   trunk/lisp/sawfish/wm/util/with-output.jl
   trunk/lisp/sawfish/wm/viewport.jl
   trunk/lisp/sawfish/wm/window-anim.jl
   trunk/lisp/sawfish/wm/workspace.jl
   trunk/man/Makefile.in
   trunk/man/news.texi
   trunk/src/client.c
   trunk/src/colors.c
   trunk/src/cursors.c
   trunk/src/display.c
   trunk/src/events.c
   trunk/src/flippers.c
   trunk/src/fonts.c
   trunk/src/frames.c
   trunk/src/functions.c
   trunk/src/gradient.c
   trunk/src/gtk-style.c
   trunk/src/images.c
   trunk/src/keys.c
   trunk/src/keys.h
   trunk/src/libclient.c
   trunk/src/libclient.h
   trunk/src/main.c
   trunk/src/multihead.c
   trunk/src/pixmap-cache.c
   trunk/src/play-sample.c
   trunk/src/property-cache.c
   trunk/src/selection.c
   trunk/src/server.c
   trunk/src/server.h
   trunk/src/session.c
   trunk/src/stacking-list.c
   trunk/src/windows.c
   trunk/src/x.c

Modified: trunk/Makedefs.in
==============================================================================
--- trunk/Makedefs.in	(original)
+++ trunk/Makedefs.in	Tue Dec 30 20:27:38 2008
@@ -53,7 +53,7 @@
 #LIBOBJS= LIBOBJS@
 LIBOBJS=
 X11_CFLAGS= X_CFLAGS@ @XFT_CFLAGS@
-X11_LIBS= X_PRE_LIBS@ -lX11 @X_LIBS@ @X_EXTRA_LIBS@
+X11_LIBS=-lX11 @X_LIBS@ @X_EXTRA_LIBS@
 EXTRA_X11_LIBS= XINERAMA_LIBS@ @XRANDR_LIBS@ @XFT_LIBS@ -lXext
 IMLIB_CFLAGS= IMLIB_CFLAGS@
 IMLIB_LIBS= IMLIB_LIBS@

Modified: trunk/lisp/sawfish/wm.jl
==============================================================================
--- trunk/lisp/sawfish/wm.jl	(original)
+++ trunk/lisp/sawfish/wm.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.  If not, write to
+   along with sawfish; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 

Modified: trunk/lisp/sawfish/wm/animation/outline.jl
==============================================================================
--- trunk/lisp/sawfish/wm/animation/outline.jl	(original)
+++ trunk/lisp/sawfish/wm/animation/outline.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.animation.outline

Modified: trunk/lisp/sawfish/wm/autoload.jl
==============================================================================
--- trunk/lisp/sawfish/wm/autoload.jl	(original)
+++ trunk/lisp/sawfish/wm/autoload.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; to rebuild this file, load a tags file containing all lisp files

Modified: trunk/lisp/sawfish/wm/commands/cycle.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/cycle.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/cycle.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.cycle

Modified: trunk/lisp/sawfish/wm/commands/describe.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/describe.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/describe.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.describe

Modified: trunk/lisp/sawfish/wm/commands/gnome.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/gnome.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/gnome.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.gnome

Modified: trunk/lisp/sawfish/wm/commands/groups.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/groups.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/groups.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.groups

Modified: trunk/lisp/sawfish/wm/commands/help.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/help.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/help.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.help
@@ -68,7 +68,7 @@
   (define (show-programmer-manual)
     (help-display-info-function "sawfish" "Top"))
 
-  (define (show-homepage) (display-url "http://sawmill.sourceforge.net/";))
+  (define (show-homepage) (display-url "http://sawfish.sourceforge.net/";))
 
   (define (show-about)
     (system (format nil "%s >/dev/null 2>&1 </dev/null &"

Modified: trunk/lisp/sawfish/wm/commands/move-cursor.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/move-cursor.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/move-cursor.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.move-cursor

Modified: trunk/lisp/sawfish/wm/commands/move-resize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/move-resize.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/move-resize.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.move-resize

Modified: trunk/lisp/sawfish/wm/commands/raise-commands.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/raise-commands.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/raise-commands.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999-2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.raise-commands ()

Modified: trunk/lisp/sawfish/wm/commands/size-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/size-window.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/size-window.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.size-window

Modified: trunk/lisp/sawfish/wm/commands/slide-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/slide-window.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/slide-window.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.commands.slide-window

Modified: trunk/lisp/sawfish/wm/commands/viewport-linear.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/viewport-linear.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/viewport-linear.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/commands/x-cycle.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/x-cycle.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/x-cycle.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/cursors.jl
==============================================================================
--- trunk/lisp/sawfish/wm/cursors.jl	(original)
+++ trunk/lisp/sawfish/wm/cursors.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.  If not, write to
+   along with sawfish; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 

Modified: trunk/lisp/sawfish/wm/custom-defaults.jl
==============================================================================
--- trunk/lisp/sawfish/wm/custom-defaults.jl	(original)
+++ trunk/lisp/sawfish/wm/custom-defaults.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (custom-set-typed-variable (quote workspace-geometry) (quote (4 1 . 1)) (quote workspace-geometry))

Modified: trunk/lisp/sawfish/wm/custom.jl
==============================================================================
--- trunk/lisp/sawfish/wm/custom.jl	(original)
+++ trunk/lisp/sawfish/wm/custom.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.custom

Modified: trunk/lisp/sawfish/wm/customize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/customize.jl	(original)
+++ trunk/lisp/sawfish/wm/customize.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.customize

Modified: trunk/lisp/sawfish/wm/defaults.jl
==============================================================================
--- trunk/lisp/sawfish/wm/defaults.jl	(original)
+++ trunk/lisp/sawfish/wm/defaults.jl	Tue Dec 30 20:27:38 2008
@@ -1,32 +1,32 @@
-;; sawmill-default.jl -- default user startup
+;; sawfish-default.jl -- default user startup
 ;; $Id: defaults.jl,v 1.20 2002/04/20 20:59:15 jsh Exp $
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:
 
-;; This file provides defaults for users without .sawmillrc files
+;; This file provides defaults for users without .sawfishrc files
 
 (declare (in-module user))
 
 ;; magic comment to get an alias installed
-;; (define-structure-alias sawmill-defaults sawfish.wm.defaults)
+;; (define-structure-alias sawfish-defaults sawfish.wm.defaults)
 
 ;; if it looks like GNOME is the desktop environment, then load the
 ;; extra GNOME integration module

Modified: trunk/lisp/sawfish/wm/ext/3d-hack.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/3d-hack.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/3d-hack.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/ext/audio-events.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/audio-events.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/audio-events.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;;###autoload (defgroup audio "Sound" :require sawfish.wm.ext.audio-events)

Modified: trunk/lisp/sawfish/wm/ext/auto-raise.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/auto-raise.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/auto-raise.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.auto-raise ()

Modified: trunk/lisp/sawfish/wm/ext/beos-window-menu.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/beos-window-menu.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/beos-window-menu.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.beos-window-menu

Modified: trunk/lisp/sawfish/wm/ext/edge-flip.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/edge-flip.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/edge-flip.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.edge-flip

Modified: trunk/lisp/sawfish/wm/ext/error-handler.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/error-handler.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/error-handler.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.error-handler

Modified: trunk/lisp/sawfish/wm/ext/hide-dialogs.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/hide-dialogs.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/hide-dialogs.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
    Copyright (C) 2001 Eazel, Inc.
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.  If not, write to
+   along with sawfish; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
    Authors: John Harper <jsh eazel com>

Modified: trunk/lisp/sawfish/wm/ext/match-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/match-window.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/match-window.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:
@@ -148,7 +148,7 @@
     :group match-window
     :require sawfish.wm.ext.match-window)
 
-  ;; used by sawmill-ui when grabbing property values
+  ;; used by sawfish-ui when grabbing property values
   (define (match-window-grab-x-property real-prop)
     (let ((window (select-window))
 	  prop)

Modified: trunk/lisp/sawfish/wm/ext/old-window-menu.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/old-window-menu.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/old-window-menu.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.old-window-menu

Modified: trunk/lisp/sawfish/wm/ext/shade-hover.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/shade-hover.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/shade-hover.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.shade-hover ()

Modified: trunk/lisp/sawfish/wm/ext/tooltips.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/tooltips.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/tooltips.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.tooltips

Modified: trunk/lisp/sawfish/wm/ext/window-history.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/window-history.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/window-history.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/focus.jl
==============================================================================
--- trunk/lisp/sawfish/wm/focus.jl	(original)
+++ trunk/lisp/sawfish/wm/focus.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.focus

Modified: trunk/lisp/sawfish/wm/frames.jl
==============================================================================
--- trunk/lisp/sawfish/wm/frames.jl	(original)
+++ trunk/lisp/sawfish/wm/frames.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.frames

Modified: trunk/lisp/sawfish/wm/gaol.jl
==============================================================================
--- trunk/lisp/sawfish/wm/gaol.jl	(original)
+++ trunk/lisp/sawfish/wm/gaol.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
    Copyright (C) 1999, 2000 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.  If not, write to
+   along with sawfish; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 

Modified: trunk/lisp/sawfish/wm/gnome/integration.jl
==============================================================================
--- trunk/lisp/sawfish/wm/gnome/integration.jl	(original)
+++ trunk/lisp/sawfish/wm/gnome/integration.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.gnome.integration ()

Modified: trunk/lisp/sawfish/wm/gnome/match-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/gnome/match-window.jl	(original)
+++ trunk/lisp/sawfish/wm/gnome/match-window.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.gnome.match-window ()

Modified: trunk/lisp/sawfish/wm/gnome/menus.jl
==============================================================================
--- trunk/lisp/sawfish/wm/gnome/menus.jl	(original)
+++ trunk/lisp/sawfish/wm/gnome/menus.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.gnome.menus

Modified: trunk/lisp/sawfish/wm/keymaps.jl
==============================================================================
--- trunk/lisp/sawfish/wm/keymaps.jl	(original)
+++ trunk/lisp/sawfish/wm/keymaps.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.keymaps

Modified: trunk/lisp/sawfish/wm/menus.jl
==============================================================================
--- trunk/lisp/sawfish/wm/menus.jl	(original)
+++ trunk/lisp/sawfish/wm/menus.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.menus

Modified: trunk/lisp/sawfish/wm/misc.jl
==============================================================================
--- trunk/lisp/sawfish/wm/misc.jl	(original)
+++ trunk/lisp/sawfish/wm/misc.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.  If not, write to
+   along with sawfish; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 

Modified: trunk/lisp/sawfish/wm/placement.jl
==============================================================================
--- trunk/lisp/sawfish/wm/placement.jl	(original)
+++ trunk/lisp/sawfish/wm/placement.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.placement

Modified: trunk/lisp/sawfish/wm/placement/smart.jl
==============================================================================
--- trunk/lisp/sawfish/wm/placement/smart.jl	(original)
+++ trunk/lisp/sawfish/wm/placement/smart.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/server.jl
==============================================================================
--- trunk/lisp/sawfish/wm/server.jl	(original)
+++ trunk/lisp/sawfish/wm/server.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/session/init.jl
==============================================================================
--- trunk/lisp/sawfish/wm/session/init.jl	(original)
+++ trunk/lisp/sawfish/wm/session/init.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.session.init

Modified: trunk/lisp/sawfish/wm/session/load.jl
==============================================================================
--- trunk/lisp/sawfish/wm/session/load.jl	(original)
+++ trunk/lisp/sawfish/wm/session/load.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/session/save.jl
==============================================================================
--- trunk/lisp/sawfish/wm/session/save.jl	(original)
+++ trunk/lisp/sawfish/wm/session/save.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.session.save

Modified: trunk/lisp/sawfish/wm/stacking.jl
==============================================================================
--- trunk/lisp/sawfish/wm/stacking.jl	(original)
+++ trunk/lisp/sawfish/wm/stacking.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.stacking

Modified: trunk/lisp/sawfish/wm/state/configure.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/configure.jl	(original)
+++ trunk/lisp/sawfish/wm/state/configure.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.configure

Modified: trunk/lisp/sawfish/wm/state/gnome.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/gnome.jl	(original)
+++ trunk/lisp/sawfish/wm/state/gnome.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.gnome

Modified: trunk/lisp/sawfish/wm/state/iconify.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/iconify.jl	(original)
+++ trunk/lisp/sawfish/wm/state/iconify.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.iconify

Modified: trunk/lisp/sawfish/wm/state/ignored.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/ignored.jl	(original)
+++ trunk/lisp/sawfish/wm/state/ignored.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; originally by Julian Missig <julian linuxpower org> (X-ViRGE), with

Modified: trunk/lisp/sawfish/wm/state/maximize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/maximize.jl	(original)
+++ trunk/lisp/sawfish/wm/state/maximize.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.maximize

Modified: trunk/lisp/sawfish/wm/state/mwm.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/mwm.jl	(original)
+++ trunk/lisp/sawfish/wm/state/mwm.jl	Tue Dec 30 20:27:38 2008
@@ -3,25 +3,25 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:
 
-;; There's a conflict between the way that sawmill allows frame-styles
+;; There's a conflict between the way that sawfish allows frame-styles
 ;; to be defined, and the way that the window hints (gnome, mwm, ol,
 ;; ...) ask for particular decorations.
 

Modified: trunk/lisp/sawfish/wm/state/open-look.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/open-look.jl	(original)
+++ trunk/lisp/sawfish/wm/state/open-look.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/state/shading.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/shading.jl	(original)
+++ trunk/lisp/sawfish/wm/state/shading.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.shading

Modified: trunk/lisp/sawfish/wm/state/transient.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/transient.jl	(original)
+++ trunk/lisp/sawfish/wm/state/transient.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.transient

Modified: trunk/lisp/sawfish/wm/state/wm-spec.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/wm-spec.jl	(original)
+++ trunk/lisp/sawfish/wm/state/wm-spec.jl	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
 ;; Copyright (C) 1999, 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.state.wm-spec

Modified: trunk/lisp/sawfish/wm/theming/make-theme-preview.jl
==============================================================================
--- trunk/lisp/sawfish/wm/theming/make-theme-preview.jl	(original)
+++ trunk/lisp/sawfish/wm/theming/make-theme-preview.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.theming.make-theme-preview

Modified: trunk/lisp/sawfish/wm/theming/make-theme.jl
==============================================================================
--- trunk/lisp/sawfish/wm/theming/make-theme.jl	(original)
+++ trunk/lisp/sawfish/wm/theming/make-theme.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.theming.make-theme

Modified: trunk/lisp/sawfish/wm/user.jl
==============================================================================
--- trunk/lisp/sawfish/wm/user.jl	(original)
+++ trunk/lisp/sawfish/wm/user.jl	Tue Dec 30 20:27:38 2008
@@ -53,7 +53,7 @@
   ;; frame-style loaded if user hasn't set their own
   (define fallback-frame-style 'Crux)
 
-  (define rc-files '("~/.sawfishrc" "~/.sawfish/rc" "~/.sawmillrc"))
+  (define rc-files '("~/.sawfishrc" "~/.sawfish/rc"))
 
   ;; initialize the special variable pointing at this structure
   (structure () (open rep rep.structures)
@@ -90,7 +90,7 @@
 					  (file-exists-p (concat f ".jl"))
 					  (file-exists-p (concat f ".jlc"))))))
 	      ;; load these before customized settings (but only if there's
-	      ;; no .sawmillrc file)
+	      ;; no .sawfishrc file)
 	      (unless (let loop ((rest rc-files))
 			(when rest
 			  (or (rc-file-exists-p (car rest))
@@ -103,7 +103,7 @@
 		(error
 		 (format (stderr-file) "error in custom file--> %S\n" data)))
 
-	      ;; then the sawmill specific user configuration
+	      ;; then the sawfish specific user configuration
 	      (let loop ((rest rc-files))
 		(when rest
 		  (if (rc-file-exists-p (car rest))

Modified: trunk/lisp/sawfish/wm/util/compat.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/compat.jl	(original)
+++ trunk/lisp/sawfish/wm/util/compat.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.compat
@@ -26,11 +26,11 @@
 	    ws-move-window
 	    ws-insert-workspace
 	    ws-remove-workspace
-	    sawmill-directory
-	    sawmill-lisp-lib-directory
-	    sawmill-site-lisp-directory
-	    sawmill-exec-directory
-	    sawmill-version
+	    sawfish-directory
+	    sawfish-lisp-lib-directory
+	    sawfish-site-lisp-directory
+	    sawfish-exec-directory
+	    sawfish-version
 	    custom-set-color
 	    custom-set-font
 	    custom-set-frame-style)
@@ -62,11 +62,11 @@
 
 ;;; obsolete variables
 
-  (define sawmill-directory sawfish-directory)
-  (define sawmill-lisp-lib-directory sawfish-lisp-lib-directory)
-  (define sawmill-site-lisp-directory sawfish-site-lisp-directory)
-  (define sawmill-exec-directory sawfish-exec-directory)
-  (define sawmill-version sawfish-version)
+  (define sawfish-directory sawfish-directory)
+  (define sawfish-lisp-lib-directory sawfish-lisp-lib-directory)
+  (define sawfish-site-lisp-directory sawfish-site-lisp-directory)
+  (define sawfish-exec-directory sawfish-exec-directory)
+  (define sawfish-version sawfish-version)
 
 ;;; obsolete commands
 

Modified: trunk/lisp/sawfish/wm/util/decode-events.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/decode-events.jl	(original)
+++ trunk/lisp/sawfish/wm/util/decode-events.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.decode-events

Modified: trunk/lisp/sawfish/wm/util/edges.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/edges.jl	(original)
+++ trunk/lisp/sawfish/wm/util/edges.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.edges

Modified: trunk/lisp/sawfish/wm/util/groups.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/groups.jl	(original)
+++ trunk/lisp/sawfish/wm/util/groups.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/lisp/sawfish/wm/util/gtkrc.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/gtkrc.jl	(original)
+++ trunk/lisp/sawfish/wm/util/gtkrc.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.gtkrc

Modified: trunk/lisp/sawfish/wm/util/keymap.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/keymap.jl	(original)
+++ trunk/lisp/sawfish/wm/util/keymap.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.keymap

Modified: trunk/lisp/sawfish/wm/util/play-audio.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/play-audio.jl	(original)
+++ trunk/lisp/sawfish/wm/util/play-audio.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.play-audio

Modified: trunk/lisp/sawfish/wm/util/prompt-extras.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/prompt-extras.jl	(original)
+++ trunk/lisp/sawfish/wm/util/prompt-extras.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Most of this is originally from Jade

Modified: trunk/lisp/sawfish/wm/util/prompt-wm.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/prompt-wm.jl	(original)
+++ trunk/lisp/sawfish/wm/util/prompt-wm.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Contributed by Dave Pearson <davep davep org>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (declare (in-module sawfish.wm.util.prompt))

Modified: trunk/lisp/sawfish/wm/util/rects.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/rects.jl	(original)
+++ trunk/lisp/sawfish/wm/util/rects.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.rects

Modified: trunk/lisp/sawfish/wm/util/window-order.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/window-order.jl	(original)
+++ trunk/lisp/sawfish/wm/util/window-order.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.window-order

Modified: trunk/lisp/sawfish/wm/util/window-outline.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/window-outline.jl	(original)
+++ trunk/lisp/sawfish/wm/util/window-outline.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.window-outline

Modified: trunk/lisp/sawfish/wm/util/with-output.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/with-output.jl	(original)
+++ trunk/lisp/sawfish/wm/util/with-output.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.util.with-output

Modified: trunk/lisp/sawfish/wm/viewport.jl
==============================================================================
--- trunk/lisp/sawfish/wm/viewport.jl	(original)
+++ trunk/lisp/sawfish/wm/viewport.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.viewport

Modified: trunk/lisp/sawfish/wm/window-anim.jl
==============================================================================
--- trunk/lisp/sawfish/wm/window-anim.jl	(original)
+++ trunk/lisp/sawfish/wm/window-anim.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define-structure sawfish.wm.ext.window-anim

Modified: trunk/lisp/sawfish/wm/workspace.jl
==============================================================================
--- trunk/lisp/sawfish/wm/workspace.jl	(original)
+++ trunk/lisp/sawfish/wm/workspace.jl	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
 ;; Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-;; This file is part of sawmill.
+;; This file is part of sawfish.
 
-;; sawmill is free software; you can redistribute it and/or modify it
+;; sawfish is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; sawmill is distributed in the hope that it will be useful, but
+;; sawfish 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 sawmill; see the file COPYING.  If not, write to
+;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:

Modified: trunk/man/Makefile.in
==============================================================================
--- trunk/man/Makefile.in	(original)
+++ trunk/man/Makefile.in	Tue Dec 30 20:27:38 2008
@@ -25,7 +25,7 @@
 srcdir= srcdir@
 VPATH= srcdir@:@top_srcdir@
 
-SRCS = sawmill.texi news.texi faq.texi
+SRCS = sawfish.texi news.texi faq.texi
 
 MAKEINFO = makeinfo
 

Modified: trunk/man/news.texi
==============================================================================
--- trunk/man/news.texi	(original)
+++ trunk/man/news.texi	Tue Dec 30 20:27:38 2008
@@ -51,6 +51,16 @@
 @item Fixed autogen for libtool >2.2 [Christopher Bratusek]
 
 @item Fixed an "unknown remote error" that might appear [Alexey I. Froloff]
+
+ item Finally fully renamed from sawmill to sawfish [Christopher Bratusek]
+
+ item Major configure script rework [Christopher Bratusek]
+
+ item Don't ship config.sub config.guess and install-sh in $srcdir/etc [Christopher Bratusek]
+
+ item sawmill-defaults is now sawfish-defaults [Christopher Bratusek]
+
+ item ~/.sawmillrc has been dropped from the list of configuration files [Christopher Bratusek]
 @end itemize
 @end itemize
 

Modified: trunk/src/client.c
==============================================================================
--- trunk/src/client.c	(original)
+++ trunk/src/client.c	Tue Dec 30 20:27:38 2008
@@ -4,20 +4,20 @@
 
    Copyright (C) 1999, 2000 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "libclient.h"

Modified: trunk/src/colors.c
==============================================================================
--- trunk/src/colors.c	(original)
+++ trunk/src/colors.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 
 static Lisp_Color *color_list;
 int color_type;

Modified: trunk/src/cursors.c
==============================================================================
--- trunk/src/cursors.c	(original)
+++ trunk/src/cursors.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <X11/cursorfont.h>
 
 static Lisp_Cursor *cursor_list;

Modified: trunk/src/display.c
==============================================================================
--- trunk/src/display.c	(original)
+++ trunk/src/display.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>

Modified: trunk/src/events.c
==============================================================================
--- trunk/src/events.c	(original)
+++ trunk/src/events.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
@@ -67,7 +67,7 @@
 
 static XID event_handler_context;
 
-static Atom xa_sawmill_timestamp;
+static Atom xa_sawfish_timestamp;
 
 DEFSYM(visibility_notify_hook, "visibility-notify-hook");
 DEFSYM(destroy_notify_hook, "destroy-notify-hook");
@@ -1348,7 +1348,7 @@
     /* XXX There must be an easier method.. */
     while (XCheckWindowEvent (dpy, w, PropertyChangeMask, &ev)) ;
     XSelectInput (dpy, w, PropertyChangeMask | KeyPressMask);
-    XChangeProperty (dpy, w, xa_sawmill_timestamp,
+    XChangeProperty (dpy, w, xa_sawfish_timestamp,
 		     XA_STRING, 8, PropModeReplace, (unsigned char *)"foo", 3);
     XSelectInput (dpy, w, KeyPressMask);
     XWindowEvent (dpy, w, PropertyChangeMask, &ev);
@@ -1836,7 +1836,7 @@
 
     if(!batch_mode_p ())
     {
-	xa_sawmill_timestamp = XInternAtom (dpy, "_SAWMILL_TIMESTAMP", False);
+	xa_sawfish_timestamp = XInternAtom (dpy, "_SAWFISH_TIMESTAMP", False);
 	last_event_time = get_server_timestamp ();
     }
 }

Modified: trunk/src/flippers.c
==============================================================================
--- trunk/src/flippers.c	(original)
+++ trunk/src/flippers.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 
 static Window edge_left, edge_right, edge_top, edge_bottom;
 

Modified: trunk/src/fonts.c
==============================================================================
--- trunk/src/fonts.c	(original)
+++ trunk/src/fonts.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* AIX requires this to be the first thing in the file.  */
@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <string.h>
 #include <X11/Xlocale.h>
 #include <ctype.h>

Modified: trunk/src/frames.c
==============================================================================
--- trunk/src/frames.c	(original)
+++ trunk/src/frames.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 1999, 2000 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* AIX requires this to be the first thing in the file.  */
@@ -37,7 +37,7 @@
 # endif
 #endif
    
-#include "sawmill.h"
+#include "sawfish.h"
 #include <string.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>

Modified: trunk/src/functions.c
==============================================================================
--- trunk/src/functions.c	(original)
+++ trunk/src/functions.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* Define this to fake two side-by-side Xinerama style heads */
@@ -40,7 +40,7 @@
 # endif
 #endif
    
-#include "sawmill.h"
+#include "sawfish.h"
 #include <string.h>
 #include <X11/Xatom.h>
 

Modified: trunk/src/gradient.c
==============================================================================
--- trunk/src/gradient.c	(original)
+++ trunk/src/gradient.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 
 DEFUN("draw-vertical-gradient", Fdraw_vertical_gradient,
       Sdraw_vertical_gradient, (repv img, repv from_, repv to_), rep_Subr3)

Modified: trunk/src/gtk-style.c
==============================================================================
--- trunk/src/gtk-style.c	(original)
+++ trunk/src/gtk-style.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include <stdio.h>

Modified: trunk/src/images.c
==============================================================================
--- trunk/src/images.c	(original)
+++ trunk/src/images.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 1999, 2000 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* AIX requires this to be the first thing in the file.  */
@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <assert.h>
 #include <string.h>
 

Modified: trunk/src/keys.c
==============================================================================
--- trunk/src/keys.c	(original)
+++ trunk/src/keys.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include "keys.h"
 #include <string.h>
 #include <stdlib.h>
@@ -1701,7 +1701,7 @@
 	    }
 	    else
 	    {
-		/* sawmill treats mouse buttons as modifiers, not as
+		/* sawfish treats mouse buttons as modifiers, not as
 		   codes, so for us AnyModifier includes all buttons.. */
 		for (i = 0; i < 9; i++)
 		{

Modified: trunk/src/keys.h
==============================================================================
--- trunk/src/keys.h	(original)
+++ trunk/src/keys.h	Tue Dec 30 20:27:38 2008
@@ -3,24 +3,24 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#ifndef SAWMILL_KEYS_H
-#define SAWMILL_KEYS_H
+#ifndef SAWFISH_KEYS_H
+#define SAWFISH_KEYS_H
 
 /* An event object is (CODE . MODS) */
 
@@ -130,4 +130,4 @@
 #define KEY_EVENT(v)	rep_CDR(v)
 #define MAKE_KEY(e, c)	Fcons(c, e)
 
-#endif /* SAWMILL_KEYS_H */
+#endif /* SAWFISH_KEYS_H */

Modified: trunk/src/libclient.c
==============================================================================
--- trunk/src/libclient.c	(original)
+++ trunk/src/libclient.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include "server.h"
 #include "libclient.h"
 #include <X11/Xlib.h>
@@ -385,7 +385,7 @@
 unix_server_init (char *display)
 {
     struct sockaddr_un addr;
-    sprintf(addr.sun_path, SAWMILL_SOCK_DIR "/%s",
+    sprintf(addr.sun_path, SAWFISH_SOCK_DIR "/%s",
 	    user_login_name (), display);
     addr.sun_family = AF_UNIX;
 

Modified: trunk/src/libclient.h
==============================================================================
--- trunk/src/libclient.h	(original)
+++ trunk/src/libclient.h	Tue Dec 30 20:27:38 2008
@@ -3,24 +3,24 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#ifndef SAWMILL_LIBCLIENT_H
-#define SAWMILL_LIBCLIENT_H
+#ifndef SAWFISH_LIBCLIENT_H
+#define SAWFISH_LIBCLIENT_H
 
 int client_open (char *display);
 char *client_eval (char *form, int *lenp, int *errorp);

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Tue Dec 30 20:27:38 2008
@@ -1,22 +1,22 @@
-/* main.c -- Entry point for sawmill
+/* main.c -- Entry point for sawfish
    $Id$
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* AIX requires this to be the first thing in the file.  */
@@ -37,7 +37,7 @@
 # endif
 #endif
    
-#include "sawmill.h"
+#include "sawfish.h"
 #include "build.h"
 #include <string.h>
 #include <limits.h>
@@ -96,7 +96,7 @@
 
     if (since_last == 0 && rep_recurse_depth == 0)
     {
-	/* XXX There have been reports of sawmill locking the display,
+	/* XXX There have been reports of sawfish locking the display,
 	   XXX I've never seen it, but this may help, and shouldn't hurt.. */
 	last_event_time = get_server_timestamp ();
 	ungrab_pointer ();

Modified: trunk/src/multihead.c
==============================================================================
--- trunk/src/multihead.c	(original)
+++ trunk/src/multihead.c	Tue Dec 30 20:27:38 2008
@@ -37,7 +37,7 @@
 # endif
 #endif
    
-#include "sawmill.h"
+#include "sawfish.h"
 
 #include <string.h>
 #include <assert.h>

Modified: trunk/src/pixmap-cache.c
==============================================================================
--- trunk/src/pixmap-cache.c	(original)
+++ trunk/src/pixmap-cache.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 2000 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* Define this to disable all pixmap caching */
@@ -37,7 +37,7 @@
    XXX Need to measure average length of image lists; if too long
    XXX they should be changed to doubly-linked hash tables. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 
 static unsigned long cached_pixels, max_cached_pixels = 64 * 1024;
 static unsigned long hits, misses;

Modified: trunk/src/play-sample.c
==============================================================================
--- trunk/src/play-sample.c	(original)
+++ trunk/src/play-sample.c	Tue Dec 30 20:27:38 2008
@@ -7,7 +7,7 @@
 
    XXX need to make sure WORDS_BIGENDIAN is defined on big-endian systems */
 
-#include "sawmill.h"
+#include "sawfish.h"
 
 #ifndef GLIB_MAJOR_VERSION		/* Have we got <glib.h> ? */
 # define g_malloc malloc
@@ -521,7 +521,7 @@
 #endif
 }
 
-/* sawmill code */
+/* sawfish code */
 
 DEFUN("primitive-play-sample", Fprimitive_play_sample,
       Sprimitive_play_sample, (repv filename), rep_Subr1)

Modified: trunk/src/property-cache.c
==============================================================================
--- trunk/src/property-cache.c	(original)
+++ trunk/src/property-cache.c	Tue Dec 30 20:27:38 2008
@@ -22,7 +22,7 @@
 
    Authors: John Harper <jsh unfactored org>  */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <assert.h>
 
 #define CACHE_ASSOC 4

Copied: trunk/src/sawfish.h (from r4332, /trunk/src/sawmill.h)
==============================================================================
--- /trunk/src/sawmill.h	(original)
+++ trunk/src/sawfish.h	Tue Dec 30 20:27:38 2008
@@ -1,26 +1,26 @@
-/* sawmill.h -- Main include file, brings in all the rest
+/* sawfish.h -- Main include file, brings in all the rest
    $Id$
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#ifndef SAWMILL_H
-#define SAWMILL_H
+#ifndef SAWFISH_H
+#define SAWFISH_H
 
 #define _GNU_SOURCE
 
@@ -57,7 +57,7 @@
    the server is grabbed => deadlock)
 
    You can also define it to zero to store the debugging output in
-   one of rep's buffers. Send the sawmill process a SIGUSR2 to print
+   one of rep's buffers. Send the sawfish process a SIGUSR2 to print
    the last 4k or so to stderr. */
 
 /* #define DEBUG 1 */
@@ -306,7 +306,7 @@
 #define XUrgencyHint (1 << 8)
 #endif
 
-#include "sawmill_subrs.h"
+#include "sawfish_subrs.h"
 
 /* Miscellaneous macro defs */
 
@@ -376,4 +376,4 @@
 # define nonterminal_assert(x) do {} while (0)
 #endif
 
-#endif /* SAWMILL_H */
+#endif /* SAWFISH_H */

Copied: trunk/src/sawfish_subrs.h (from r4332, /trunk/src/sawmill_subrs.h)
==============================================================================
--- /trunk/src/sawmill_subrs.h	(original)
+++ trunk/src/sawfish_subrs.h	Tue Dec 30 20:27:38 2008
@@ -1,26 +1,26 @@
-/* sawmill_subrs.h -- prototypes
+/* sawfish_subrs.h -- prototypes
    $Id$
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#ifndef SAWMILL_SUBRS_H
-#define SAWMILL_SUBRS_H
+#ifndef SAWFISH_SUBRS_H
+#define SAWFISH_SUBRS_H
 
 /* from colors.c */
 extern int color_type;
@@ -366,4 +366,4 @@
 extern void restack_window (Lisp_Window *w);
 extern repv make_stacking_list (void);
 
-#endif /* SAWMILL_SUBRS_H */
+#endif /* SAWFISH_SUBRS_H */

Modified: trunk/src/selection.c
==============================================================================
--- trunk/src/selection.c	(original)
+++ trunk/src/selection.c	Tue Dec 30 20:27:38 2008
@@ -5,29 +5,29 @@
 
    Originally adapted from the Jade sources by Mark Probst.
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <string.h>
 #include <X11/Xatom.h>
 
 /* selection functions */
 
-static Atom sawmill_selection;
+static Atom sawfish_selection;
 
 static inline Atom
 symbol_to_atom (repv sym)
@@ -78,7 +78,7 @@
 	XEvent ev;
 	Window sel_window = no_focus_window;
 	XConvertSelection (dpy, selection, XA_STRING,
-			   sawmill_selection, sel_window, last_event_time);
+			   sawfish_selection, sel_window, last_event_time);
 	XIfEvent (dpy, &ev, selnotify_pred, (XPointer) 0);
 	if (ev.xselection.property != None)
 	{
@@ -89,7 +89,7 @@
 	    unsigned char *prop;          
 	    int r;
 	    int offset;
-	    r = XGetWindowProperty (dpy, sel_window, sawmill_selection,
+	    r = XGetWindowProperty (dpy, sel_window, sawfish_selection,
 				    0, 0, False, AnyPropertyType,
 				    &actual_type, &actual_format,
 				    &nitems, &bytes_after, &prop);
@@ -104,7 +104,7 @@
 	    offset = 0;
 	    while (bytes_after > 0)
 	    {
-		r = XGetWindowProperty (dpy, sel_window, sawmill_selection,
+		r = XGetWindowProperty (dpy, sel_window, sawfish_selection,
 					offset/4, (bytes_after / 4) + 1,
 					False, AnyPropertyType,
 					&actual_type, &actual_format,
@@ -115,7 +115,7 @@
 		XFree (prop);
 		offset += nitems;
 	    }
-	    XDeleteProperty (dpy, sel_window, sawmill_selection);
+	    XDeleteProperty (dpy, sel_window, sawfish_selection);
 	    rep_STR(res)[offset] = 0;
 	}
     }
@@ -134,7 +134,7 @@
     rep_ADD_SUBR (Sx_get_selection);
 
     if (dpy != 0)
-	sawmill_selection = XInternAtom (dpy, "SAWMILL_SELECTION", False);
+	sawfish_selection = XInternAtom (dpy, "SAWFISH_SELECTION", False);
 
     return rep_pop_structure (tem);
 }

Modified: trunk/src/server.c
==============================================================================
--- trunk/src/server.c	(original)
+++ trunk/src/server.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include "server.h"
 
 #ifdef HAVE_UNIX
@@ -183,9 +183,9 @@
 	return;
 
 #ifdef HAVE_SNPRINTF
-    snprintf (namebuf, sizeof(namebuf), SAWMILL_SOCK_DIR, rep_STR(user));
+    snprintf (namebuf, sizeof(namebuf), SAWFISH_SOCK_DIR, rep_STR(user));
 #else
-    sprintf (namebuf, SAWMILL_SOCK_DIR, rep_STR(user));
+    sprintf (namebuf, SAWFISH_SOCK_DIR, rep_STR(user));
 #endif
 
     /* Make the socket directory trying to ensure that it hasn't

Modified: trunk/src/server.h
==============================================================================
--- trunk/src/server.h	(original)
+++ trunk/src/server.h	Tue Dec 30 20:27:38 2008
@@ -3,28 +3,28 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#ifndef SAWMILL_SERVER_H
-#define SAWMILL_SERVER_H
+#ifndef SAWFISH_SERVER_H
+#define SAWFISH_SERVER_H
 
 /* Directory containing the unix domain sockets, each socket is
    simply the canonical display name */
-#define SAWMILL_SOCK_DIR "/tmp/.sawfish-%s"
+#define SAWFISH_SOCK_DIR "/tmp/.sawfish-%s"
 
 /* Types of request packet. A byte with one of these values is sent to
    initiate a command. */
@@ -34,4 +34,4 @@
     req_end_of_session = 255
 };
 
-#endif /* SAWMILL_SERVER_H */
+#endif /* SAWFISH_SERVER_H */

Modified: trunk/src/session.c
==============================================================================
--- trunk/src/session.c	(original)
+++ trunk/src/session.c	Tue Dec 30 20:27:38 2008
@@ -3,20 +3,20 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* AIX requires this to be the first thing in the file.  */
@@ -37,7 +37,7 @@
 # endif
 #endif
    
-#include "sawmill.h"
+#include "sawfish.h"
 
 #ifdef HAVE_X11_SM_SMLIB_H
 # include <X11/SM/SMlib.h>

Modified: trunk/src/stacking-list.c
==============================================================================
--- trunk/src/stacking-list.c	(original)
+++ trunk/src/stacking-list.c	Tue Dec 30 20:27:38 2008
@@ -22,7 +22,7 @@
 
    Authors: John Harper <jsh eazel com>  */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <assert.h>
 
 static Lisp_Window *lowest_window, *highest_window;

Modified: trunk/src/windows.c
==============================================================================
--- trunk/src/windows.c	(original)
+++ trunk/src/windows.c	Tue Dec 30 20:27:38 2008
@@ -3,23 +3,23 @@
 
    Copyright (C) 1999 John Harper <john dcs warwick ac uk>
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <assert.h>
 #include <string.h>
 #include <X11/extensions/shape.h>

Modified: trunk/src/x.c
==============================================================================
--- trunk/src/x.c	(original)
+++ trunk/src/x.c	Tue Dec 30 20:27:38 2008
@@ -6,20 +6,20 @@
    Originally written by merlin <merlin merlin org>, with additions
    from John Harper
 
-   This file is part of sawmill.
+   This file is part of sawfish.
 
-   sawmill is free software; you can redistribute it and/or modify it
+   sawfish is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   sawmill is distributed in the hope that it will be useful, but
+   sawfish 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 sawmill; see the file COPYING.   If not, write to
+   along with sawfish; see the file COPYING.   If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /* AIX requires this to be the first thing in the file.  */
@@ -40,7 +40,7 @@
 # endif
 #endif
    
-#include "sawmill.h"
+#include "sawfish.h"
 #include <string.h>
 #include <X11/Xresource.h>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]