Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
e59fa9ad
Commit
e59fa9ad
authored
Feb 22, 2014
by
Juanma Barranquero
Browse files
lisp/desktop.el: Do not fail when desktop-files-not-to-save is nil.
parent
d3cac061
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
17 deletions
+25
-17
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/desktop.el
lisp/desktop.el
+19
-17
No files found.
lisp/ChangeLog
View file @
e59fa9ad
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
...
...
lisp/desktop.el
View file @
e59fa9ad
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment