(ibuffer-delete-window-on-quit): Remove. (ibuffer-restore-window-config-on-quit): New variable to replace `ibuffer-delete-window-on-quit'. Update all references. (ibuffer-prev-window-config): New variable. (ibuffer-quit): Restore previous window configuration instead of deleting window. (ibuffer): Save window configuration before showing Ibuffer buffer.