comparison lisp/wid-edit.el @ 90233:ee12d75eb214

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 556-561) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 122-124) - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. - Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 25 Sep 2005 22:07:01 +0000
parents 2d92f5c9d6ae ed770a0a7846
children aa89c814f853
comparison
equal deleted inserted replaced
90232:eab32348047a 90233:ee12d75eb214
3053 (defun widget-file-prompt-value (widget prompt value unbound) 3053 (defun widget-file-prompt-value (widget prompt value unbound)
3054 ;; Read file from minibuffer. 3054 ;; Read file from minibuffer.
3055 (abbreviate-file-name 3055 (abbreviate-file-name
3056 (if unbound 3056 (if unbound
3057 (read-file-name prompt) 3057 (read-file-name prompt)
3058 (let ((prompt2 (format "%s (default %s) " prompt value)) 3058 (let ((prompt2 (format "%s (default %s): " prompt value))
3059 (dir (file-name-directory value)) 3059 (dir (file-name-directory value))
3060 (file (file-name-nondirectory value)) 3060 (file (file-name-nondirectory value))
3061 (must-match (widget-get widget :must-match))) 3061 (must-match (widget-get widget :must-match)))
3062 (read-file-name prompt2 dir nil must-match file))))) 3062 (read-file-name prompt2 dir nil must-match file)))))
3063 3063
3066 ;;; (let* ((value (widget-value widget)) 3066 ;;; (let* ((value (widget-value widget))
3067 ;;; (dir (file-name-directory value)) 3067 ;;; (dir (file-name-directory value))
3068 ;;; (file (file-name-nondirectory value)) 3068 ;;; (file (file-name-nondirectory value))
3069 ;;; (menu-tag (widget-apply widget :menu-tag-get)) 3069 ;;; (menu-tag (widget-apply widget :menu-tag-get))
3070 ;;; (must-match (widget-get widget :must-match)) 3070 ;;; (must-match (widget-get widget :must-match))
3071 ;;; (answer (read-file-name (concat menu-tag ": (default `" value "') ") 3071 ;;; (answer (read-file-name (concat menu-tag " (default " value "): ")
3072 ;;; dir nil must-match file))) 3072 ;;; dir nil must-match file)))
3073 ;;; (widget-value-set widget (abbreviate-file-name answer)) 3073 ;;; (widget-value-set widget (abbreviate-file-name answer))
3074 ;;; (widget-setup) 3074 ;;; (widget-setup)
3075 ;;; (widget-apply widget :notify widget event))) 3075 ;;; (widget-apply widget :notify widget event)))
3076 3076
3167 3167
3168 (defun widget-coding-system-prompt-value (widget prompt value unbound) 3168 (defun widget-coding-system-prompt-value (widget prompt value unbound)
3169 "Read coding-system from minibuffer." 3169 "Read coding-system from minibuffer."
3170 (if (widget-get widget :base-only) 3170 (if (widget-get widget :base-only)
3171 (intern 3171 (intern
3172 (completing-read (format "%s (default %s) " prompt value) 3172 (completing-read (format "%s (default %s): " prompt value)
3173 (mapcar #'list (coding-system-list t)) nil nil nil 3173 (mapcar #'list (coding-system-list t)) nil nil nil
3174 coding-system-history)) 3174 coding-system-history))
3175 (read-coding-system (format "%s (default %s) " prompt value) value))) 3175 (read-coding-system (format "%s (default %s): " prompt value) value)))
3176 3176
3177 (defun widget-coding-system-action (widget &optional event) 3177 (defun widget-coding-system-action (widget &optional event)
3178 (let ((answer 3178 (let ((answer
3179 (widget-coding-system-prompt-value 3179 (widget-coding-system-prompt-value
3180 widget 3180 widget