[Emacs-diffs] /srv/bzr/emacs/trunk r103251: Use simple buttons, instead of widget buttons, in vc-log.

[Chong Yidong]

------------------------------------------------------------
revno: 103251
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-12 22:07:53 -0500
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/log-view.el
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-13 01:01:11 +0000
+++ b/lisp/ChangeLog    2011-02-13 03:07:53 +0000
@@ -1,3 +1,11 @@
+2011-02-13  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/cl-seq.el (union, nunion, intersection)

=== modified file 'lisp/vc/log-view.el'
--- a/lisp/vc/log-view.el       2011-02-01 21:22:21 +0000
+++ b/lisp/vc/log-view.el       2011-02-13 03:07:53 +0000
@@ -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

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2011-01-29 03:12:32 +0000
+++ b/lisp/vc/vc.el     2011-02-13 03:07:53 +0000
@@ -2014,22 +2014,20 @@
     (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)