--- a/lisp/custom/wid-edit.el	Mon Aug 13 08:52:30 2007 +0200
+++ b/lisp/custom/wid-edit.el	Mon Aug 13 08:52:56 2007 +0200
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: extensions
-;; Version: 1.59
+;; Version: 1.63
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:
@@ -733,7 +733,11 @@
 		       (button (goto-char button))
 		       (field (goto-char field))
 		       (t
-			(error "No buttons or fields found")))))))))
+			(error "No buttons or fields found"))))))
+	(setq button (widget-at (point)))
+	(if (and button (widget-get button :tab-order)
+		 (< (widget-get button :tab-order) 0))
+	    (setq arg (1+ arg))))))
   (while (< arg 0)
     (if (= (point-min) (point))
 	(forward-char 1))
@@ -767,7 +771,11 @@
       (cond ((and button field)
 	     (goto-char (max button field)))
 	    (button (goto-char button))
-	    (field (goto-char field)))))
+	    (field (goto-char field)))
+      (setq button (widget-at (point)))
+      (if (and button (widget-get button :tab-order)
+	       (< (widget-get button :tab-order) 0))
+	  (setq arg (1- arg)))))
   (widget-echo-help (point))
   (run-hooks 'widget-move-hook))
 
@@ -2328,7 +2336,7 @@
 (define-widget 'color-item 'choice-item
   "A color name (with sample)."
   :format "%v (%{sample%})\n"
-  :button-face-get 'widget-color-item-button-face-get)
+  :sample-face-get 'widget-color-item-button-face-get)
 
 (defun widget-color-item-button-face-get (widget)
   ;; We create a face from the value.
@@ -2341,7 +2349,7 @@
   "Choose a color name (with sample)."
   :format "%[%t%]: %v"
   :tag "Color"
-  :value "default"
+  :value "black"
   :value-create 'widget-color-value-create
   :value-delete 'widget-children-value-delete
   :value-get 'widget-color-value-get