Use simple buttons, instead of widget buttons, in vc-log.

* lisp/vc/vc.el (vc-print-log-setup-buttons): Instead of using the
widget library for buttons, just use button.el.

* lisp/vc/log-view.el (log-view-mode-map): Don't inherit from
widget-keymap.

3 files changed, 22 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c29b62f078d..97937defc3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * vc/vc.el (vc-print-log-setup-buttons): Instead of using the
+        widget library for buttons, just use button.el.
+
+        * vc/log-view.el (log-view-mode-map): Don't inherit from
+        widget-keymap.
+
 2011-02-12  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/cl-seq.el (union, nunion, intersection)
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 11ffc9a5e36..f71c928c693 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -147,7 +147,6 @@
     ("\M-n" . log-view-file-next)
     ("\M-p" . log-view-file-prev))
   "Log-View's keymap."
-  :inherit widget-keymap
   :group 'log-view)
 
 (easy-menu-define log-view-mode-menu log-view-mode-map
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index be0f568d304..815bdbfc5bf 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2014,22 +2014,20 @@ Not all VC backends support short logs!")
     (goto-char (point-max))
     (lexical-let ((working-revision working-revision)
                   (limit limit))
-      (widget-create 'push-button
-                     :notify (lambda (&rest ignore)
-                               (vc-print-log-internal
-                                log-view-vc-backend log-view-vc-fileset
-                                working-revision nil (* 2 limit)))
-                     :help-echo "Show the log again, and double the number of log entries shown"
-                     "Show 2X entries")
-      (widget-insert "    ")
-      (widget-create 'push-button
-                     :notify (lambda (&rest ignore)
-                               (vc-print-log-internal
-                                log-view-vc-backend log-view-vc-fileset
-                                working-revision nil nil))
-                     :help-echo "Show the log again, showing all entries"
-                     "Show unlimited entries"))
-    (widget-setup)))
+      (insert "\n")
+      (insert-text-button "Show 2X entries"
+                          'action (lambda (&rest ignore)
+                                    (vc-print-log-internal
+                                     log-view-vc-backend log-view-vc-fileset
+                                     working-revision nil (* 2 limit)))
+                          'help-echo "Show the log again, and double the number of log entries shown")
+      (insert "    ")
+      (insert-text-button "Show unlimited entries"
+                          'action (lambda (&rest ignore)
+                                    (vc-print-log-internal
+                                     log-view-vc-backend log-view-vc-fileset
+                                     working-revision nil nil))
+                          'help-echo "Show the log again, including all entries"))))
 
 (defun vc-print-log-internal (backend files working-revision
                                       &optional is-start-revision limit)