Commit 9577b569 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/dired.el (dired-restore-desktop-buffer): Demote errors;

eg in case a glob match fails.

Fixes: debbugs:16884
parent aea124c4
2014-02-26 Glenn Morris <rgm@gnu.org>
* dired.el (dired-restore-desktop-buffer): Demote errors;
eg in case a glob match fails. (Bug#16884)
2014-02-26 Dmitry Gutov <dgutov@yandex.ru>
* emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'
......@@ -13,7 +18,8 @@
* emacs-lisp/edebug.el (defmacro): Fix debug spec. (Bug#16868)
* faces.el (tty-setup-hook, tty-run-terminal-initialization): Doc fixes.
* faces.el (tty-setup-hook, tty-run-terminal-initialization):
Doc fixes.
* startup.el (term-setup-hook): Doc fix. Make obsolete.
* term/sun.el (sun-raw-prefix-hooks):
Use tty-setup-hook instead of term-setup-hook.
......
......@@ -3845,7 +3845,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
(let* ((dired-dir (car misc-data))
(dir (if (consp dired-dir) (car dired-dir) dired-dir)))
(if (file-directory-p (file-name-directory dir))
(progn
(with-demoted-errors "Desktop: Problem restoring directory: %S"
(dired dired-dir)
;; The following elements of `misc-data' are the keys
;; from `dired-subdir-alist'.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment