[sawfish: 2/2] Merge branch 'prompt'

[Christopher Bratusek <chrisb src gnome org>]

commit 184334794ec5a99f1887134acb009f65a9d05d46
Merge: ba60d1e 49672b6
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Tue Jun 22 16:55:51 2010 +0200

    Merge branch 'prompt'
    
    Conflicts:
    	ChangeLog
    	man/news.texi

 ChangeLog                             |    8 ++
 lisp/sawfish/wm/util/prompt-extras.jl |   91 +++++++++------
 lisp/sawfish/wm/util/prompt-wm.jl     |   10 +-
 lisp/sawfish/wm/util/prompt.jl        |  209 +++++++++++++++++----------------
 man/news.texi                         |    6 +
 5 files changed, 184 insertions(+), 140 deletions(-)
---
diff --cc ChangeLog
index 8b45428,322ba78..7263dfb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,63 -1,15 +1,71 @@@
 +2010-06-22  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/menus.jl: add a separator to the start of the root menu
 +	                            the menu might disappear directly due to the
 +				    dummy "Sawfish Rootmenu" headline, this border
 +				    prevents that.
 +
 +2010-06-22  Teika kazura <teika lavabit com>
 +	* man/news.texi
 +	* src/functions.c: x-atom-name accepts full 32 unsigned
 +	int. Previously only 30 bits are treated, if the architecture is
 +	32-bit.
 +
 +	* lisp/sawfish/wm/server.jl
 +	* man/news.texi: Prints backtrace for sawfish-client, too.
 +	This makes sense if you're using librep >= 0.90.7. Harmless anyway.
 +
 +	* lisp/sawfish/cfg/main.jl.in
 +	* lisp/sawfish/cfg/shell.jl
 +	* man/news.texi: Made `sawfish-config' minimal, moving most the
 +	contents to sawfish.cfg.shell.  This facilitates hacks.
 +
 +	* lisp/sawfish/wm/ext/error-handler.jl
 +	* man/news.texi: Better error message.
 +	Phrase "Sawfish error:" is prepended to error messages printed to
 +	standard error.
 +
 +	* lisp/sawfish/wm/util/compat.jl
 +	* man/news.texi: Restored two options from "obsolete" declaration.
 +	They're workspace-boundary-mode and workspace-send-boundary-mode.
 +
 +	* lisp/sawfish/wm/commands.jl
 +	* man/faq.texi
 +	* man/news.texi: Manuals (1). All options are now described.
 +
 +	* CONTRIBUTING
 +	* lisp/sawfish/wm/commands.jl
 +	* lisp/sawfish/wm/ext/old-window-menu.jl
 +	* man/faq.texi
 +	* man/news.texi
 +	* man/sawfish-client.1
 +	* man/sawfish.texi
 +	* src/display.c
 +	* src/libclient.h: Doc.
 +	Improvement of news and man on the new "border" feature.
 +	Two new faq items.
 +	Added Daniel M. German to "thanks" list.
 +
 +	* sawfish.ebuild.in: Declared that it is not an official one of
 +	any distribution.
 +
 +	* sawfish-wm.desktop: Encoding fix in sawfish-wm.desktop.
 +	Greek was broken.
 +
 +	* lisp/sawfish/wm/autoload.jl
 +	* lisp/sawfish/wm/ext/3d-hack.jl: Not autoloaded any more.
 +
 +2010-05-28  Jeremy Hankins <nowan nowan org>
 +	* lisp/sawfish/wm/util/prompt.jl: Fix compilation error
 +	                 -- [Harald van Dijk]
 +
+ 2010-05-23  Jeremy Hankins <nowan nowan org>
+ 	* lisp/sawfish/wm/util/prompt-extras.jl
+ 	* lisp/sawfish/wm/util/prompt-wm.jl
+ 	* lisp/sawfish/wm/util/prompt.jl: Changed the way prompt is called:
+ 		helper functions are now passed directly instead of implicitly
+ 		via let statements.  Also reverts the previous compilation error
+ 		fix, since it's no longer necessary.
+ 
 -2010-05-28  Jeremy Hankins <nowan nowan org>
 -	* lisp/sawfish/wm/util/prompt.jl: Fix compilation error
 -	                 -- [Harald van Dijk]
 -
  2010-05-23  Christopher Roy Bratusek <zanghar freenet de>
  	* man/sawfish.texi
  	* src/events.c
diff --cc man/news.texi
index 8cc53a5,35d767d..102d1be
--- a/man/news.texi
+++ b/man/news.texi
@@@ -13,19 -13,11 +13,25 @@@ they occurred between. For more detaile
  
  @itemize @bullet
  
 - item Bugfixes
 + item Bug Fixes
  @itemize @minus
 - item The sawfish.wm.util.prompt no longer makes all of its internals
 -available globally, so helper functions must be passed explicitly rather
 -than implicitly via let statements.
 + item Atom handling fix on 32-bit architecture. [Teika Kazura]
 +
 +Function @code{x-atom-name} now accepts all 32 bits. Previously only
 +30 bits are treated, if the architecture is 32-bit.
 +
 + item Two variables are restored from obsoleteness declaration  *
 +They're @code{workspace-boundary-mode} and @code{workspace-send-boundary-mode}.
 +
 + item Added a borderline on the top of the root-menu, which
 +prevents it from (accidently) immediately disappearing.
 +[Christopher Bratusek]
++
++ item The prompt @code{sawfish.wm.util.prompt} no longer makes all of its
++internals available globally.
++
++So helper functions must be passed explicitly rather than implicitly via
++let statements. [Jeremy Hankins]
  @end itemize
  
  @item New Features