 (defvar darcsum-data nil)
 (defvar darcsum-look-for-adds nil)
 (defvar darcsum-show-context nil)
-(defvar pre-darcsum-ediff-window-configuration nil)
-
-;;make buffer-local variable storing old window configuration, since "let" bindings die before ediff buffers are killed
-(make-variable-buffer-local 'pre-darcsum-ediff-window-configuration)
+(defvar darcsum-pre-ediff-window-configuration nil)
+(defvar darcsum-subdirectory ".")
+
+;; Make buffer-local variable storing old window configuration,
+;; since "let" bindings die before ediff buffers are killed
+(make-variable-buffer-local 'darcsum-pre-ediff-window-configuration)
 
 (defface darcsum-header-face
   '((((class color) (background dark))

  (setq truncate-lines t))

(define-derived-mode darcsum-query-mode indented-text-mode "Darcs Query"
  "Major mode for output from \\<darcsum-mode-map>\\[darcsum-query].

\\{darcsum-query-mode-map}"
  :group 'darcsum

         (if (file-readable-p "_darcs/patches/pending")
             (with-temp-buffer
               (insert-file-contents "_darcs/patches/pending")
               (darcsum-parse-changeset t visible)))))
    (goto-char (point-min))
    (when (looking-at "^What's new in \"\\([^\"]*\\)\":")
      (forward-line 2))
    (unless (looking-at "^$")
      (darcsum-parse-changeset pending visible))))

(defun darcsum-display-changeset (data)
  "Display the changeset DATA using a pcl-cvs-like buffer."
  ;; Lines starting with number indicates start of hunk
  ;; Lines starting with "in directory" indicate directory
  ;; Lines starting with \t indicate non-line change
  (erase-buffer)
  ;;(when (file-readable-p "_darcs/prefs/lastrepo")
  ;;  (insert "repository : ")
