diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-02-26 14:18:49 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-02-26 14:18:49 -0500 |
| commit | 9577b56996868204a5e86e0233a763652b42b788 (patch) | |
| tree | 184d602804662298683d34f50bb901012bf0f573 /lisp | |
| parent | aea124c47dd16cde97fa467082b4be5f2c6d31f7 (diff) | |
| download | emacs-9577b56996868204a5e86e0233a763652b42b788.tar.gz | |
* lisp/dired.el (dired-restore-desktop-buffer): Demote errors;
eg in case a glob match fails.
Fixes: debbugs:16884
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/dired.el | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 01017ad7fc2..4748767f939 100644 --- 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 b1b22a6a99a..2bf9f7456fe 100644 --- 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'. |