]> code.delx.au - gnu-emacs-elpa/commitdiff
Check if the original Dired buffer is still alive
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 1 Oct 2014 23:58:13 +0000 (03:58 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 1 Oct 2014 23:58:13 +0000 (03:58 +0400)
SVN can be awfully slow, and the user might call `dired-find-alternate-file'.

diff-hl-dired.el

index 2bbf12bedb08a9970b24d2b98dbc67254d1c81cf..f1effda0052e48ffe21558718fb04fbf1411efe0 100644 (file)
         (vc-call-backend
          backend 'dir-status def-dir
          (lambda (entries &optional more-to-come)
-           (with-current-buffer buffer
-             (dolist (entry entries)
-               (cl-destructuring-bind (file state &rest) entry
-                 (let ((type (plist-get
-                              '(edited change added insert removed delete
-                                unregistered unknown)
-                              state)))
-                   (if (string-match "\\`\\([^/]+\\)/" file)
-                       (let* ((dir (match-string 1 file))
-                              (value (cdr (assoc dir dirs-alist))))
-                         (unless (eq value type)
-                           (if (null value)
-                               (push (cons dir type) dirs-alist)
-                             (setcdr (assoc dir dirs-alist) 'change))))
-                     (push (cons file type) files-alist)))))
-             (unless more-to-come
-               (diff-hl-dired-highlight-items (append dirs-alist
-                                                      files-alist))
-               (diff-hl-dired-update-ignores backend def-dir))))
+           (when (buffer-live-p buffer)
+             (with-current-buffer buffer
+               (dolist (entry entries)
+                 (cl-destructuring-bind (file state &rest) entry
+                   (let ((type (plist-get
+                                '(edited change added insert removed delete
+                                         unregistered unknown)
+                                state)))
+                     (if (string-match "\\`\\([^/]+\\)/" file)
+                         (let* ((dir (match-string 1 file))
+                                (value (cdr (assoc dir dirs-alist))))
+                           (unless (eq value type)
+                             (if (null value)
+                                 (push (cons dir type) dirs-alist)
+                               (setcdr (assoc dir dirs-alist) 'change))))
+                       (push (cons file type) files-alist)))))
+               (unless more-to-come
+                 (diff-hl-dired-highlight-items (append dirs-alist
+                                                        files-alist))
+                 (diff-hl-dired-update-ignores backend def-dir)))))
          )))))
 
 (defun diff-hl-dired-update-ignores (backend def-dir)
                 collect file)
        nil
        (lambda (entries &optional more-to-come)
-         (with-current-buffer buffer
-           (dolist (entry entries)
-             (cl-destructuring-bind (file state &rest) entry
-               (when (eq state 'ignored)
-                 (push (cons (directory-file-name file)
-                             'ignored) entries-alist))))
-           (unless more-to-come
-             (diff-hl-dired-highlight-items entries-alist))))
+         (when (buffer-live-p buffer)
+           (with-current-buffer buffer
+             (dolist (entry entries)
+               (cl-destructuring-bind (file state &rest) entry
+                 (when (eq state 'ignored)
+                   (push (cons (directory-file-name file)
+                               'ignored) entries-alist))))
+             (unless more-to-come
+               (diff-hl-dired-highlight-items entries-alist)))))
        ))))
 
 (defun diff-hl-dired-highlight-items (alist)