procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lisp/desktop.el: Do not fail when desktop-files-not-to-save is nil.

Browse source
This commit is contained in:
Juanma Barranquero 2014-02-22 03:10:49 +01:00
parent d3cac06127
commit e59fa9adb3
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-02-22 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop-save-buffer-p): Do not fail when
desktop-files-not-to-save is nil. Return t for true result
as the doc says.
2014-02-22 Daniel Colascione <dancol@dancol.org>
* net/secrets.el (secrets-create-item,secrets-search-items): Check

36
lisp/desktop.el
View file

@ -878,23 +878,25 @@ 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)
dired-skip)
(and (not (and (stringp desktop-buffers-not-to-save)
(not filename)
(string-match-p 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-p desktop-files-not-to-save filename)))
(and (memq mode '(dired-mode vc-dir-mode))
(with-current-buffer bufname
(not (setq dired-skip
(string-match-p desktop-files-not-to-save
default-directory)))))
(and (null filename)
(null dired-skip) ; bug#5755
(with-current-buffer bufname desktop-save-buffer))))))
(no-regexp-to-check (not (stringp desktop-files-not-to-save)))
dired-skip)
(and (or filename
(not (stringp desktop-buffers-not-to-save))
(not (string-match-p desktop-buffers-not-to-save bufname)))
(not (memq mode desktop-modes-not-to-save))
(or (and filename
(or no-regexp-to-check
(not (string-match-p desktop-files-not-to-save filename))))
(and (memq mode '(dired-mode vc-dir-mode))
(or no-regexp-to-check
(not (setq dired-skip
(with-current-buffer bufname
(string-match-p desktop-files-not-to-save
default-directory))))))
(and (null filename)
(null dired-skip) ; bug#5755
(with-current-buffer bufname desktop-save-buffer)))
t)))
;; ----------------------------------------------------------------------------
(defun desktop-file-name (filename dirname)