aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Shmakov2015-02-16 18:55:02 +0000
committerIvan Shmakov2015-02-16 18:55:02 +0000
commit2ea5364ca8d1a8dc3f8ac4c9a5ba5c7f03666258 (patch)
tree165465da0f7f29eb804109337c8fc1a4dca87fa7
parentc4e2be4587ec6d0f1367b1bfe220a71360e25bea (diff)
downloademacs-2ea5364ca8d1a8dc3f8ac4c9a5ba5c7f03666258.tar.gz
emacs-2ea5364ca8d1a8dc3f8ac4c9a5ba5c7f03666258.zip
Fix eww.el desktop support.
* lisp/net/eww.el (eww-mode): Add autoload cookie. (eww-restore-desktop): Use inhibit-read-only. Fixes: debbugs:19226
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/eww.el7
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4383437c6d..42628ff2c53 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12015-02-16 Ivan Shmakov <ivan@siamics.net>
2
3 * net/eww.el: Fix desktop support. (Bug#19226)
4 (eww-mode): Add autoload cookie.
5 (eww-restore-desktop): Use inhibit-read-only.
6
12015-02-16 Stefan Monnier <monnier@iro.umontreal.ca> 72015-02-16 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * emacs-lisp/eieio.el (defclass): Use make-instance rather than 9 * emacs-lisp/eieio.el (defclass): Use make-instance rather than
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index c401701f255..c2da4c96173 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -686,6 +686,8 @@ the like."
686 map) 686 map)
687 "Tool bar for `eww-mode'.") 687 "Tool bar for `eww-mode'.")
688 688
689;; Autoload cookie needed by desktop.el.
690;;;###autoload
689(define-derived-mode eww-mode special-mode "eww" 691(define-derived-mode eww-mode special-mode "eww"
690 "Mode for browsing the web." 692 "Mode for browsing the web."
691 (setq-local eww-data (list :title "")) 693 (setq-local eww-data (list :title ""))
@@ -1877,8 +1879,9 @@ Otherwise, the restored buffer will contain a prompt to do so by using
1877 (case eww-restore-desktop 1879 (case eww-restore-desktop
1878 ((t auto) (eww (plist-get eww-data :url))) 1880 ((t auto) (eww (plist-get eww-data :url)))
1879 ((zerop (buffer-size)) 1881 ((zerop (buffer-size))
1880 (insert (substitute-command-keys 1882 (let ((inhibit-read-only t))
1881 eww-restore-reload-prompt)))))) 1883 (insert (substitute-command-keys
1884 eww-restore-reload-prompt)))))))
1882 ;; . 1885 ;; .
1883 (current-buffer))) 1886 (current-buffer)))
1884 1887