aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-11-27 20:28:34 +0100
committerLars Magne Ingebrigtsen2014-11-27 20:28:34 +0100
commita5fde629ffff283132122f57996e1296816c3640 (patch)
tree0ff04bee7ce0ed015d7d3b35333f880a38652a5b
parent370258f7616887a7a0edddda8a09299897f2df70 (diff)
downloademacs-a5fde629ffff283132122f57996e1296816c3640.tar.gz
emacs-a5fde629ffff283132122f57996e1296816c3640.zip
* net/eww.el (eww-restore-history): Bind `inhibit-modification-hooks'
instead of `after-change-functions'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/eww.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f636698f43..7ff0dc8eea5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-27 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * net/eww.el (eww-restore-history): Bind
4 `inhibit-modification-hooks' instead of `after-change-functions'.
5
12014-11-27 Ulf Jasper <ulf.jasper@web.de> 62014-11-27 Ulf Jasper <ulf.jasper@web.de>
2 7
3 * net/newst-backend.el (newsticker--parse-atom-1.0): Handle 8 * net/newst-backend.el (newsticker--parse-atom-1.0): Handle
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index f65403b3622..e74935b22f9 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -374,7 +374,7 @@ See the `eww-search-prefix' variable for the search engine used."
374 (plist-put eww-data :source source) 374 (plist-put eww-data :source source)
375 (plist-put eww-data :dom document) 375 (plist-put eww-data :dom document)
376 (let ((inhibit-read-only t) 376 (let ((inhibit-read-only t)
377 (after-change-functions nil) 377 (inhibit-modification-hooks nil)
378 (shr-target-id (url-target (url-generic-parse-url url))) 378 (shr-target-id (url-target (url-generic-parse-url url)))
379 (shr-external-rendering-functions 379 (shr-external-rendering-functions
380 '((title . eww-tag-title) 380 '((title . eww-tag-title)
@@ -712,7 +712,7 @@ the like."
712 712
713(defun eww-restore-history (elem) 713(defun eww-restore-history (elem)
714 (let ((inhibit-read-only t) 714 (let ((inhibit-read-only t)
715 (after-change-functions nil) 715 (inhibit-modification-hooks nil)
716 (text (plist-get elem :text))) 716 (text (plist-get elem :text)))
717 (setq eww-data elem) 717 (setq eww-data elem)
718 (if (null text) 718 (if (null text)