[sawfish] Indent in lisp files.

From: Christopher Bratusek <chrisb src gnome org>
To: commits-list gnome org
Cc:
Subject: [sawfish] Indent in lisp files.
Date: Tue, 1 Feb 2011 17:41:05 +0000 (UTC)
commit 92d2eb8d5cd5f3a28f7aabbda9d3f7f9445b3d0a
Author: Teika kazura <teika lavabit com>
Date:   Tue Feb 1 14:08:28 2011 +0900

    Indent in lisp files.
    
    Not thorough, only recently changed files are chosen.

 lisp/sawfish/wm/commands/move-resize.jl |   14 ++--
 lisp/sawfish/wm/custom.jl               |   32 ++++----
 lisp/sawfish/wm/ext/apps-menu.jl        |   80 +++++++++---------
 lisp/sawfish/wm/ext/match-window.jl     |   55 +++++++------
 lisp/sawfish/wm/focus.jl                |    6 +-
 lisp/sawfish/wm/frames.jl               |    6 +-
 lisp/sawfish/wm/keymaps.jl              |  134 +++++++++++++++---------------
 lisp/sawfish/wm/menus.jl                |    4 +-
 lisp/sawfish/wm/state/wm-spec.jl        |   60 +++++++-------
 lisp/sawfish/wm/util/display-wininfo.jl |    2 +-
 lisp/sawfish/wm/windows.jl              |    2 +-
 11 files changed, 198 insertions(+), 197 deletions(-)
---
diff --git a/lisp/sawfish/wm/commands/move-resize.jl b/lisp/sawfish/wm/commands/move-resize.jl
index 27f745f..b594906 100644
--- a/lisp/sawfish/wm/commands/move-resize.jl
+++ b/lisp/sawfish/wm/commands/move-resize.jl
@@ -528,11 +528,11 @@ its edges with an edge of another window.")
       (resize-window-with-hints* win new-wid new-hgt)))
 
   (define (double-window-size w)
-    (if (not (window-get w 'fixed-size))
+    (unless (window-get w 'fixed-size)
       (resize-by-factor w 2)))
 
   (define (halve-window-size w)
-    (if (not (window-get w 'fixed-size))
+    (unless (window-get w 'fixed-size)
       (resize-by-factor w 0.5)))
 
 ;;; hook functions
@@ -552,7 +552,7 @@ its edges with an edge of another window.")
 
   (define (resize-window-interactively w)
     "Resize the window interactively, with mouse or keyboard."
-    (if (not (window-get w 'fixed-size))
+    (unless (window-get w 'fixed-size)
       (do-move-resize w 'resize)))
 
   (define (resize-window-to-dimensions x y #!key window)
@@ -592,10 +592,10 @@ that window."
   (define-command 'resize-window-interactively
     resize-window-interactively #:spec "%W")
   (define-command 'resize-window-to-dimensions
-     resize-window-to-dimensions
-     #:spec "NNew width:\nNNew height:"
-     #:type '(and (labelled "New width:" (number 100))
-                  (labelled "New height:" (number 100))))
+    resize-window-to-dimensions
+    #:spec "NNew width:\nNNew height:"
+    #:type '(and (labelled "New width:" (number 100))
+		 (labelled "New height:" (number 100))))
   (define-command 'move-selected-window
     move-selected-window)
   (define-command 'resize-selected-window
diff --git a/lisp/sawfish/wm/custom.jl b/lisp/sawfish/wm/custom.jl
index d3b40cd..ecf1a1c 100644
--- a/lisp/sawfish/wm/custom.jl
+++ b/lisp/sawfish/wm/custom.jl
@@ -301,22 +301,22 @@ of choices."
       (setq full-group (list full-group)))
     (let loop ((group full-group)
 	       (parent custom-groups))
-         (if (null group)
-             (unless (or (memq cell (cddr parent))
-                         (assq (car cell) (cddr parent)))
-               ;; reached the bottom most group
-               (rplacd (cdr parent) (nconc (cddr parent) (list cell))))
-           ;; keep on recursing
-           (loop (cdr group)
-                 (or (assq (car group) (cddr parent))
-                     (error
-		      "Unknown customization group: %s.\nIf not typo, its defgroup is not called yet." full-group)))
-           (unless (cdr group)
-             (rplacd (cdr custom-groups)
-                     (nconc (sort (filter consp (cddr custom-groups))
-                                  (lambda (x y)
-                                    (string-lessp (cadr x) (cadr y))))
-                            (filter atom (cddr custom-groups))))))))
+      (if (null group)
+	  (unless (or (memq cell (cddr parent))
+		      (assq (car cell) (cddr parent)))
+	    ;; reached the bottom most group
+	    (rplacd (cdr parent) (nconc (cddr parent) (list cell))))
+	;; keep on recursing
+	(loop (cdr group)
+	      (or (assq (car group) (cddr parent))
+		  (error
+		   "Unknown customization group: %s.\nIf not typo, its defgroup is not called yet." full-group)))
+	(unless (cdr group)
+	  (rplacd (cdr custom-groups)
+		  (nconc (sort (filter consp (cddr custom-groups))
+			       (lambda (x y)
+				 (string-lessp (cadr x) (cadr y))))
+			 (filter atom (cddr custom-groups))))))))
 
 ;;; setting values
 
diff --git a/lisp/sawfish/wm/ext/apps-menu.jl b/lisp/sawfish/wm/ext/apps-menu.jl
index 927419c..e24c5fb 100644
--- a/lisp/sawfish/wm/ext/apps-menu.jl
+++ b/lisp/sawfish/wm/ext/apps-menu.jl
@@ -335,46 +335,46 @@ exile it."
 
   (define (desk-file->fdo-list desk-file)
     (when (desktop-file-p desk-file)
-       (let ((fdo-list (fdo-check-exile (parse-desktop-file desk-file))))
-	 (let ((a (assoc "NoDisplay" fdo-list))
-	       (b (assoc "OnlyShowIn" fdo-list))
-	       (c (assoc "NotShowIn" fdo-list))
-	       (d (assoc "Hidden" fdo-list)))
-	   ;; 't
-	   (setq fdo-list (append fdo-list (cons (cons "apps-menu-display?" "true"))))
-	   ;; 'maybe
-	   (when (eq apps-menu-show-all 'maybe)
-	     (when b
-	       (if (string-match (concat (quote-regexp desktop-environment) "*")
-				 (string-downcase (cdr b)))
-		   (rplacd (assoc "apps-menu-display?" fdo-list) "true")
-		 (rplacd (assoc "apps-menu-display?" fdo-list) "false")))
-	     (when c
-	       (if (string-match (concat (quote-regexp desktop-environment) "*")
-				 (string-downcase (cdr c)))
-		   (rplacd (assoc "apps-menu-display?" fdo-list) "false")
-		 (rplacd (assoc "apps-menu-display?" fdo-list) "true"))))
-	   ;; 'nil
-	   (when (or (eq apps-menu-show-all 'nil) (not apps-menu-show-all))
-	     (when a
-	       (if (string-match "[Ff]" (cdr a))
-		   (rplacd (assoc "apps-menu-display?" fdo-list) "true")
-		 (rplacd (assoc "apps-menu-display?" fdo-list) "false")))
-	     (when d
-	       (if (string-match "[Ff]" (cdr d))
-		   (rplacd (assoc "apps-menu-display?" fdo-list) "true")
-		 (rplacd (assoc "apps-menu-display?" fdo-list) "false")))
-	     (when b
-	       (if (string-match (concat (quote-regexp desktop-environment) "*")
-				 (string-downcase (cdr b)))
-		   (rplacd (assoc "apps-menu-display?" fdo-list) "true")
-		 (rplacd (assoc "apps-menu-display?" fdo-list) "false")))
-	     (when c
-	       (if (string-match (concat (quote-regexp desktop-environment) "*")
-				 (string-downcase (cdr c)))
-		   (rplacd (assoc "apps-menu-display?" fdo-list) "false")
-		 (rplacd (assoc "apps-menu-display?" fdo-list) "true")))))
-	   fdo-list)))
+      (let ((fdo-list (fdo-check-exile (parse-desktop-file desk-file))))
+	(let ((a (assoc "NoDisplay" fdo-list))
+	      (b (assoc "OnlyShowIn" fdo-list))
+	      (c (assoc "NotShowIn" fdo-list))
+	      (d (assoc "Hidden" fdo-list)))
+	  ;; 't
+	  (setq fdo-list (append fdo-list (cons (cons "apps-menu-display?" "true"))))
+	  ;; 'maybe
+	  (when (eq apps-menu-show-all 'maybe)
+	    (when b
+	      (if (string-match (concat (quote-regexp desktop-environment) "*")
+				(string-downcase (cdr b)))
+		  (rplacd (assoc "apps-menu-display?" fdo-list) "true")
+		(rplacd (assoc "apps-menu-display?" fdo-list) "false")))
+	    (when c
+	      (if (string-match (concat (quote-regexp desktop-environment) "*")
+				(string-downcase (cdr c)))
+		  (rplacd (assoc "apps-menu-display?" fdo-list) "false")
+		(rplacd (assoc "apps-menu-display?" fdo-list) "true"))))
+	  ;; 'nil
+	  (when (or (eq apps-menu-show-all 'nil) (not apps-menu-show-all))
+	    (when a
+	      (if (string-match "[Ff]" (cdr a))
+		  (rplacd (assoc "apps-menu-display?" fdo-list) "true")
+		(rplacd (assoc "apps-menu-display?" fdo-list) "false")))
+	    (when d
+	      (if (string-match "[Ff]" (cdr d))
+		  (rplacd (assoc "apps-menu-display?" fdo-list) "true")
+		(rplacd (assoc "apps-menu-display?" fdo-list) "false")))
+	    (when b
+	      (if (string-match (concat (quote-regexp desktop-environment) "*")
+				(string-downcase (cdr b)))
+		  (rplacd (assoc "apps-menu-display?" fdo-list) "true")
+		(rplacd (assoc "apps-menu-display?" fdo-list) "false")))
+	    (when c
+	      (if (string-match (concat (quote-regexp desktop-environment) "*")
+				(string-downcase (cdr c)))
+		  (rplacd (assoc "apps-menu-display?" fdo-list) "false")
+		(rplacd (assoc "apps-menu-display?" fdo-list) "true")))))
+	fdo-list)))
 
   ;; generate a sawfish menu entry from a .desktop file
   (define (generate-menu-entry fdo-list)
diff --git a/lisp/sawfish/wm/ext/match-window.jl b/lisp/sawfish/wm/ext/match-window.jl
index 22ae6a9..60f53f2 100644
--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -263,7 +263,7 @@
 	;; no. create new entry
 	(setq match-window-profile (cons (list* rules actions)
 					 match-window-profile))
-      )))
+	)))
 
   (define (remove-window-matcher rules #!rest props)
     ;; See add-window-matcher for why this wrapper is.
@@ -397,43 +397,44 @@
   (define-match-window-setter 'position
     (lambda (w prop value)
       (declare (unused prop))
-      (let* (xx yy
+      (let* (xx
+	     yy
 	     (size (window-frame-dimensions w))
-             (vp-offset (viewport-offset-coord (window-viewport w)))
-             (x (if (symbolp value)
-                    (cond ((memq value '(east south-east north-east))
-                           (- (screen-width) (car size)))
-                          ((memq value '(north center south))
-                           (- (quotient (screen-width) 2)
-                              (quotient (car size) 2)))
-                          (t 0))
+	     (vp-offset (viewport-offset-coord (window-viewport w)))
+	     (x (if (symbolp value)
+		    (cond ((memq value '(east south-east north-east))
+			   (- (screen-width) (car size)))
+			  ((memq value '(north center south))
+			   (- (quotient (screen-width) 2)
+			      (quotient (car size) 2)))
+			  (t 0))
 		  ;; numeric value
 		  (setq xx (car value))
 		  (if (< xx 0)
 		      (setq xx (+ (- (screen-width) (car size)) xx))
 		    xx)
 		  ))
-             (y (if (symbolp value)
-                    (cond ((memq value '(south south-east south-west))
-                           (- (screen-height) (cdr size)))
-                          ((memq value '(east center west))
-                           (- (quotient (screen-height) 2)
-                              (quotient (cdr size) 2)))
-                          (t 0))
+	     (y (if (symbolp value)
+		    (cond ((memq value '(south south-east south-west))
+			   (- (screen-height) (cdr size)))
+			  ((memq value '(east center west))
+			   (- (quotient (screen-height) 2)
+			      (quotient (cdr size) 2)))
+			  (t 0))
 		  ;; numeric value
 		  (setq yy (cdr value))
 		  (if (< yy 0)
 		      (setq yy (+ (- (screen-height) (cdr size)) yy))
 		    yy)))
-             (gravity (cond ((symbolp value)
-                             value)
-                            ((and (< x 0) (< y 0))
-                             'south-east)
-                            ((< x 0)
-                             'north-east)
-                            ((< y 0)
-                             'south-west)
-                            (t nil))))
+	     (gravity (cond ((symbolp value)
+			     value)
+			    ((and (< x 0) (< y 0))
+			     'south-east)
+			    ((< x 0)
+			     'north-east)
+			    ((< y 0)
+			     'south-west)
+			    (t nil))))
         (when gravity
           (window-put w 'gravity gravity))
         (move-window-to w
@@ -548,4 +549,4 @@
                         (synthesize-event (lookup-event (cadr pair))
                                           (current-event-window))))) value))))
 
-)
+  )
diff --git a/lisp/sawfish/wm/focus.jl b/lisp/sawfish/wm/focus.jl
index 766db5e..e310b5b 100644
--- a/lisp/sawfish/wm/focus.jl
+++ b/lisp/sawfish/wm/focus.jl
@@ -23,12 +23,12 @@
     (export define-focus-mode
 	    autoload-focus-mode
 	    focus-mode
-        raise-tabs-on-hover-setter
+	    raise-tabs-on-hover-setter
 	    set-focus-mode
 	    focus-push-map
 	    focus-pop-map
 	    warp-pointer-if-necessary
-        focus-revert
+	    focus-revert
 	    focus-within-click-event)
 
     (open rep
@@ -241,7 +241,7 @@ EVENT-NAME)', where EVENT-NAME may be one of the following symbols:
 	(let ((command (lookup-event-binding event)))
 	  (if command
 	      (let-fluids ((focus-within-click-event t))
-                 (call-command command))
+		(call-command command))
 	    (require 'sawfish.wm.util.decode-events)
 	    (when (and (or focus-click-through
 			   (window-get w 'focus-click-through)
diff --git a/lisp/sawfish/wm/frames.jl b/lisp/sawfish/wm/frames.jl
index 453e496..3caf145 100644
--- a/lisp/sawfish/wm/frames.jl
+++ b/lisp/sawfish/wm/frames.jl
@@ -36,7 +36,7 @@
 	     apply-frame-style
 	     apply-frame-style-and-save
 	     window-type
-         adjustment-title
+	     adjustment-title
 	     set-window-type
 	     push-window-type
 	     pop-window-type
@@ -665,10 +665,10 @@ generate.")
 			       (cursor . ,(cursor-for-frame-part 'title))))
 
   (define-frame-class 'tabbar-horizontal `((keymap . tabbar-keymap)
-			       (cursor . ,(cursor-for-frame-part 'title))))
+					   (cursor . ,(cursor-for-frame-part 'title))))
 
   (define-frame-class 'tabbar-vertical `((keymap . tabbar-keymap)
-			       (cursor . ,(cursor-for-frame-part 'title))))
+					 (cursor . ,(cursor-for-frame-part 'title))))
 
   (mapc (lambda (x)
 	  (define-frame-class x `((cursor . ,(cursor-for-frame-part x))
diff --git a/lisp/sawfish/wm/keymaps.jl b/lisp/sawfish/wm/keymaps.jl
index b801a2c..0f82623 100644
--- a/lisp/sawfish/wm/keymaps.jl
+++ b/lisp/sawfish/wm/keymaps.jl
@@ -84,9 +84,9 @@
 ;;; Options
 
   (defcustom global-keymap (bind-keys (make-keymap)
-			     "W-Left" 'previous-workspace
-			     "W-Right" 'next-workspace
-			     "W-Tab" 'cycle-windows)
+				      "W-Left" 'previous-workspace
+				      "W-Right" 'next-workspace
+				      "W-Tab" 'cycle-windows)
     "Keymap containing bindings active anywhere."
     :group bindings
     :type keymap
@@ -94,14 +94,14 @@
     :after-set (lambda () (grab-keymap global-keymap)))
 
   (defcustom window-keymap (bind-keys (make-keymap)
-			     "W-Up" 'raise-window
-			     "W-Down" 'lower-window
-			     "W-Button3-Click1" 'raise-lower-window
-			     "W-Button2-Click1" 'popup-window-ops-menu
-			     "W-Button1-Move" 'move-window-interactively
-			     "Button1-Click1" 'raise-and-pass-through-click
-			     "W-ISO_Left_Tab" 'tab-raise-left-window
-			     "H-ISO_Left_Tab" 'tab-raise-right-window)
+				      "W-Up" 'raise-window
+				      "W-Down" 'lower-window
+				      "W-Button3-Click1" 'raise-lower-window
+				      "W-Button2-Click1" 'popup-window-ops-menu
+				      "W-Button1-Move" 'move-window-interactively
+				      "Button1-Click1" 'raise-and-pass-through-click
+				      "W-ISO_Left_Tab" 'tab-raise-left-window
+				      "H-ISO_Left_Tab" 'tab-raise-right-window)
     "Keymap containing bindings active when a client window is focused."
     :group bindings
     :type keymap
@@ -109,103 +109,103 @@
     :after-set (lambda () (grab-keymap window-keymap)))
 
   (defcustom root-window-keymap (bind-keys (make-keymap)
-				  "Button2-Click1" 'popup-root-menu)
+					   "Button2-Click1" 'popup-root-menu)
     "Keymap containing bindings active when the pointer is in the root window
 (or when no window is focused)."
     :group bindings
     :type keymap)
 
   (defcustom title-keymap (bind-keys (make-keymap)
-			    "Button3-Off" 'raise-lower-window
-			    "Button2-Move" 'resize-window-interactively
-			    "Button1-Off2" 'toggle-window-shaded
-			    "Button1-Move" 'move-window-interactively
-			    "Button2-Off" 'tab-add-to-group)
+				     "Button3-Off" 'raise-lower-window
+				     "Button2-Move" 'resize-window-interactively
+				     "Button1-Off2" 'toggle-window-shaded
+				     "Button1-Move" 'move-window-interactively
+				     "Button2-Off" 'tab-add-to-group)
     "Keymap containing bindings active when the pointer is in the title of
 a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom tabbar-keymap (bind-keys (make-keymap)
-			    "Button1-Off2" 'toggle-window-shaded
-                "Button1-Move" 'move-window-interactively
-			    "C-Button1-Off" 'tab-add-to-group
-			    "C-Button1-Click" 'tab-release-window
-			    "C-Button1-Move" 'move-window-interactively)
+				      "Button1-Off2" 'toggle-window-shaded
+				      "Button1-Move" 'move-window-interactively
+				      "C-Button1-Off" 'tab-add-to-group
+				      "C-Button1-Click" 'tab-release-window
+				      "C-Button1-Move" 'move-window-interactively)
     "Keymap containing bindings active when the pointer is in the tabbar of
 a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom border-keymap (bind-keys (make-keymap)
-			     "Button3-Off" 'raise-lower-window
-			     "Button2-Move" 'move-window-interactively
-			     "Button1-Move" 'resize-window-interactively)
+				      "Button3-Off" 'raise-lower-window
+				      "Button2-Move" 'move-window-interactively
+				      "Button1-Move" 'resize-window-interactively)
     "Keymap containing bindings active when the pointer is in the border of
 a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom close-button-keymap (bind-keys (make-keymap)
-				   "Button3-Click1" 'popup-window-ops-menu
-				   "S-Button1-Off" 'delete-group
-				   "Button1-Off" 'delete-window)
+					    "Button3-Click1" 'popup-window-ops-menu
+					    "S-Button1-Off" 'delete-group
+					    "Button1-Off" 'delete-window)
     "Keymap containing bindings active when the pointer is in the close button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom iconify-button-keymap (bind-keys (make-keymap)
-				     "Button3-Click1" 'popup-window-ops-menu
-				     "Button1-Off" 'iconify-window)
+					      "Button3-Click1" 'popup-window-ops-menu
+					      "Button1-Off" 'iconify-window)
     "Keymap containing bindings active when the pointer is in the iconify
 button of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom maximize-button-keymap (bind-keys (make-keymap)
-				      "Button3-Off" 'maximize-window-horizontally-toggle
-				      "Button2-Off" 'maximize-window-vertically-toggle
-				      "Button1-Off" 'maximize-window-toggle)
+					       "Button3-Off" 'maximize-window-horizontally-toggle
+					       "Button2-Off" 'maximize-window-vertically-toggle
+					       "Button1-Off" 'maximize-window-toggle)
     "Keymap containing bindings active when the pointer is in the maximize
 button of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom menu-button-keymap (bind-keys (make-keymap)
-				  "Button3-Off" 'delete-window
-				  "Button1-Click1" 'popup-window-ops-menu)
+					   "Button3-Off" 'delete-window
+					   "Button1-Click1" 'popup-window-ops-menu)
     "Keymap containing bindings active when the pointer is in the menu button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom shade-button-keymap (bind-keys (make-keymap)
-				   "Button1-Off" 'toggle-window-shaded)
+					    "Button1-Off" 'toggle-window-shaded)
     "Keymap containing bindings active when the pointer is in the shade button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom sticky-button-keymap (bind-keys (make-keymap)
-				   "Button1-Off" 'toggle-window-sticky
-				   "Button2-Off" '(call-command
-				                   (lambda ()
-						     (if (window-get (current-event-window) 'sticky-viewport)
-						           (window-put (current-event-window) 'sticky-viewport nil)
-							   (window-put (current-event-window) 'sticky-viewport t)))))
+					     "Button1-Off" 'toggle-window-sticky
+					     "Button2-Off" '(call-command
+							     (lambda ()
+							       (if (window-get (current-event-window) 'sticky-viewport)
+								   (window-put (current-event-window) 'sticky-viewport nil)
+								 (window-put (current-event-window) 'sticky-viewport t)))))
     "Keymap containing bindings active when the pointer is in the sticky button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom lock-button-keymap (bind-keys (make-keymap)
-    "Button1-Off" '(call-command
-			(lambda ()
-				(if (window-get (current-event-window) 'fixed-position)
-					(window-put (current-event-window) 'fixed-position nil)
-					(window-put (current-event-window) 'fixed-position t))
-                  (call-window-hook 'window-state-change-hook (current-event-window) (list '(fixed-position))))))
+					   "Button1-Off" '(call-command
+							   (lambda ()
+							     (if (window-get (current-event-window) 'fixed-position)
+								 (window-put (current-event-window) 'fixed-position nil)
+							       (window-put (current-event-window) 'fixed-position t))
+							     (call-window-hook 'window-state-change-hook (current-event-window) (list '(fixed-position))))))
 
 
     "Keymap containing bindings active when the pointer is in the lock button
@@ -215,32 +215,32 @@ of a window. (Only mouse-bindings are evaluated in this map.)"
 
 
   (defcustom rename-button-keymap (bind-keys (make-keymap)
-				   "Button1-Off" 'rename-window)
+					     "Button1-Off" 'rename-window)
     "Keymap containing bindings active when the pointer is in the rename button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom move-resize-button-keymap (bind-keys (make-keymap)
-                                        "Button1-Off" 'move-window-interactively
-					"Button2-Off" 'resize-window-interactively
-					"Button3-Off" 'move-window-center
-					"Button4-Off" 'double-window-size
-					"Button5-Off" 'halve-window-size)
+						  "Button1-Off" 'move-window-interactively
+						  "Button2-Off" 'resize-window-interactively
+						  "Button3-Off" 'move-window-center
+						  "Button4-Off" 'double-window-size
+						  "Button5-Off" 'halve-window-size)
     "Keymap containing bindings active when the pointer is in the move/resize button
 of a window. (Only mouse-bindings are evaluated in this map.)"
     :group bindings
     :type keymap)
 
   (defcustom raise-lower-button-keymap (bind-keys (make-keymap)
-                                         "Button1-Off" 'raise-window
-					 "Button2-Off" 'lower-window
-					 "Button4-Off" 'raise-window-depth
-					 "Button5-Off" 'lower-window-depth)
+						  "Button1-Off" 'raise-window
+						  "Button2-Off" 'lower-window
+						  "Button4-Off" 'raise-window-depth
+						  "Button5-Off" 'lower-window-depth)
     "Keymap containing bindings active when the pointer is in the raise/lower button
 of a window. (Only mouse-bindings are evaluated in this map.)"
-  :group bindings
-  :type keymap)
+    :group bindings
+    :type keymap)
 
   (defvar pointer-motion-threshold 2
     "Distance in pixels pointer must move before generating motion events.")
@@ -264,14 +264,14 @@ of a window. (Only mouse-bindings are evaluated in this map.)"
 
   (add-hook 'add-window-hook keymap-add-window)
 
-;; custom support for modifiers
+  ;; custom support for modifiers
 
   (define-custom-serializer 'modifier-list
-			    (lambda (value)
-			      (require 'sawfish.wm.util.decode-events)
-			      (decode-modifier value)))
+    (lambda (value)
+      (require 'sawfish.wm.util.decode-events)
+      (decode-modifier value)))
 
   (define-custom-deserializer 'modifier-list
-			      (lambda (value)
-				(require 'sawfish.wm.util.decode-events)
-				(encode-modifier value))))
+    (lambda (value)
+      (require 'sawfish.wm.util.decode-events)
+      (encode-modifier value))))
diff --git a/lisp/sawfish/wm/menus.jl b/lisp/sawfish/wm/menus.jl
index 9adc59b..dd70eaf 100644
--- a/lisp/sawfish/wm/menus.jl
+++ b/lisp/sawfish/wm/menus.jl
@@ -306,7 +306,7 @@ before killing it.")
 				    (require 'sawfish.wm.util.keymap)
 				    (make-memoizing-where-is
 				     (list global-keymap window-keymap)))))
-       (inner cell)))
+      (inner cell)))
 
   (define (menu-dispatch result)
     (let ((orig-win menu-active))
@@ -379,7 +379,7 @@ before killing it.")
   (define (popup-window-ops-menu w)
     "Display the menu listing all window operations."
     (let-fluids ((menu-args (list w)))
-       (popup-menu window-ops-menu)))
+      (popup-menu window-ops-menu)))
 
   (define (popup-window-list-menu)
     "Display the window-list menu."
diff --git a/lisp/sawfish/wm/state/wm-spec.jl b/lisp/sawfish/wm/state/wm-spec.jl
index 0498090..dbc5cc3 100644
--- a/lisp/sawfish/wm/state/wm-spec.jl
+++ b/lisp/sawfish/wm/state/wm-spec.jl
@@ -246,9 +246,9 @@
 	(let ((area (calculate-workarea-from-struts
 		     #:workspace (+ i (car limits)))))
 	  (aset workarea (+ (* i 4) 0) (nth 0 area))
-	    (aset workarea (+ (* i 4) 1) (nth 1 area))
-	    (aset workarea (+ (* i 4) 2) (- (nth 2 area) (nth 0 area)))
-	    (aset workarea (+ (* i 4) 3) (- (nth 3 area) (nth 1 area)))))
+	  (aset workarea (+ (* i 4) 1) (nth 1 area))
+	  (aset workarea (+ (* i 4) 2) (- (nth 2 area) (nth 0 area)))
+	  (aset workarea (+ (* i 4) 3) (- (nth 3 area) (nth 1 area)))))
 
       ;; apparently some pagers don't like it if we place windows
       ;; on (temporarily) non-existent workspaces
@@ -281,7 +281,7 @@
 			 (call-state-fun w x 'get))
 		(setq state (cons x state))))
 	    supported-states)
-	(set-x-property w '_NET_WM_STATE (apply vector state) 'ATOM 32)))
+      (set-x-property w '_NET_WM_STATE (apply vector state) 'ATOM 32)))
 
 ;;; honouring the initially set window state hints
 
@@ -501,27 +501,27 @@
 	   (let ((mode (aref data 2)))
 	     ;; don't want grabs failing, sigh
 	     (x-server-timestamp t t)
-	       (if (or (eq mode _NET_WM_MOVERESIZE_MOVE)
-		       (eq mode _NET_WM_MOVERESIZE_MOVE_KEYBOARD))
-		   (move-window-interactively w)
-		 (let ((move-resize-moving-edges
-			(cond ((eq mode _NET_WM_MOVERESIZE_SIZE_TOPLEFT)
-			       '(top left))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_TOP)
-			       '(top))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_TOPRIGHT)
-			       '(top right))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)
-			       '(bottom left))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_BOTTOM)
-			       '(bottom))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)
-			       '(bottom right))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_LEFT)
-			       '(left))
-			      ((eq mode _NET_WM_MOVERESIZE_SIZE_RIGHT)
-			       '(right)))))
-		   (resize-window-interactively w))))))
+	     (if (or (eq mode _NET_WM_MOVERESIZE_MOVE)
+		     (eq mode _NET_WM_MOVERESIZE_MOVE_KEYBOARD))
+		 (move-window-interactively w)
+	       (let ((move-resize-moving-edges
+		      (cond ((eq mode _NET_WM_MOVERESIZE_SIZE_TOPLEFT)
+			     '(top left))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_TOP)
+			     '(top))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_TOPRIGHT)
+			     '(top right))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)
+			     '(bottom left))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_BOTTOM)
+			     '(bottom))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)
+			     '(bottom right))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_LEFT)
+			     '(left))
+			    ((eq mode _NET_WM_MOVERESIZE_SIZE_RIGHT)
+			     '(right)))))
+		 (resize-window-interactively w))))))
 
 	((_NET_NUMBER_OF_DESKTOPS)
 	 (set-number-of-workspaces (aref data 0)))
@@ -571,10 +571,10 @@
 			    (eq atom1 '_NET_WM_STATE_MAXIMIZED_HORZ)))
 	       (setq atom1 '_NET_WM_STATE_MAXIMIZED)
 	       (setq atom2 nil))
-	       (when atom1
-		 (call-state-fun w atom1 mode))
-	       (when atom2
-		 (call-state-fun w atom2 mode)))))
+	     (when atom1
+	       (call-state-fun w atom1 mode))
+	     (when atom2
+	       (call-state-fun w atom2 mode)))))
 
 	((_NET_WM_DESKTOP)
 	 (when (windowp w)
@@ -587,7 +587,7 @@
 	       (send-window-to-workspace-from-first w desktop nil)))))
 
 	(t (setq handled nil)))
-	handled))
+      handled))
 
 ;;; property changes
 
diff --git a/lisp/sawfish/wm/util/display-wininfo.jl b/lisp/sawfish/wm/util/display-wininfo.jl
index 6d1c387..aeeb994 100644
--- a/lisp/sawfish/wm/util/display-wininfo.jl
+++ b/lisp/sawfish/wm/util/display-wininfo.jl
@@ -83,7 +83,7 @@
 
   ;; Returns the list of *one* string which is made of
   ;; * name, in brackets when iconified
-  ;: * workspace num like <2>, when display-wininfo-show-workspace in non-nil
+  ;; * workspace num like <2>, when display-wininfo-show-workspace in non-nil
   (define (window-info w)
     (list (concat (and (window-get w 'iconified) ?[)
                        (window-name w)
diff --git a/lisp/sawfish/wm/windows.jl b/lisp/sawfish/wm/windows.jl
index 453b735..3df426a 100644
--- a/lisp/sawfish/wm/windows.jl
+++ b/lisp/sawfish/wm/windows.jl
@@ -159,7 +159,7 @@ window is found."
 			       (when (window-role w)
 				 (string-match role (window-role w))))))
       (car (filter-windows (lambda (w)
-			    (string= (window-role w) role))))))
+			     (string= (window-role w) role))))))
 
   (define (window-really-wants-input-p w)
     "Return nil if window W should never be focused."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]