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

eg in case a glob match fails.

Fixes: debbugs:16884

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01017ad..4748767 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lisp/dired.el b/lisp/dired.el
index b1b22a6..2bf9f74 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -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'.