From: Ivan Shmakov <ivan@siamics.net>
Date: Wed, 19 Nov 2014 17:28:19 +0000 (+0100)
Subject: (eww-history-limit): New variable.
X-Git-Tag: emacs-25.0.90~2635^2~413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d5bfc4900dbda0425c2db780bc1bed607167d2a;p=emacs.git

(eww-history-limit): New variable.

* net/eww.el (eww-history-limit): New variable.
(eww-save-history): Use it.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c8a48b40cd..1194ba7aa7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-19  Ivan Shmakov  <ivan@siamics.net>
+
+	* net/eww.el (eww-history-limit): New variable.
+	(eww-save-history): Use it.
+
 2014-11-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/eww.el (eww-desktop-misc-data): Use `cl-remove-duplicates'.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 76e14be4d79..83d96f50b1a 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -95,6 +95,12 @@ The string will be passed through `substitute-command-keys'."
   :group 'eww
   :type 'string)
 
+(defcustom eww-history-limit 50
+  "Maximum number of entries to retain in the history."
+  :version "25.1"
+  :group 'eww
+  :type '(choice (const :tag "Unlimited" nil)
+                 integer))
 (defcustom eww-use-external-browser-for-content-type
   "\\`\\(video/\\|audio/\\|application/ogg\\)"
   "Always use external browser for specified content-type."
@@ -1487,7 +1493,8 @@ Differences in #targets are ignored."
   (setq eww-data (list :title ""))
   ;; Don't let the history grow infinitely.  We store quite a lot of
   ;; data per page.
-  (when-let (tail (nthcdr 50 eww-history))
+  (when-let (tail (and eww-history-limit
+		       (nthcdr eww-history-limit eww-history)))
     (setcdr tail nil)))
 
 (defun eww-list-histories ()