From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Mark Oteiza Newsgroups: gmane.emacs.devel Subject: [PATCH] Use special-mode in eww list modes Date: Sat, 10 Oct 2015 22:59:56 -0400 Message-ID: <87wpuu5cur.fsf@udel.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1444532431 16407 80.91.229.3 (11 Oct 2015 03:00:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 11 Oct 2015 03:00:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 11 05:00:22 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Zl6s0-0005jT-PG for ged-emacs-devel@m.gmane.org; Sun, 11 Oct 2015 05:00:20 +0200 Original-Received: from localhost ([::1]:47047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zl6rz-0003Xz-Tr for ged-emacs-devel@m.gmane.org; Sat, 10 Oct 2015 23:00:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zl6rn-0003WE-Uf for emacs-devel@gnu.org; Sat, 10 Oct 2015 23:00:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zl6rk-0007TB-PQ for emacs-devel@gnu.org; Sat, 10 Oct 2015 23:00:07 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:59423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zl6rk-0007T0-Jm for emacs-devel@gnu.org; Sat, 10 Oct 2015 23:00:04 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Zl6rj-0005Q2-27 for emacs-devel@gnu.org; Sun, 11 Oct 2015 05:00:03 +0200 Original-Received: from c-73-172-248-173.hsd1.md.comcast.net ([73.172.248.173]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 11 Oct 2015 05:00:03 +0200 Original-Received: from mvoteiza by c-73-172-248-173.hsd1.md.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 11 Oct 2015 05:00:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 106 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-73-172-248-173.hsd1.md.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:5ildPkonUw6ctz0f9hj/CRgxOQQ= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:191193 Archived-At: * lisp/net/eww.el (eww-bookmark-mode, eww-history-mode) (eww-buffers-mode): Derive from special-mode and remove redundant setting of buffer-read-only. (eww-mode-map): Remove redundant keymap parent setting. (eww-bookmark-mode-map, eww-history-mode-map, eww-buffers-mode-map): Remove redundant keymap suppressions and mappings. --- Alternatively, I think it would make sense to use tabulated-list-mode for these listing buffers, except the bookmark mode, since there is fancy stuff in there for manipulating bookmarks. lisp/net/eww.el | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index d44890f..bda4e0c 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -627,7 +627,6 @@ the like." (defvar eww-mode-map (let ((map (make-sparse-keymap))) - (set-keymap-parent map special-mode-map) (define-key map "g" 'eww-reload) ;FIXME: revert-buffer-function instead! (define-key map "G" 'eww) (define-key map [?\t] 'shr-next-link) @@ -1583,8 +1582,6 @@ If CHARSET is nil then use UTF-8." (defvar eww-bookmark-mode-map (let ((map (make-sparse-keymap))) - (suppress-keymap map) - (define-key map "q" 'quit-window) (define-key map [(control k)] 'eww-bookmark-kill) (define-key map [(control y)] 'eww-bookmark-yank) (define-key map "\r" 'eww-bookmark-browse) @@ -1601,13 +1598,12 @@ If CHARSET is nil then use UTF-8." :active eww-bookmark-kill-ring])) map)) -(define-derived-mode eww-bookmark-mode nil "eww bookmarks" +(define-derived-mode eww-bookmark-mode special-mode "eww bookmarks" "Mode for listing bookmarks. \\{eww-bookmark-mode-map}" (buffer-disable-undo) - (setq buffer-read-only t - truncate-lines t)) + (setq truncate-lines t)) ;;; History code @@ -1670,8 +1666,6 @@ If CHARSET is nil then use UTF-8." (defvar eww-history-mode-map (let ((map (make-sparse-keymap))) - (suppress-keymap map) - (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) @@ -1684,13 +1678,12 @@ If CHARSET is nil then use UTF-8." :active (get-text-property (line-beginning-position) 'eww-history)])) map)) -(define-derived-mode eww-history-mode nil "eww history" +(define-derived-mode eww-history-mode special-mode "eww history" "Mode for listing eww-histories. \\{eww-history-mode-map}" (buffer-disable-undo) - (setq buffer-read-only t - truncate-lines t)) + (setq truncate-lines t)) ;;; eww buffers list @@ -1795,8 +1788,6 @@ If CHARSET is nil then use UTF-8." (defvar eww-buffers-mode-map (let ((map (make-sparse-keymap))) - (suppress-keymap map) - (define-key map "q" 'quit-window) (define-key map [(control k)] 'eww-buffer-kill) (define-key map "\r" 'eww-buffer-select) (define-key map "n" 'eww-buffer-show-next) @@ -1812,13 +1803,12 @@ If CHARSET is nil then use UTF-8." :active (get-text-property (line-beginning-position) 'eww-buffer)])) map)) -(define-derived-mode eww-buffers-mode nil "eww buffers" +(define-derived-mode eww-buffers-mode special-mode "eww buffers" "Mode for listing buffers. \\{eww-buffers-mode-map}" (buffer-disable-undo) - (setq buffer-read-only t - truncate-lines t)) + (setq truncate-lines t)) ;;; Desktop support -- 2.6.0