Fix eww.el desktop support.

* lisp/net/eww.el (eww-mode): Add autoload cookie.
(eww-restore-desktop): Use inhibit-read-only.

Fixes: debbugs:19226

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4383437c6d4e59b0a026d1540b9a5609f55dca4..42628ff2c53e99d58055e9036e79a3ea60a393ed 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-16  Ivan Shmakov  <ivan@siamics.net>
+
+       * net/eww.el: Fix desktop support.  (Bug#19226)
+       (eww-mode): Add autoload cookie.
+       (eww-restore-desktop): Use inhibit-read-only.
+
 2015-02-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/eieio.el (defclass): Use make-instance rather than

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index c401701f255e3e848eb49ced278a70f7b62e0a1d..c2da4c96173abead86f74007e6a74b2b67a4d425 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -686,6 +686,8 @@ the like."
     map)
   "Tool bar for `eww-mode'.")
 
+;; Autoload cookie needed by desktop.el.
+;;;###autoload
 (define-derived-mode eww-mode special-mode "eww"
   "Mode for browsing the web."
   (setq-local eww-data (list :title ""))
@@ -1877,8 +1879,9 @@ Otherwise, the restored buffer will contain a prompt to do so by using
        (case eww-restore-desktop
          ((t auto) (eww (plist-get eww-data :url)))
          ((zerop (buffer-size))
-          (insert (substitute-command-keys
-                   eww-restore-reload-prompt))))))
+          (let ((inhibit-read-only t))
+            (insert (substitute-command-keys
+                     eww-restore-reload-prompt)))))))
     ;; .
     (current-buffer)))