[Emacs-diffs] trunk r115246: eww usability improvements

[Teodor Zlatanov]

------------------------------------------------------------
revno: 115246
revision-id: address@hidden
parent: address@hidden
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Tue 2013-11-26 15:05:48 -0500
message:
  eww usability improvements
  
  * net/eww.el (eww-bookmark-browse): Use 'eww-browse-url'.
  (eww-add-bookmark): ask confirmation when add to bookmarks
  (eww-quit): ask confirmation before quitting eww
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-26 19:17:55 +0000
+++ b/lisp/ChangeLog    2013-11-26 20:05:48 +0000
@@ -1,3 +1,9 @@
+2013-11-26  Kenjiro NAKAYAMA <address@hidden>  (tiny change)
+
+        * net/eww.el (eww-bookmark-browse): Use 'eww-browse-url'.
+        (eww-add-bookmark): ask confirmation when add to bookmarks
+        (eww-quit): ask confirmation before quitting eww
+
 2013-11-26  Eli Zaretskii  <address@hidden>
 
        * vc/vc.el (vc-diff-internal): Use *-dos coding-system when

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-11-21 16:41:35 +0000
+++ b/lisp/net/eww.el   2013-11-26 20:05:48 +0000
@@ -403,8 +403,10 @@
 (defun eww-quit ()
   "Exit the Emacs Web Wowser."
   (interactive)
-  (setq eww-history nil)
-  (kill-buffer (current-buffer)))
+  (if (y-or-n-p "quit eww? ")
+      (progn
+       (setq eww-history nil)
+       (kill-buffer (current-buffer)))))
 
 (defun eww-back-url ()
   "Go to the previously displayed page."
@@ -964,14 +966,16 @@
     (when (equal eww-current-url
                 (plist-get bookmark :url))
       (error "Already bookmarked")))
-  (let ((title (replace-regexp-in-string "[\n\t\r]" " " eww-current-title)))
-    (setq title (replace-regexp-in-string "\\` +\\| +\\'" "" title))
-    (push (list :url eww-current-url
-               :title title
-               :time (current-time-string))
-         eww-bookmarks))
-  (eww-write-bookmarks)
-  (message "Bookmarked %s (%s)" eww-current-url eww-current-title))
+  (if (y-or-n-p "bookmark this page? ")
+      (progn
+       (let ((title (replace-regexp-in-string "[\n\t\r]" " " 
eww-current-title)))
+         (setq title (replace-regexp-in-string "\\` +\\| +\\'" "" title))
+         (push (list :url eww-current-url
+                     :title title
+                     :time (current-time-string))
+               eww-bookmarks))
+       (eww-write-bookmarks)
+       (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)
@@ -1063,7 +1067,7 @@
     ;; just let it remain.
     (ignore-errors
       (delete-window))
-    (eww (plist-get bookmark :url))))
+    (eww-browse-url (plist-get bookmark :url))))
 
 (defun eww-next-bookmark ()
   "Go to the next bookmark in the list."