Implement a command and mode for displaying and editing cookies

diff --git a/etc/NEWS b/etc/NEWS
index db6ad061b28f0b2b3c0bbcef3dac099d146b2bd0..8df6153e80841a688c7e60dfea980e85e7dc26a6 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1194,6 +1194,9 @@ and the `attributes' slot is always nil.
 The `url-retrieve' function now uses this to encode its URL argument,
 in case that is not properly encoded.
 
+*** New command `url-cookie-list' displays all the current cookies, and
+allows deleting selected cookies.
+
 ** notifications.el supports now version 1.2 of the Notifications API.
 The function `notifications-get-capabilities' returns the supported
 server properties.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7aa962b9adaf4d94c6ca69cd1622ac05d0ddbd4a..76d1f0654015c03d900a06f5e7b60f2a95b76ec8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-mode): Undo isn't necessary in eww buffers,
+       probably.
+
 2013-06-26  Glenn Morris  <rgm@gnu.org>
 
        * htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 61bb4235c34a7969fab2f16c439d992aa3e49658..5ad4c327627cad23ade73ecef118ece1dacd53ce 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -346,6 +346,7 @@ word(s) will be searched for via `eww-search-prefix'."
   (set (make-local-variable 'after-change-functions) 'eww-process-text-input)
   (set (make-local-variable 'eww-history) nil)
   (set (make-local-variable 'eww-history-position) 0)
+  (buffer-disable-undo)
   ;;(setq buffer-read-only t)
   )
 

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 0d963eddc02ba2b1de85d43a71dc1bb22ab0e549..7b64b4cb3ebf72aca809f532f0e566f4d55206b0 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * url-cookie.el: Implement a command and mode for displaying and
+       editing cookies.
+
 2013-06-21  Glenn Morris  <rgm@gnu.org>
 
        * url-future.el (url-future-call): Remove useless value call.

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 6692c81287118ad59ccde313e6e47318ec99413d..3e543300b30ea8013c0fa2c8e9124353137c7741 100644 (file)
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -349,6 +349,94 @@ to run the `url-cookie-setup-save-timer' function manually."
                                          url-cookie-save-interval
                                          #'url-cookie-write-file))))
 
+;;; Mode for listing and editing cookies.
+
+(defun url-cookie-list ()
+  "List the URL cookies."
+  (interactive)
+
+  (when (and (null url-cookie-secure-storage)
+            (null url-cookie-storage))
+    (error "No cookies are defined"))
+
+  (pop-to-buffer "*url cookies*")
+  (let ((inhibit-read-only t)
+       (domains (sort
+                 (copy-sequence
+                  (append url-cookie-secure-storage
+                          url-cookie-storage))
+                 (lambda (e1 e2)
+                   (string< (car e1) (car e2)))))
+       (domain-length 0)
+       start name format domain)
+    (erase-buffer)
+    (url-cookie-mode)
+    (dolist (elem domains)
+      (setq domain-length (max domain-length (length (car elem)))))
+    (setq format (format "%%-%ds %%-20s %%s" domain-length)
+         header-line-format
+         (concat " " (format format "Domain" "Name" "Value")))
+    (dolist (elem domains)
+      (setq domain (car elem))
+      (dolist (cookie (sort (copy-sequence (cdr elem))
+                           (lambda (c1 c2)
+                             (string< (url-cookie-name c1)
+                                      (url-cookie-name c2)))))
+       (setq start (point)
+             name (url-cookie-name cookie))
+       (when (> (length name) 20)
+         (setq name (substring name 0 20)))
+       (insert (format format domain name
+                       (url-cookie-value cookie))
+               "\n")
+       (setq domain "")
+       (put-text-property start (1+ start) 'url-cookie cookie)))
+    (goto-char (point-min))))
+
+(defun url-cookie-delete ()
+  "Delete the cookie on the current line."
+  (interactive)
+  (let ((cookie (get-text-property (line-beginning-position) 'url-cookie))
+       (inhibit-read-only t)
+       variable)
+    (unless cookie
+      (error "No cookie on the current line"))
+    (setq variable (if (url-cookie-secure cookie)
+                      'url-cookie-secure-storage
+                    'url-cookie-storage))
+    (let* ((list (symbol-value variable))
+          (elem (assoc (url-cookie-domain cookie) list)))
+      (setq elem (delq cookie elem))
+      (when (zerop (length (cdr elem)))
+       (setq list (delq elem list)))
+      (set variable list))
+    (setq url-cookies-changed-since-last-save t)
+    (url-cookie-write-file)
+    (delete-region (line-beginning-position)
+                  (progn
+                    (forward-line 1)
+                    (point)))))
+
+(defun url-cookie-quit ()
+  "Kill the current buffer."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(defvar url-cookie-mode-map
+  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (define-key map "q" 'url-cookie-quit)
+    (define-key map [delete] 'url-cookie-delete)
+    map))
+
+(define-derived-mode url-cookie-mode nil "eww"
+  "Mode for listing cookies.
+
+\\{url-cookie-mode-map}"
+  (buffer-disable-undo)
+  (setq buffer-read-only t
+       truncate-lines t))
+
 (provide 'url-cookie)
 
 ;;; url-cookie.el ends here