summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2019-01-28 22:27:22 +0200
committerJuri Linkov <juri@linkov.net>2019-01-28 22:27:22 +0200
commit0f94d422f16cc989f49ea5c7fc87c947c5f42ced (patch)
tree45c87d6c9b748a8b9e4f65a46e5c5c170625f55f /lisp
parent599eee3ebefa4e1c7c6610e5629090ad7ad5159b (diff)
downloademacs-0f94d422f16cc989f49ea5c7fc87c947c5f42ced.tar.gz
emacs-0f94d422f16cc989f49ea5c7fc87c947c5f42ced.tar.bz2
emacs-0f94d422f16cc989f49ea5c7fc87c947c5f42ced.zip
More checks for live buffers.
* lisp/dired-x.el (dired-jump): Check if archive/tar superior buffer was killed by the user. * lisp/progmodes/ruby-mode.el (ruby-flymake--helper): Check if source buffer was killed by the user immediately after visiting and before process finishes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/dired-x.el6
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 44e73759fa7..defc541ddc9 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -463,9 +463,11 @@ Interactively with prefix argument, read FILE-NAME."
(list nil (and current-prefix-arg
(read-file-name "Jump to Dired file: "))))
(cond
- ((bound-and-true-p archive-subfile-mode)
+ ((and (bound-and-true-p archive-subfile-mode)
+ (buffer-live-p archive-superior-buffer))
(switch-to-buffer archive-superior-buffer))
- ((bound-and-true-p tar-subfile-mode)
+ ((and (bound-and-true-p tar-subfile-mode)
+ (buffer-live-p tar-superior-buffer))
(switch-to-buffer tar-superior-buffer))
(t
;; Expand file-name before `dired-goto-file' call:
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 8aa583eb319..e83778af946 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2288,7 +2288,7 @@ It will be properly highlighted even when the call omits parens.")
:command command
:sentinel
(lambda (proc _event)
- (when (eq 'exit (process-status proc))
+ (when (and (eq 'exit (process-status proc)) (buffer-live-p source))
(unwind-protect
(if (with-current-buffer source (eq proc ruby--flymake-proc))
(with-current-buffer (process-buffer proc)