* net/tramp.el (tramp-ssh-controlmaster-template): Make it a

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index c8023bb43ed6c285ce51b45577deb67bd5dd555c..1151bd434bc9a3fb53def09e91a2e13a6ae1f9d3 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,6 +1,7 @@
 ;;; desktop.el --- save partial status of Emacs when killed
 
-;; Copyright (C) 1993-1995, 1997, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 2000-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: convenience
@@ -825,7 +826,7 @@ MODE is the major mode.
          (or (and filename
                  (stringp desktop-files-not-to-save)
                   (not (string-match desktop-files-not-to-save filename)))
-             (and (eq mode 'dired-mode)
+             (and (memq mode '(dired-mode vc-dir-mode))
                   (with-current-buffer bufname
                     (not (setq dired-skip
                                (string-match desktop-files-not-to-save