diff options
| author | Mark Oteiza | 2015-09-30 14:24:38 -0400 |
|---|---|---|
| committer | Mark Oteiza | 2015-10-13 08:12:53 -0400 |
| commit | 882c3f365166b77040655c8091ca1010446e8a07 (patch) | |
| tree | 3feb69f667285bb8315825bf30ec64ab37d6e7ce | |
| parent | d4fe840df0b5fdb3aed538fae2ced143a471f60a (diff) | |
| download | emacs-882c3f365166b77040655c8091ca1010446e8a07.tar.gz emacs-882c3f365166b77040655c8091ca1010446e8a07.zip | |
Use special-mode in eww list modes
* 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.
| -rw-r--r-- | lisp/net/eww.el | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index d44890f1b09..bda4e0cfec2 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el | |||
| @@ -627,7 +627,6 @@ the like." | |||
| 627 | 627 | ||
| 628 | (defvar eww-mode-map | 628 | (defvar eww-mode-map |
| 629 | (let ((map (make-sparse-keymap))) | 629 | (let ((map (make-sparse-keymap))) |
| 630 | (set-keymap-parent map special-mode-map) | ||
| 631 | (define-key map "g" 'eww-reload) ;FIXME: revert-buffer-function instead! | 630 | (define-key map "g" 'eww-reload) ;FIXME: revert-buffer-function instead! |
| 632 | (define-key map "G" 'eww) | 631 | (define-key map "G" 'eww) |
| 633 | (define-key map [?\t] 'shr-next-link) | 632 | (define-key map [?\t] 'shr-next-link) |
| @@ -1583,8 +1582,6 @@ If CHARSET is nil then use UTF-8." | |||
| 1583 | 1582 | ||
| 1584 | (defvar eww-bookmark-mode-map | 1583 | (defvar eww-bookmark-mode-map |
| 1585 | (let ((map (make-sparse-keymap))) | 1584 | (let ((map (make-sparse-keymap))) |
| 1586 | (suppress-keymap map) | ||
| 1587 | (define-key map "q" 'quit-window) | ||
| 1588 | (define-key map [(control k)] 'eww-bookmark-kill) | 1585 | (define-key map [(control k)] 'eww-bookmark-kill) |
| 1589 | (define-key map [(control y)] 'eww-bookmark-yank) | 1586 | (define-key map [(control y)] 'eww-bookmark-yank) |
| 1590 | (define-key map "\r" 'eww-bookmark-browse) | 1587 | (define-key map "\r" 'eww-bookmark-browse) |
| @@ -1601,13 +1598,12 @@ If CHARSET is nil then use UTF-8." | |||
| 1601 | :active eww-bookmark-kill-ring])) | 1598 | :active eww-bookmark-kill-ring])) |
| 1602 | map)) | 1599 | map)) |
| 1603 | 1600 | ||
| 1604 | (define-derived-mode eww-bookmark-mode nil "eww bookmarks" | 1601 | (define-derived-mode eww-bookmark-mode special-mode "eww bookmarks" |
| 1605 | "Mode for listing bookmarks. | 1602 | "Mode for listing bookmarks. |
| 1606 | 1603 | ||
| 1607 | \\{eww-bookmark-mode-map}" | 1604 | \\{eww-bookmark-mode-map}" |
| 1608 | (buffer-disable-undo) | 1605 | (buffer-disable-undo) |
| 1609 | (setq buffer-read-only t | 1606 | (setq truncate-lines t)) |
| 1610 | truncate-lines t)) | ||
| 1611 | 1607 | ||
| 1612 | ;;; History code | 1608 | ;;; History code |
| 1613 | 1609 | ||
| @@ -1670,8 +1666,6 @@ If CHARSET is nil then use UTF-8." | |||
| 1670 | 1666 | ||
| 1671 | (defvar eww-history-mode-map | 1667 | (defvar eww-history-mode-map |
| 1672 | (let ((map (make-sparse-keymap))) | 1668 | (let ((map (make-sparse-keymap))) |
| 1673 | (suppress-keymap map) | ||
| 1674 | (define-key map "q" 'quit-window) | ||
| 1675 | (define-key map "\r" 'eww-history-browse) | 1669 | (define-key map "\r" 'eww-history-browse) |
| 1676 | ;; (define-key map "n" 'next-error-no-select) | 1670 | ;; (define-key map "n" 'next-error-no-select) |
| 1677 | ;; (define-key map "p" 'previous-error-no-select) | 1671 | ;; (define-key map "p" 'previous-error-no-select) |
| @@ -1684,13 +1678,12 @@ If CHARSET is nil then use UTF-8." | |||
| 1684 | :active (get-text-property (line-beginning-position) 'eww-history)])) | 1678 | :active (get-text-property (line-beginning-position) 'eww-history)])) |
| 1685 | map)) | 1679 | map)) |
| 1686 | 1680 | ||
| 1687 | (define-derived-mode eww-history-mode nil "eww history" | 1681 | (define-derived-mode eww-history-mode special-mode "eww history" |
| 1688 | "Mode for listing eww-histories. | 1682 | "Mode for listing eww-histories. |
| 1689 | 1683 | ||
| 1690 | \\{eww-history-mode-map}" | 1684 | \\{eww-history-mode-map}" |
| 1691 | (buffer-disable-undo) | 1685 | (buffer-disable-undo) |
| 1692 | (setq buffer-read-only t | 1686 | (setq truncate-lines t)) |
| 1693 | truncate-lines t)) | ||
| 1694 | 1687 | ||
| 1695 | ;;; eww buffers list | 1688 | ;;; eww buffers list |
| 1696 | 1689 | ||
| @@ -1795,8 +1788,6 @@ If CHARSET is nil then use UTF-8." | |||
| 1795 | 1788 | ||
| 1796 | (defvar eww-buffers-mode-map | 1789 | (defvar eww-buffers-mode-map |
| 1797 | (let ((map (make-sparse-keymap))) | 1790 | (let ((map (make-sparse-keymap))) |
| 1798 | (suppress-keymap map) | ||
| 1799 | (define-key map "q" 'quit-window) | ||
| 1800 | (define-key map [(control k)] 'eww-buffer-kill) | 1791 | (define-key map [(control k)] 'eww-buffer-kill) |
| 1801 | (define-key map "\r" 'eww-buffer-select) | 1792 | (define-key map "\r" 'eww-buffer-select) |
| 1802 | (define-key map "n" 'eww-buffer-show-next) | 1793 | (define-key map "n" 'eww-buffer-show-next) |
| @@ -1812,13 +1803,12 @@ If CHARSET is nil then use UTF-8." | |||
| 1812 | :active (get-text-property (line-beginning-position) 'eww-buffer)])) | 1803 | :active (get-text-property (line-beginning-position) 'eww-buffer)])) |
| 1813 | map)) | 1804 | map)) |
| 1814 | 1805 | ||
| 1815 | (define-derived-mode eww-buffers-mode nil "eww buffers" | 1806 | (define-derived-mode eww-buffers-mode special-mode "eww buffers" |
| 1816 | "Mode for listing buffers. | 1807 | "Mode for listing buffers. |
| 1817 | 1808 | ||
| 1818 | \\{eww-buffers-mode-map}" | 1809 | \\{eww-buffers-mode-map}" |
| 1819 | (buffer-disable-undo) | 1810 | (buffer-disable-undo) |
| 1820 | (setq buffer-read-only t | 1811 | (setq truncate-lines t)) |
| 1821 | truncate-lines t)) | ||
| 1822 | 1812 | ||
| 1823 | ;;; Desktop support | 1813 | ;;; Desktop support |
| 1824 | 1814 | ||