[Emacs-diffs] trunk r116566: * lisp/dired.el (dired-restore-desktop-buffer): Demote errors;

[Glenn Morris]

------------------------------------------------------------
revno: 116566
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16884
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-26 14:18:49 -0500
message:
  * lisp/dired.el (dired-restore-desktop-buffer): Demote errors;
  eg in case a glob match fails.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired.el                  dired.el-20091113204419-o5vbwnq5f7feedwu-482

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-26 02:31:27 +0000
+++ b/lisp/ChangeLog    2014-02-26 19:18:49 +0000
@@ -1,3 +1,8 @@
+2014-02-26  Glenn Morris  <address@hidden>
+
+       * dired.el (dired-restore-desktop-buffer): Demote errors;
+       eg in case a glob match fails.  (Bug#16884)
+
 2014-02-26  Dmitry Gutov  <address@hidden>
 
        * 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.

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2014-02-14 06:59:24 +0000
+++ b/lisp/dired.el     2014-02-26 19:18:49 +0000
@@ -3845,7 +3845,7 @@
   (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'.