diff lisp/w3/w3-forms.el @ 26:441bb1e64a06 r19-15b96

Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents 8fc7fe29b841
children ec9a17fef872
line wrap: on
line diff
--- a/lisp/w3/w3-forms.el	Mon Aug 13 08:51:05 2007 +0200
+++ b/lisp/w3/w3-forms.el	Mon Aug 13 08:51:32 2007 +0200
@@ -1,7 +1,7 @@
 ;;; w3-forms.el --- Emacs-w3 forms parsing code for new display engine
 ;; Author: wmperry
-;; Created: 1997/02/13 23:10:23
-;; Version: 1.70
+;; Created: 1997/02/20 21:40:42
+;; Version: 1.73
 ;; Keywords: faces, help, comm, data, languages
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -501,6 +501,7 @@
 (put 'option    'w3-summarize-function 'w3-form-summarize-option-list)
 (put 'keygen    'w3-summarize-function 'w3-form-summarize-keygen-list)
 (put 'image	'w3-summarize-function 'w3-form-summarize-image)
+(put 'password  'w3-summarize-function 'w3-form-summarize-password)
 (put 'hidden    'w3-summarize-function 'ignore)
 
 (defun w3-form-summarize-field (widget &rest ignore)
@@ -525,7 +526,7 @@
     ;; more closely follow the widget-y way of just returning the string
     ;; instead of having the underlying :help-echo or :emacspeak-help
     ;; implementation do it.
-    (message "%s" msg)))
+    (and msg (message "%s" msg))))
 
 (defsubst w3-form-field-label (data)
   ;;; FIXXX!!! Need to reimplement using the new forms implementation!
@@ -539,6 +540,12 @@
     (format "Text field %s set to: %s" (or label (concat "called " name))
 	    value)))
 
+(defun w3-form-summarize-password (data widget)
+  (let ((label (w3-form-field-label data))
+	(name  (w3-form-element-name data)))
+    (format "Password field %s is a secret.  Shhh."
+	    (or label (concat "called " name)))))
+
 (defun w3-form-summarize-multiline (data widget)
   (let ((name (w3-form-element-name data))
         (label (w3-form-field-label data))
@@ -580,8 +587,11 @@
 	(label (w3-form-field-label data))
 	(cur-value (widget-value (w3-form-element-widget data)))
 	(this-value (widget-value (widget-get-sibling widget))))
-    (format "Radio button %s is %s, could be %s" (or label name) cur-value
-	    this-value)))
+    (if (equal this-value cur-value)
+	(format "Radio group %s has  %s pressed"
+		(or label name) this-value)
+      (format "Press this  to change radio group %s from %s to %s" (or label name) cur-value
+	      this-value))))
 
 (defun w3-form-summarize-file-browser (data widget)
   (let ((name (w3-form-element-name data))
@@ -857,9 +867,6 @@
 	   (w3-form-encode-helper result) "\n"))
     query))
 
-(defun w3-form-encode-application/x-w3-wais (result)
-  (cdr (car (w3-form-encode-helper result))))
-
 (defun w3-form-encode-application/x-gopher-query (result)
   (concat "\t" (cdr (car (w3-form-encode-helper result)))))