mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-03 11:33:37 +00:00
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]
This commit is contained in:
parent
19ae0deb1c
commit
e1cb2c1314
@ -1,3 +1,8 @@
|
||||
2010-05-10 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* desktop.el (desktop-save-buffer-p): Don't mistakenly include
|
||||
all dired buffers, even tramp ones. (Bug#5755) [Backport from trunk]
|
||||
|
||||
2010-05-07 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* Version 23.2 released.
|
||||
|
@ -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))))))
|
||||
|
||||
;; ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user