Make eww use mailcap when displaying PDF files

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 40e6b364e45c42efc1fc32e6a6e9bc171be84e50..bad0073fbbab4dbf961f5ded557c11ca3e396553 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1375,7 +1375,9 @@ after that many seconds of idle time."
        ;; Restore buffer list order with new buffer at end. Don't change
        ;; the order for old desktop files (old desktop module behavior).
        (unless (< desktop-file-version 206)
-         (mapc 'bury-buffer buffer-list)
+         (dolist (buf buffer-list)
+            (and (buffer-live-p buf)
+                 (bury-buffer buf)))
          (when result (bury-buffer result)))
        (when result
          (unless (or desktop-first-buffer (< desktop-file-version 206))
@@ -1411,8 +1413,8 @@ after that many seconds of idle time."
             (if (consp desktop-buffer-mark)
                 (progn
                   (move-marker (mark-marker) (car desktop-buffer-mark))
-                  ;; FIXME: Should we call (de)activate-mark instead?
-                  (setq mark-active (car (cdr desktop-buffer-mark))))
+                  (if (car (cdr desktop-buffer-mark))
+                      (activate-mark 'dont-touch-tmm)))
               (move-marker (mark-marker) desktop-buffer-mark)))
          ;; Never override file system if the file really is read-only marked.
          (when desktop-buffer-read-only (setq buffer-read-only desktop-buffer-read-only))