From unknown Sun Jun 22 03:57:03 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16279: 24.3.50; [PATCH] eww: eww-history-mode fixup. Resent-From: Kenjiro NAKAYAMA Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 Dec 2013 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 16279 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 16279@debbugs.gnu.org, 16236@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org, 16236@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.138824288924221 (code B ref -1); Sat, 28 Dec 2013 15:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Dec 2013 15:01:29 +0000 Received: from localhost ([127.0.0.1]:48587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VwvOK-0006IZ-Uc for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54731) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VwvOI-0006IR-RC for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwvOA-0001IK-4z for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:26 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwvOA-0001IG-1W for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwvO1-0004TQ-93 for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2013 10:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwvNs-0001HD-Rb for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2013 10:01:09 -0500 Received: from mail-pd0-x22d.google.com ([2607:f8b0:400e:c02::22d]:33887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwvNs-0001H7-Fu for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2013 10:01:00 -0500 Received: by mail-pd0-f173.google.com with SMTP id p10so9917949pdj.4 for ; Sat, 28 Dec 2013 07:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:from:to:subject:date:message-id:mime-version :content-type; bh=VwxSk5/5IsEeEE5mG5+UvxWqXAA9m/ZwHUaGy1Flis0=; b=BHBBeDS6koLLT0G1wKBWJvxrhQjpGTmZLOGS8KZ50J6qtgqSWmNKU4wL1NjZIWovHS YO4yGxHtIt4ZSLNFhcauYKXnhJEqfkfTheY6dZoqw+vSULV87Cw0s6dGk1BsJXu3rRFQ 1HiArc58mOHt0cSpFj7JbrGP3quH0VtJCxtqzJkJIsYK+VlcfLMdIdibLW00dxaoEP0w Udqus7fyMh/hDhqXl+nN1/s374+DCrQVOFN59BYjNrb198ennaiGkqHWg1pVRp485h1m c+EBQYqvdyzIYKkthSToN9EyCbIkdu5FCjdwH2U0vL7FAW5FbuoZbesZkuerELBAYGsM DWuw== X-Received: by 10.68.217.129 with SMTP id oy1mr57911918pbc.23.1388242859221; Sat, 28 Dec 2013 07:00:59 -0800 (PST) Received: from dhcp-193-97.nrt.redhat.com (nat-pool-nrt-t1.redhat.com. [66.187.238.10]) by mx.google.com with ESMTPSA id qf7sm90802132pac.14.2013.12.28.07.00.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Dec 2013 07:00:58 -0800 (PST) User-agent: mu4e 0.9.9.6pre2; emacs 24.3.50.1 From: Kenjiro NAKAYAMA Date: Sun, 29 Dec 2013 00:00:52 +0900 Message-ID: <87ha9tdnq3.fsf@dhcp-193-97.nrt.redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Since current eww-history does not work well, I fixed. Please review and install it to the official tree if appreciated. Signed-off-by: Kenjiro NAKAYAMA * net/eww.el (eww-list-histories,eww-history-browse): Fixup. (eww-history-quit): Delete and use quit-window. (eww-history-kill): Delete, because it doesn't work well and not necessary. (eww-history-mode-map): Delete some keys and add easy-menu. --- lisp/net/eww.el | 90 +++++++++++++++++++++++---------------------------------- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 25309d1..2fc30b7 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1282,32 +1282,30 @@ Differences in #targets are ignored." (interactive) (when (null eww-history) (error "No eww-histories are defined")) - (set-buffer (get-buffer-create "*eww history*")) - (eww-history-mode) - (let ((inhibit-read-only t) - (domain-length 0) - (title-length 0) - url title format start) - (erase-buffer) - (dolist (history eww-history) - (setq start (point)) - (setq domain-length (max domain-length (length (plist-get history :url)))) - (setq title-length (max title-length (length (plist-get history :title)))) - ) - (setq format (format "%%-%ds %%-%ds" title-length domain-length) - header-line-format - (concat " " (format format "Title" "URL"))) - - (dolist (history eww-history) - (setq url (plist-get history :url)) - (setq title (plist-get history :title)) - (insert (format format title url)) - (insert "\n") - (put-text-property start (point) 'eww-history history) - ) - (goto-char (point-min))) - (pop-to-buffer "*eww history*") - ) + (let ((eww-history-trans eww-history)) + (set-buffer (get-buffer-create "*eww history*")) + (eww-history-mode) + (let ((inhibit-read-only t) + (domain-length 0) + (title-length 0) + url title format start) + (erase-buffer) + (dolist (history eww-history-trans) + (setq start (point)) + (setq domain-length (max domain-length (length (plist-get history :url)))) + (setq title-length (max title-length (length (plist-get history :title))))) + (setq format (format "%%-%ds %%-%ds" title-length domain-length) + header-line-format + (concat " " (format format "Title" "URL"))) + (dolist (history eww-history-trans) + (setq start (point)) + (setq url (plist-get history :url)) + (setq title (plist-get history :title)) + (insert (format format title url)) + (insert "\n") + (put-text-property start (1+ start) 'eww-history history)) + (goto-char (point-min))) + (pop-to-buffer "*eww history*"))) (defun eww-history-browse () "Browse the history under point in eww." @@ -1315,39 +1313,23 @@ Differences in #targets are ignored." (let ((history (get-text-property (line-beginning-position) 'eww-history))) (unless history (error "No history on the current line")) - (eww-history-quit) - (pop-to-buffer "*eww*") - (eww-browse-url (plist-get history :url)))) - -(defun eww-history-quit () - "Kill the current buffer." - (interactive) - (kill-buffer (current-buffer))) - -(defvar eww-history-kill-ring nil) - -(defun eww-history-kill () - "Kill the current history." - (interactive) - (let* ((start (line-beginning-position)) - (history (get-text-property start 'eww-history)) - (inhibit-read-only t)) - (unless history - (error "No history on the current line")) - (forward-line 1) - (push (buffer-substring start (point)) eww-history-kill-ring) - (delete-region start (point)) - (setq eww-history (delq history eww-history)) - )) + (quit-window) + (eww-restore-history history))) (defvar eww-history-mode-map (let ((map (make-sparse-keymap))) (suppress-keymap map) - (define-key map "q" 'eww-history-quit) - (define-key map [(control k)] 'eww-history-kill) + (define-key map "q" 'quit-window) (define-key map "\r" 'eww-history-browse) - (define-key map "n" 'next-error-no-select) - (define-key map "p" 'previous-error-no-select) +;; (define-key map "n" 'next-error-no-select) +;; (define-key map "p" 'previous-error-no-select) + + (easy-menu-define nil map + "Menu for `eww-history-mode-map'." + '("Eww History" + ["Exit" quit-window t] + ["Browse" eww-history-browse + :active (get-text-property (line-beginning-position) 'eww-history)])) map)) (define-derived-mode eww-history-mode nil "eww history" -- 1.8.3.1 Kenjiro From unknown Sun Jun 22 03:57:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kenjiro NAKAYAMA Subject: bug#16279: closed (Re: 24.3.50; [PATCH] eww: eww-history-mode fixup.) Message-ID: References: <87mwc8319s.fsf@violet.siamics.net> <87ha9tdnq3.fsf@dhcp-193-97.nrt.redhat.com> X-Gnu-PR-Message: they-closed 16279 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 16279@debbugs.gnu.org Date: Thu, 17 Jul 2014 07:15:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1405581304-2718-1" This is a multi-part message in MIME format... ------------=_1405581304-2718-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #16279: 24.3.50; [PATCH] eww: eww-history-mode fixup. which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 16279@debbugs.gnu.org. --=20 16279: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D16279 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1405581304-2718-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 16279-done) by debbugs.gnu.org; 17 Jul 2014 07:14:42 +0000 Received: from localhost ([127.0.0.1]:57071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X7ftm-0000h6-7E for submit@debbugs.gnu.org; Thu, 17 Jul 2014 03:14:42 -0400 Received: from fely.am-1.org ([78.47.74.50]:47315) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1X7ftg-0000gv-Sv for 16279-done@debbugs.gnu.org; Thu, 17 Jul 2014 03:14:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:Sender:References:Date:In-Reply-To:Subject:To:From; bh=sjvK7tX0wHuWrqGj/3AkzYvto715NDtvzqgwj22s1dQ=; b=CGI63ltgBz4aJiTwiFDBdc51s8g/GGgoqThu6EJVcXwPigxU1ISpOsqPMHq0cyHxHv5kqBfE/iZLJz9teuxRHbLW10kOKxDX+wa4L6buf9kUfwixrXCVYmFFG5XbVWg4xmyItz6732cxkoXZGVdTCOZ/xfpPIi6PoaS6Q2Wc5RE=; Received: from host-46-241-38-202.bbcustomer.zsttk.net ([46.241.38.202] helo=waterlily.siamics.net) by fely.am-1.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1X7ftf-0004Xc-Cr for 16279-done@debbugs.gnu.org; Thu, 17 Jul 2014 07:14:31 +0000 Received: from violet.siamics.net ([2001:470:1f13:1eb::1:1d]) by waterlily.siamics.net with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1X7ftZ-0000Mv-17 for 16279-done@debbugs.gnu.org; Thu, 17 Jul 2014 14:14:25 +0700 Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtp (Exim 4.80) (envelope-from ) id 1X7ftY-0008S6-3u for 16279-done@debbugs.gnu.org; Thu, 17 Jul 2014 14:14:24 +0700 From: Ivan Shmakov To: 16279-done@debbugs.gnu.org Subject: Re: 24.3.50; [PATCH] eww: eww-history-mode fixup. In-Reply-To: <87ha9tdnq3.fsf@dhcp-193-97.nrt.redhat.com> (Kenjiro NAKAYAMA's message of "Sun, 29 Dec 2013 00:00:52 +0900") Date: Thu, 17 Jul 2014 07:06:57 +0000 References: <87ha9tdnq3.fsf@dhcp-193-97.nrt.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) Message-ID: <87mwc8319s.fsf@violet.siamics.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 16279-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable >>>>> Kenjiro NAKAYAMA writes: > Date: Sun, 29 Dec 2013 00:00:52 +0900 > Since current eww-history does not work well, I fixed. Please review > and install it to the official tree if appreciated. > Signed-off-by: Kenjiro NAKAYAMA > * net/eww.el (eww-list-histories,eww-history-browse): Fixup. > (eww-history-quit): Delete and use quit-window. > (eww-history-kill): Delete, because it doesn't work well and > not necessary. > (eww-history-mode-map): Delete some keys and add easy-menu. [=E2=80=A6] Except for the line numbers and such, this exact diff was applied as e8fcf8ca81c8 back in January. Thus I guess this bug report may safely be closed. That being said, I=E2=80=99d disagree that eww-history-kill is not necessary: the eww-history records contain pages=E2=80=99 DOMs, sources, and rendered texts (as :dom, :source and :text properties, respectively), and the only currently =E2=80=9Csupported=E2=80=9D way to c= lear that is to kill a specific EWW buffer and create one anew, which isn=E2=80=99t all that fine-grained, as it seems. --=20 FSF associate member #7257 http://boycottsystemd.org/ --=-=-= Content-Type: application/octet-stream Content-Disposition: inline Content-Transfer-Encoding: base64 Y29tbWl0IGU4ZmNmOGNhODFjODAyYzMwZjJlMmY3ZDEwNDkwZmY5Yzk1MGMxMmMKQXV0aG9yOiAg ICAgS2VuamlybyBOQUtBWUFNQSA8bmFrYXlhbWFrZW5qaXJvQGdtYWlsLmNvbT4KQXV0aG9yRGF0 ZTogU3VuIEphbiA1IDEwOjI3OjI2IDIwMTQgKzAxMDAKQ29tbWl0OiAgICAgTGFycyBNYWduZSBJ bmdlYnJpZ3RzZW4gPGxhcnNpQGdudXMub3JnPgpDb21taXREYXRlOiBTdW4gSmFuIDUgMTA6Mjc6 MjYgMjAxNCArMDEwMAoKICAgIE1ha2UgdGhlIGV3dyBoaXN0b3J5IGJyb3dzaW5nIHdvcmsgYWdh aW4KICAgIAogICAgKiBuZXQvZXd3LmVsIChld3ctbGlzdC1oaXN0b3JpZXMsZXd3LWhpc3Rvcnkt YnJvd3NlKTogRml4dXAuCiAgICAoZXd3LWhpc3RvcnktcXVpdCk6IERlbGV0ZSBhbmQgdXNlIHF1 aXQtd2luZG93LgogICAgKGV3dy1oaXN0b3J5LWtpbGwpOiBEZWxldGUsIGJlY2F1c2UgaXQgZG9l c24ndCB3b3JrIHdlbGwgYW5kCiAgICBub3QgbmVjZXNzYXJ5LgogICAgKGV3dy1oaXN0b3J5LW1v ZGUtbWFwKTogRGVsZXRlIHNvbWUga2V5cyBhbmQgYWRkIGVhc3ktbWVudS4KCg== --=-=-=-- ------------=_1405581304-2718-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 28 Dec 2013 15:01:29 +0000 Received: from localhost ([127.0.0.1]:48587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VwvOK-0006IZ-Uc for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54731) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VwvOI-0006IR-RC for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwvOA-0001IK-4z for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:26 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwvOA-0001IG-1W for submit@debbugs.gnu.org; Sat, 28 Dec 2013 10:01:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwvO1-0004TQ-93 for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2013 10:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwvNs-0001HD-Rb for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2013 10:01:09 -0500 Received: from mail-pd0-x22d.google.com ([2607:f8b0:400e:c02::22d]:33887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwvNs-0001H7-Fu for bug-gnu-emacs@gnu.org; Sat, 28 Dec 2013 10:01:00 -0500 Received: by mail-pd0-f173.google.com with SMTP id p10so9917949pdj.4 for ; Sat, 28 Dec 2013 07:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:from:to:subject:date:message-id:mime-version :content-type; bh=VwxSk5/5IsEeEE5mG5+UvxWqXAA9m/ZwHUaGy1Flis0=; b=BHBBeDS6koLLT0G1wKBWJvxrhQjpGTmZLOGS8KZ50J6qtgqSWmNKU4wL1NjZIWovHS YO4yGxHtIt4ZSLNFhcauYKXnhJEqfkfTheY6dZoqw+vSULV87Cw0s6dGk1BsJXu3rRFQ 1HiArc58mOHt0cSpFj7JbrGP3quH0VtJCxtqzJkJIsYK+VlcfLMdIdibLW00dxaoEP0w Udqus7fyMh/hDhqXl+nN1/s374+DCrQVOFN59BYjNrb198ennaiGkqHWg1pVRp485h1m c+EBQYqvdyzIYKkthSToN9EyCbIkdu5FCjdwH2U0vL7FAW5FbuoZbesZkuerELBAYGsM DWuw== X-Received: by 10.68.217.129 with SMTP id oy1mr57911918pbc.23.1388242859221; Sat, 28 Dec 2013 07:00:59 -0800 (PST) Received: from dhcp-193-97.nrt.redhat.com (nat-pool-nrt-t1.redhat.com. [66.187.238.10]) by mx.google.com with ESMTPSA id qf7sm90802132pac.14.2013.12.28.07.00.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Dec 2013 07:00:58 -0800 (PST) User-agent: mu4e 0.9.9.6pre2; emacs 24.3.50.1 From: Kenjiro NAKAYAMA To: bug-gnu-emacs@gnu.org, 16236@debbugs.gnu.org Subject: 24.3.50; [PATCH] eww: eww-history-mode fixup. Date: Sun, 29 Dec 2013 00:00:52 +0900 Message-ID: <87ha9tdnq3.fsf@dhcp-193-97.nrt.redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Since current eww-history does not work well, I fixed. Please review and install it to the official tree if appreciated. Signed-off-by: Kenjiro NAKAYAMA * net/eww.el (eww-list-histories,eww-history-browse): Fixup. (eww-history-quit): Delete and use quit-window. (eww-history-kill): Delete, because it doesn't work well and not necessary. (eww-history-mode-map): Delete some keys and add easy-menu. --- lisp/net/eww.el | 90 +++++++++++++++++++++++---------------------------------- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 25309d1..2fc30b7 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1282,32 +1282,30 @@ Differences in #targets are ignored." (interactive) (when (null eww-history) (error "No eww-histories are defined")) - (set-buffer (get-buffer-create "*eww history*")) - (eww-history-mode) - (let ((inhibit-read-only t) - (domain-length 0) - (title-length 0) - url title format start) - (erase-buffer) - (dolist (history eww-history) - (setq start (point)) - (setq domain-length (max domain-length (length (plist-get history :url)))) - (setq title-length (max title-length (length (plist-get history :title)))) - ) - (setq format (format "%%-%ds %%-%ds" title-length domain-length) - header-line-format - (concat " " (format format "Title" "URL"))) - - (dolist (history eww-history) - (setq url (plist-get history :url)) - (setq title (plist-get history :title)) - (insert (format format title url)) - (insert "\n") - (put-text-property start (point) 'eww-history history) - ) - (goto-char (point-min))) - (pop-to-buffer "*eww history*") - ) + (let ((eww-history-trans eww-history)) + (set-buffer (get-buffer-create "*eww history*")) + (eww-history-mode) + (let ((inhibit-read-only t) + (domain-length 0) + (title-length 0) + url title format start) + (erase-buffer) + (dolist (history eww-history-trans) + (setq start (point)) + (setq domain-length (max domain-length (length (plist-get history :url)))) + (setq title-length (max title-length (length (plist-get history :title))))) + (setq format (format "%%-%ds %%-%ds" title-length domain-length) + header-line-format + (concat " " (format format "Title" "URL"))) + (dolist (history eww-history-trans) + (setq start (point)) + (setq url (plist-get history :url)) + (setq title (plist-get history :title)) + (insert (format format title url)) + (insert "\n") + (put-text-property start (1+ start) 'eww-history history)) + (goto-char (point-min))) + (pop-to-buffer "*eww history*"))) (defun eww-history-browse () "Browse the history under point in eww." @@ -1315,39 +1313,23 @@ Differences in #targets are ignored." (let ((history (get-text-property (line-beginning-position) 'eww-history))) (unless history (error "No history on the current line")) - (eww-history-quit) - (pop-to-buffer "*eww*") - (eww-browse-url (plist-get history :url)))) - -(defun eww-history-quit () - "Kill the current buffer." - (interactive) - (kill-buffer (current-buffer))) - -(defvar eww-history-kill-ring nil) - -(defun eww-history-kill () - "Kill the current history." - (interactive) - (let* ((start (line-beginning-position)) - (history (get-text-property start 'eww-history)) - (inhibit-read-only t)) - (unless history - (error "No history on the current line")) - (forward-line 1) - (push (buffer-substring start (point)) eww-history-kill-ring) - (delete-region start (point)) - (setq eww-history (delq history eww-history)) - )) + (quit-window) + (eww-restore-history history))) (defvar eww-history-mode-map (let ((map (make-sparse-keymap))) (suppress-keymap map) - (define-key map "q" 'eww-history-quit) - (define-key map [(control k)] 'eww-history-kill) + (define-key map "q" 'quit-window) (define-key map "\r" 'eww-history-browse) - (define-key map "n" 'next-error-no-select) - (define-key map "p" 'previous-error-no-select) +;; (define-key map "n" 'next-error-no-select) +;; (define-key map "p" 'previous-error-no-select) + + (easy-menu-define nil map + "Menu for `eww-history-mode-map'." + '("Eww History" + ["Exit" quit-window t] + ["Browse" eww-history-browse + :active (get-text-property (line-beginning-position) 'eww-history)])) map)) (define-derived-mode eww-history-mode nil "eww history" -- 1.8.3.1 Kenjiro ------------=_1405581304-2718-1--