diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-09 17:30:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-09 17:30:08 -0700 |
| commit | e1cb2c1314c1a58d9d83293019b5d563a3edb072 (patch) | |
| tree | e2b3123e2003d79479716fd6921956d94cb10963 /lisp/desktop.el | |
| parent | 19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0 (diff) | |
| download | emacs-e1cb2c1314c1a58d9d83293019b5d563a3edb072.tar.gz | |
Backport from trunk: Fix bug#5755.
* desktop.el (desktop-save-buffer-p): Don't mistakenly include
all dired buffers, even tramp ones. (Bug#5755) [Backport from trunk]
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 33e8cb1745f..0e6153cfe47 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1,7 +1,8 @@ ;;; desktop.el --- save partial status of Emacs when killed ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: convenience @@ -811,19 +812,23 @@ which means to truncate VAR's value to at most MAX-SIZE elements FILENAME is the visited file name, BUFNAME is the buffer name, and MODE is the major mode. \n\(fn FILENAME BUFNAME MODE)" - (let ((case-fold-search nil)) + (let ((case-fold-search nil) + dired-skip) (and (not (and (stringp desktop-buffers-not-to-save) (not filename) (string-match desktop-buffers-not-to-save bufname))) (not (memq mode desktop-modes-not-to-save)) + ;; FIXME this is broken if desktop-files-not-to-save is nil. (or (and filename (stringp desktop-files-not-to-save) (not (string-match desktop-files-not-to-save filename))) (and (eq mode 'dired-mode) (with-current-buffer bufname - (not (string-match desktop-files-not-to-save - default-directory)))) + (not (setq dired-skip + (string-match desktop-files-not-to-save + default-directory))))) (and (null filename) + (null dired-skip) ; bug#5755 (with-current-buffer bufname desktop-save-buffer)))))) ;; ---------------------------------------------------------------------------- |