diff options
| author | Richard M. Stallman | 1995-08-08 21:18:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-08-08 21:18:36 +0000 |
| commit | fab2e906baee1924e34d9006dfb7998eb3b40d5f (patch) | |
| tree | 5f5595f6e61a4d7a6bdeeecb5ae03308d4f60360 | |
| parent | d544c776f62b54b76f55e61f00bda00a3cc4f489 (diff) | |
| download | emacs-fab2e906baee1924e34d9006dfb7998eb3b40d5f.tar.gz emacs-fab2e906baee1924e34d9006dfb7998eb3b40d5f.zip | |
(vc-revert-buffer): In a dedicated solitary window,
make the frame invisible instead of trying to delete window.
| -rw-r--r-- | lisp/vc.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index af950518703..fa38ca4f0d5 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1372,11 +1372,17 @@ the file on the branch you are editing." | |||
| 1372 | (if (and changed (or vc-suppress-confirm | 1372 | (if (and changed (or vc-suppress-confirm |
| 1373 | (not (yes-or-no-p "Discard changes? ")))) | 1373 | (not (yes-or-no-p "Discard changes? ")))) |
| 1374 | (progn | 1374 | (progn |
| 1375 | (delete-window) | 1375 | (if (and (window-dedicated-p (selected-window)) |
| 1376 | (one-window-p t 'selected-frame)) | ||
| 1377 | (make-frame-invisible (selected-frame)) | ||
| 1378 | (delete-window)) | ||
| 1376 | (error "Revert cancelled")) | 1379 | (error "Revert cancelled")) |
| 1377 | (set-buffer obuf)) | 1380 | (set-buffer obuf)) |
| 1378 | (if changed | 1381 | (if changed |
| 1379 | (delete-window)) | 1382 | (if (and (window-dedicated-p (selected-window)) |
| 1383 | (one-window-p t 'selected-frame)) | ||
| 1384 | (make-frame-invisible (selected-frame)) | ||
| 1385 | (delete-window))) | ||
| 1380 | (vc-backend-revert file) | 1386 | (vc-backend-revert file) |
| 1381 | (vc-resynch-window file t t) | 1387 | (vc-resynch-window file t t) |
| 1382 | ) | 1388 | ) |