diff options
| author | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
| commit | 40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch) | |
| tree | b56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /lisp/vc | |
| parent | f488fb6528738131ef41859e1f04125f2e50efce (diff) | |
| parent | 44f230aa043ebb222aa0876b44d70484d5dd38db (diff) | |
| download | emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip | |
Merge from trunk
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/log-view.el | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index d9a06c8a401..9f6ad19fdb1 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el | |||
| @@ -122,9 +122,6 @@ | |||
| 122 | :group 'pcl-cvs | 122 | :group 'pcl-cvs |
| 123 | :prefix "log-view-") | 123 | :prefix "log-view-") |
| 124 | 124 | ||
| 125 | ;; Needed because log-view-mode-map inherits from widget-keymap. (Bug#5311) | ||
| 126 | (require 'wid-edit) | ||
| 127 | |||
| 128 | (easy-mmode-defmap log-view-mode-map | 125 | (easy-mmode-defmap log-view-mode-map |
| 129 | '( | 126 | '( |
| 130 | ;; FIXME: (copy-keymap special-mode-map) instead | 127 | ;; FIXME: (copy-keymap special-mode-map) instead |