[sawfish] updated OPTIONS

[Christopher Bratusek <chrisb src gnome org>]

commit 600bce16bb11e141e9369c01d30835cf08e42df6
Author: chrisb <zanghar freenet de>
Date:   Mon Aug 31 20:16:00 2009 +0200

    updated OPTIONS

 ChangeLog                       |    3 +++
 OPTIONS                         |   30 +++++++++++++++++++++++++++++-
 lisp/sawfish/wm/ext/fdo-menu.jl |    2 +-
 man/news.texi                   |    4 ++++
 4 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5e40fda..ebf6c07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
 
 	* lisp/sawfish/wm/fdo-menu.jl: make it avoidable via (setq use-fod-menu nil) in your resourcefile [Matthew Love]
 
+	* OPTIONS: updated for sawfish.wm.commands.user:view-clipbard
+	           updated for sawfish.wm.ext.fdo-menu
+
 2009-08-30  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/gtk/widget.jl: Number widget can take optional initial value [Teika Kazura]
 
diff --git a/OPTIONS b/OPTIONS
index af4a690..1b3bdd0 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -602,7 +602,7 @@
 ;; (define-special-variable tab-raise-on-hover nil
 ;;   "Raise Tabs on Hover")    
 
-;; shrink-yank options
+;; shrink-yank options (in grow-pack.jl)
 
 ;; (define-special-variable shrink-window-minimum-size 10
 ;;   "The minimum height or width to which a window may be shrunk.")
@@ -623,3 +623,31 @@
 
 ;; (define-special-variable infinite-desktop.stop-at-workspace-borders nil
 ;;   "Stop scrolling at workspace borders (Fixes warp-to-window bugs).")
+
+;; fdo-menu options
+
+;; (define-special-variable my-term-string "xterm -e"
+;;   "Terminal to use if a .desktop files has Terminal=true")
+
+;; (define-special-variable my-lang-string '()
+;;   "Two digits lang code to use (if available) for extracting application names")
+
+;; (define-special-variable my-desktop-directory '("/usr/share/applications")
+;;   "List of directories to look for .desktop files")
+
+;; (define-special-variable ignore-no-display '()
+;;   "Wether to ignore the `NoDisplay' setting")
+
+;; (define-special-variable want-alphabetize 't
+;;   "Wether to alphabetically sort menuentries")
+
+;; (define-special-varaible use-fdo-menu 't
+;;   "Wether to use the fdo-menu (nil allows customized apps-menu)")
+
+;; view-clipboard options
+
+;; (define-special-variable clipboard-preview-clip-length 60
+;;   "Maximum number of chars to display in `view-clipboard'")
+
+;; (define-special-variable clipboard-preview-timeout 5
+;;   "Maximum time to let `view-clipboard' stay running")
diff --git a/lisp/sawfish/wm/ext/fdo-menu.jl b/lisp/sawfish/wm/ext/fdo-menu.jl
index 9727830..97dd7f7 100644
--- a/lisp/sawfish/wm/ext/fdo-menu.jl
+++ b/lisp/sawfish/wm/ext/fdo-menu.jl
@@ -34,7 +34,7 @@ Make sure the mk-saw-menu.jl is in your load path
 ;; if your .desktop files are located somewhere else than
 ;; /usr/share/applications, then change the desktop-directory
 
-(setq desktop-directory "/usr/share/applications"))
+(setq desktop-directory '("/usr/share/applications"))
 
 ;; some entries are hidden from the menu, especially GNOME Apps
 ;; like eog, nautilus or evince & Co, if you want to have them
diff --git a/man/news.texi b/man/news.texi
index 4659187..e864074 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -141,6 +141,10 @@ your system, but the later doesn't
 @item Grow/Pack and Shrink/Yank options are in the same group now [Christopher Bratusek]
 
 @item Doc updates [Christopher Bratusek, Jeremy Hankins, Teika Kazura]
+
+ item Updated OPTIONS [Christopher Bratusek]
+
+ item Added new contributors to @code{THANKS} section of @code{CONTRIBUTING} [Christopher Bratusek]
 @end itemize
 @end itemize