[Emacs-diffs] /srv/bzr/emacs/trunk r99335: Fix Bug#5311.

[Glenn Morris]

------------------------------------------------------------
revno: 99335
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-14 19:59:04 -0800
message:
  Fix Bug#5311.
  
  * log-view.el (top-level): Require 'wid-edit.  (Bug#5311)
  
  * wid-edit.el (widget-keymap): Doc fix.
modified:
  lisp/ChangeLog
  lisp/log-view.el
  lisp/wid-edit.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-15 03:54:36 +0000
+++ b/lisp/ChangeLog    2010-01-15 03:59:04 +0000
@@ -1,5 +1,9 @@
 2010-01-15  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/log-view.el'
--- a/lisp/log-view.el  2010-01-13 08:35:10 +0000
+++ b/lisp/log-view.el  2010-01-15 03:59:04 +0000
@@ -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)

=== modified file 'lisp/wid-edit.el'
--- a/lisp/wid-edit.el  2010-01-13 08:35:10 +0000
+++ b/lisp/wid-edit.el  2010-01-15 03:59:04 +0000
@@ -875,7 +875,8 @@
     (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.")