anchor.diff:           (unless (frame-panes-for-layout frame)
              (setf (frame-panes-for-layout frame)
                    (list
  -                  ,@(loop
  -                       for (name . form) in panes
  -                       collect
  -                         `(cons ',name ,(do-pane-creation-form name form))))))
  -         (let ,(loop
  -                  for (name . form) in panes
  -                  collect `(,name (alexandria:assoc-value
  -                                   (frame-panes-for-layout frame)
  -                                   ',name :test #'eq)))
  +                  ,@(loop for (name . form) in panes
  +                          collect `(cons ',name ,(generate-pane-creation-form
  +                                                  name form))))))
  +         (let ,(loop for (name . form) in panes
  +                     collect `(,name (alexandria:assoc-value
  +                                      (frame-panes-for-layout frame)
  +                                      ',name :test #'eq)))
              ;; [BTS] added this, but is not sure that this is correct for
              ;; adding a menu-bar transparently, should also only be done
              ;; where the exterior window system does not support menus
  -           ,(if (or menu-bar pointer-documentation)
  -                `(setf (frame-panes frame)
  -                       (ecase (frame-current-layout frame)
  -                         ,@(mapcar (lambda (layout)
  -                                     `(,(first layout)
  -                                        (vertically ()
  -                                          ,@(cond
  -                                              ((eq menu-bar t)
  -                                               `((setf (frame-menu-bar-pane frame)
  -                                                       (clim-internals::make-menu-bar
  -                                                        ',class-name))))
  -                                              ((consp menu-bar)
  -                                               `((clim-internals::make-menu-bar
  -                                                  (make-command-table
  -                                                   nil
  -                                                   :menu ',menu-bar))))
  -                                              (menu-bar
  -                                               `((clim-internals::make-menu-bar
  -                                                  ',menu-bar)))
  -                                              (t nil))
  -                                          ,@(rest layout)
  -                                          ,@(when pointer-documentation
  -                                              '(%pointer-documentation%)))))
  -                                   layouts)))
  -                `(setf (frame-panes frame)
  -                       (ecase (frame-current-layout frame)
  -                         ,@layouts)))))
  +           (setf (frame-panes frame)
  +                 (ecase (frame-current-layout frame)
  +                   ,@(if (or menu-bar pointer-documentation)
  +                         (mapcar (lambda (layout)
  +                                   `(,(first layout)
  +                                     (vertically ()
  +                                       ,@(cond
  +                                           ((eq menu-bar t)
  +                                            `((setf (frame-menu-bar-pane frame)
  +                                                    (make-menu-bar ',class-name))))
  +                                           ((consp menu-bar)
  +                                            `((make-menu-bar
  +                                               (make-command-table
  +                                                nil :menu ',menu-bar))))
  +                                           (menu-bar
  +                                            `((make-menu-bar ',menu-bar)))
  +                                           (t nil))
  +                                       ,@(rest layout)
  +                                       ,@(when pointer-documentation
  +                                           '(%pointer-documentation%)))))
  +                                 layouts)
  +                         layouts)))))
          ;; Update frame-current-panes and the special pane slots.
          (update-frame-pane-lists frame))))
   
  
positive.code:           ,@user-default-initargs)
           ,@other-options)
  
         ,(make-panes-generate-panes-form
           name menu-bar panes layouts pointer-documentation)
  
         ,@(when command-table
  
negative.code:           (t ; Non-standard pane designator fed to the `make-pane'
             `(make-pane ',pane :name ',name ,@options)))))
  
  (defun generate-generate-panes-form (class-name menu-bar panes layouts
                                   pointer-documentation)
    (when pointer-documentation
      (setf panes (append panes
                          '((%pointer-documentation%
  