Merge branch 'emacs' of http://git.hacks-galore.org/jao/factor

diff --git a/extra/fuel/xref/xref.factor b/extra/fuel/xref/xref.factor
index cfd036e6258c4c812d65c21e5562a11bb403ddf0..c228901afbefea40326aa38cc2e6e1c08b776f9b 100644 (file)
--- a/extra/fuel/xref/xref.factor
+++ b/extra/fuel/xref/xref.factor
@@ -36,8 +36,8 @@ MEMO: (vocab-words) ( name -- seq )
 
 : current-words ( -- seq )
     manifest get
-    [ search-vocabs>> ] [ qualified-vocabs>> ] bi [ words>> ] bi@
-    assoc-union keys ;
+    [ search-vocabs>> ] [ qualified-vocabs>> ] bi [ [ words>> ] map ] bi@
+    append H{ } [ assoc-union ] reduce keys ;
 
 : vocabs-words ( names -- seq )
     prune [ (vocab-words) ] map concat ;

diff --git a/misc/fuel/fuel-log.el b/misc/fuel/fuel-log.el
index fee762d09a05921da0266b201ecd918db7f4bcae..ab8b636a6a61370ccd8fe5acb1f0f905340aec70 100644 (file)
--- a/misc/fuel/fuel-log.el
+++ b/misc/fuel/fuel-log.el
@@ -1,6 +1,6 @@
 ;;; fuel-log.el -- logging utilities
 
-;; Copyright (C) 2008 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz
 ;; See http://factorcode.org/license.txt for BSD license.
 
 ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
@@ -34,6 +34,9 @@
 (defvar fuel-log--inhibit-p nil
   "Set this to t to inhibit all log messages")
 
+(defvar fuel-log--debug-p nil
+  "If t, all messages are logged no matter what")
+
 (define-derived-mode factor-messages-mode fundamental-mode "FUEL Messages"
   "Simple mode to log interactions with the factor listener"
   (kill-all-local-variables)
@@ -55,7 +58,7 @@
         (current-buffer))))
 
 (defun fuel-log--msg (type &rest args)
-  (unless fuel-log--inhibit-p
+  (when (or fuel-log--debug-p (not fuel-log--inhibit-p))
     (with-current-buffer (fuel-log--buffer)
       (let ((inhibit-read-only t))
         (insert