Merge changes 1.21 -> 1.22 from main trunk.

	* elmo-util.el (elmo-display-progress): Prefer
	`progress-feedback-with-label' to `lprogress-display'.

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index c09e8a2..8b7a697 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1566,10 +1566,10 @@ the value of `foo'."
                (list 'error-message doc
                      'error-conditions (cons error conds))))))
 
-(cond ((fboundp 'lprogress-display)
-       (defalias 'elmo-display-progress 'lprogress-display))
-      ((fboundp 'progress-feedback-with-label)
+(cond ((fboundp 'progress-feedback-with-label)
        (defalias 'elmo-display-progress 'progress-feedback-with-label))
+      ((fboundp 'lprogress-display)
+       (defalias 'elmo-display-progress 'lprogress-display))
       (t
        (defun elmo-display-progress (label format &optional value &rest args)
         "Print a progress message."