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.
This commit is contained in:
Eric Brown 2014-08-05 20:15:52 +02:00 committed by Lars Magne Ingebrigtsen
parent 488df60acc
commit 06e7319ce3
2 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2014-08-05 Eric Brown <brown@fastmail.fm> (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 <larsi@gnus.org>
* net/shr.el (shr-copy-url): Also copy the image URL.

View file

@ -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 @@ Differences in #targets are ignored."
(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