diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-01-14 19:59:04 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-01-14 19:59:04 -0800 |
| commit | 56a03f46b825f2c22c7a982e8d4bcb5545908a09 (patch) | |
| tree | 4fc0fedd2db051b51b1102179f370af20c3c0f09 /lisp | |
| parent | 1db3226b1aa44e3ceea7ac2a0b25adc18c55ae5e (diff) | |
| download | emacs-56a03f46b825f2c22c7a982e8d4bcb5545908a09.tar.gz emacs-56a03f46b825f2c22c7a982e8d4bcb5545908a09.tar.bz2 emacs-56a03f46b825f2c22c7a982e8d4bcb5545908a09.zip | |
Fix Bug#5311.
* log-view.el (top-level): Require 'wid-edit. (Bug#5311)
* wid-edit.el (widget-keymap): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/log-view.el | 3 | ||||
| -rw-r--r-- | lisp/wid-edit.el | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e5fc902b48..92116cafe03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-01-15 Glenn Morris <rgm@gnu.org> + * log-view.el (top-level): Require 'wid-edit. (Bug#5311) + + * wid-edit.el (widget-keymap): Doc fix. + * vc-svn.el (vc-svn-print-log): Use --limit rather than -l since the former seems to be more widely accepted by various svn versions. diff --git a/lisp/log-view.el b/lisp/log-view.el index 195a80b46dc..6fbe8429671 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -122,6 +122,9 @@ :group 'pcl-cvs :prefix "log-view-") +;; Needed because log-view-mode-map inherits from widget-keymap. (Bug#5311) +(require 'wid-edit) + (easy-mmode-defmap log-view-mode-map '(("z" . kill-this-buffer) ("q" . quit-window) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 52a8ad51dab..a087f17a900 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -875,7 +875,8 @@ button end points." (define-key map [(control ?m)] 'widget-button-press) map) "Keymap containing useful binding for buffers containing widgets. -Recommended as a parent keymap for modes using widgets.") +Recommended as a parent keymap for modes using widgets. +Note that such modes will need to require wid-edit.") (defvar widget-global-map global-map "Keymap used for events a widget does not handle itself.") |