[Emacs-diffs] trunk r117650: lisp/net/eww.el (eww-bookmarks-directory): New variable.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 117650
revision-id: address@hidden
parent: address@hidden
author: Eric Brown <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2014-08-05 20:15:52 +0200
message:
  lisp/net/eww.el (eww-bookmarks-directory): New variable.
  
  * lisp/net/eww.el (eww-bookmarks-directory): New variable.
  (eww-write-bookmarks): Use it.
  (eww-read-bookmarks): Ditto.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-05 18:15:03 +0000
+++ b/lisp/ChangeLog    2014-08-05 18:15:52 +0000
@@ -1,3 +1,9 @@
+2014-08-05  Eric Brown  <address@hidden>  (tiny change)
+
+       * net/eww.el (eww-bookmarks-directory): New variable.
+       (eww-write-bookmarks): Use it.
+       (eww-read-bookmarks): Ditto.
+
 2014-08-05  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/shr.el (shr-copy-url): Also copy the image URL.

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2014-06-27 00:48:34 +0000
+++ b/lisp/net/eww.el   2014-08-05 18:15:52 +0000
@@ -57,6 +57,12 @@
   :group 'eww
   :type 'string)
 
+(defcustom eww-bookmarks-directory user-emacs-directory
+  "Directory where bookmark files will be stored."
+  :version "24.5"
+  :group 'eww
+  :type 'string)
+
 (defcustom eww-use-external-browser-for-content-type
   "\\`\\(video/\\|audio/\\|application/ogg\\)"
   "Always use external browser for specified content-type."
@@ -1118,12 +1124,12 @@
        (message "Bookmarked %s (%s)" eww-current-url eww-current-title))))
 
 (defun eww-write-bookmarks ()
-  (with-temp-file (expand-file-name "eww-bookmarks" user-emacs-directory)
+  (with-temp-file (expand-file-name "eww-bookmarks" eww-bookmarks-directory)
     (insert ";; Auto-generated file; don't edit\n")
     (pp eww-bookmarks (current-buffer))))
 
 (defun eww-read-bookmarks ()
-  (let ((file (expand-file-name "eww-bookmarks" user-emacs-directory)))
+  (let ((file (expand-file-name "eww-bookmarks" eww-bookmarks-directory)))
     (setq eww-bookmarks
          (unless (zerop (or (nth 7 (file-attributes file)) 0))
            (with-temp-buffer