Remove nnml-retrieve-groups that is unnecessary and somewhat problematic

[gnus] / lisp / assistant.el

diff --git a/lisp/assistant.el b/lisp/assistant.el
index 25ff173..93d7219 100644 (file)
--- a/lisp/assistant.el
+++ b/lisp/assistant.el
@@ -17,9 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -210,7 +208,7 @@
          (setq result (if raw (nth 3 elem)
                         (format "%s" (nth 3 elem)))))))
     result))
-    
+
 (defun assistant-set-variable (node variable value)
   (let ((variables (assistant-get-list node "variable"))
        elem)
@@ -218,11 +216,11 @@
       (setq elem (cadr elem))
       (when (eq (intern variable) (car elem))
        (setcar (nthcdr 3 elem) value)))))
-    
+
 (defun assistant-render-text (text node)
   (unless (and text node)
-    (gnus-error 
-     5 
+    (gnus-error
+     5
      "The assistant was asked to render invalid text or node data"))
   (dolist (elem text)
     (if (stringp elem)
@@ -272,21 +270,19 @@
            (cadr type))
           assistant-widgets))
         (t
-         (push 
+         (push
           (widget-create
            'editable-field
            :value-face 'assistant-field
            :assistant-variable variable
            (assistant-get-variable node variable))
           assistant-widgets)
-         ;; The editable-field widget apparently inserts a newline;
-         ;; remove it.
-         (delete-char -1)
          (add-text-properties start (point)
-                              (list
-                               'bold t
-                               'face 'assistant-field
-                               'not-read-only t))))))))
+                              (list
+                               'bold t
+                               'face 'assistant-field
+                               'not-read-only t)))))))
+  (widget-setup))
 
 (defun assistant-render-node (node-name)
   (let ((node (assistant-find-node node-name))
@@ -364,7 +360,7 @@
     (setq variable (cadr variable))
     (let ((type (nth 1 variable))
          (value (nth 3 variable)))
-      (when 
+      (when
          (cond
           ((eq type :number)
            (string-match "[^0-9]" value))
@@ -414,7 +410,7 @@
        (setq applicable (cons elem applicable))))
 
     ;; return the first thing we can
-    
+
     (while (setq elem (pop applicable))
       (push (cadr (cadr elem)) return))
 
@@ -427,12 +423,12 @@
            (append (assistant-get-list node "variable")
                    variables)))
     variables))
-  
+
 (defun assistant-eval (form)
   (let ((bindings nil))
     (dolist (variable (assistant-get-all-variables))
       (setq variable (cadr variable))
-      (push (list (car variable) 
+      (push (list (car variable)
                  (if (eq (nth 3 variable) 'default)
                      nil
                    (if (listp (nth 3 variable))
@@ -483,5 +479,4 @@
 
 (provide 'assistant)
 
-;;; arch-tag: 0404bfa2-9226-4611-8d3f-335c2416175b
 ;;; assistant.el ends here