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

[gnu-emacs] / lisp / vc / vc.el

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 2f26c1eb50b16f85b4d650c8a665a7baa15fc966..815bdbfc5bfba2f4456694a203a031c7ece31109 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1,8 +1,6 @@
 ;;; vc.el --- drive a version-control system from within Emacs
 
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992-1998, 2000-2011  Free Software Foundation, Inc.
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -2016,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)
@@ -2299,7 +2295,7 @@ depending on the underlying version-control system."
 (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1")
 
 ;;;###autoload
-(defun vc-update (&optional arg)
+(defun vc-pull (&optional arg)
   "Update the current fileset or branch.
 On a distributed version control system, this runs a \"pull\"
 operation to update the current branch, prompting for an argument
@@ -2339,7 +2335,7 @@ tip revision are merged into the working file."
       (error "VC update is unsupported for `%s'" backend)))))
 
 ;;;###autoload
-(defalias 'vc-pull 'vc-update)
+(defalias 'vc-update 'vc-pull)
 
 (defun vc-version-backup-file (file &optional rev)
   "Return name of backup file for revision REV of FILE.