aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1992-08-04 07:27:12 +0000
committerJim Blandy1992-08-04 07:27:12 +0000
commit637a8ae9ceb1c1b408dd5e240736dccd004e36d1 (patch)
treeb80ece2d4b7fee6073c86c0cb13c4e928a02cd86
parent9f1ce56b63f5a415825e6bbe911bcb7bc3d87609 (diff)
downloademacs-637a8ae9ceb1c1b408dd5e240736dccd004e36d1.tar.gz
emacs-637a8ae9ceb1c1b408dd5e240736dccd004e36d1.zip
*** empty log message ***
-rw-r--r--lisp/calendar/appt.el1
-rw-r--r--lisp/loadup.el2
-rw-r--r--lisp/vc.el13
3 files changed, 15 insertions, 1 deletions
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 8c673811596..30ba686fa37 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -384,6 +384,7 @@ The time should be in either 24 hour format or am/pm format."
384;; Wednesday 384;; Wednesday
385;; 10:00am group meeting" 385;; 10:00am group meeting"
386 386
387;;;###autoload
387(defun appt-make-list () 388(defun appt-make-list ()
388 (setq appt-time-msg-list nil) 389 (setq appt-time-msg-list nil)
389 390
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8444976e157..afca23d5e35 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -90,6 +90,8 @@
90 (progn ; floating pt. functions if 90 (progn ; floating pt. functions if
91 (garbage-collect) ; we have float support. 91 (garbage-collect) ; we have float support.
92 (load "float-sup"))) 92 (load "float-sup")))
93(garbage-collect)
94(load "vc-hooks")
93 95
94;If you want additional libraries to be preloaded and their 96;If you want additional libraries to be preloaded and their
95;doc strings kept in the DOC file rather than in core, 97;doc strings kept in the DOC file rather than in core,
diff --git a/lisp/vc.el b/lisp/vc.el
index 4c50545035f..24d0c503755 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -232,8 +232,9 @@ the master name of FILE; this is appended to an optional list of FLAGS."
232 )) 232 ))
233 ))) 233 )))
234 234
235;; Here's the major entry point 235;; Here's the major entry point.
236 236
237;;;###autoload
237(defun vc-next-action (verbose) 238(defun vc-next-action (verbose)
238 "Do the next logical checkin or checkout operation on the current file. 239 "Do the next logical checkin or checkout operation on the current file.
239 If the file is not already registered, this registers it for version 240 If the file is not already registered, this registers it for version
@@ -299,6 +300,7 @@ the option to steal the lock."
299 300
300;;; These functions help the vc-next-action entry point 301;;; These functions help the vc-next-action entry point
301 302
303;;;###autoload
302(defun vc-register (&optional override) 304(defun vc-register (&optional override)
303 "Register the current file into your version-control system." 305 "Register the current file into your version-control system."
304 (interactive "P") 306 (interactive "P")
@@ -473,6 +475,7 @@ popped up to accept a comment."
473 475
474;; Additional entry points for examining version histories 476;; Additional entry points for examining version histories
475 477
478;;;###autoload
476(defun vc-diff (historic) 479(defun vc-diff (historic)
477 "Display diffs between file versions." 480 "Display diffs between file versions."
478 (interactive "P") 481 (interactive "P")
@@ -538,6 +541,7 @@ files in or below it."
538 541
539;; Header-insertion code 542;; Header-insertion code
540 543
544;;;###autoload
541(defun vc-insert-headers () 545(defun vc-insert-headers ()
542 "Insert headers in a file for use with your version-control system. 546 "Insert headers in a file for use with your version-control system.
543Headers desired are inserted at the start of the buffer, and are pulled from 547Headers desired are inserted at the start of the buffer, and are pulled from
@@ -567,6 +571,7 @@ the variable vc-header-strings"
567 571
568;; Status-checking functions 572;; Status-checking functions
569 573
574;;;###autoload
570(defun vc-directory (verbose) 575(defun vc-directory (verbose)
571 "Show version-control status of all files under the current directory." 576 "Show version-control status of all files under the current directory."
572 (interactive "P") 577 (interactive "P")
@@ -636,6 +641,7 @@ the variable vc-header-strings"
636 dir) 641 dir)
637 t))) 642 t)))
638 643
644;;;###autoload
639(defun vc-create-snapshot (name) 645(defun vc-create-snapshot (name)
640 "Make a snapshot called NAME. 646 "Make a snapshot called NAME.
641The snapshot is made from all registered files at or below the current 647The snapshot is made from all registered files at or below the current
@@ -652,6 +658,7 @@ version becomes part of the named configuration."
652 default-directory) 658 default-directory)
653 )) 659 ))
654 660
661;;;###autoload
655(defun vc-retrieve-snapshot (name) 662(defun vc-retrieve-snapshot (name)
656 "Retrieve the snapshot called NAME. 663 "Retrieve the snapshot called NAME.
657This function fails if any files are locked at or below the current directory 664This function fails if any files are locked at or below the current directory
@@ -670,6 +677,7 @@ levels in the snapshot."
670 677
671;; Miscellaneous other entry points 678;; Miscellaneous other entry points
672 679
680;;;###autoload
673(defun vc-print-log () 681(defun vc-print-log ()
674 "List the change log of the current buffer in a window." 682 "List the change log of the current buffer in a window."
675 (interactive) 683 (interactive)
@@ -683,6 +691,7 @@ levels in the snapshot."
683 ) 691 )
684 ) 692 )
685 693
694;;;###autoload
686(defun vc-revert-buffer () 695(defun vc-revert-buffer ()
687 "Revert the current buffer's file back to the latest version." 696 "Revert the current buffer's file back to the latest version."
688 (interactive) 697 (interactive)
@@ -700,6 +709,7 @@ levels in the snapshot."
700 ) 709 )
701 ) 710 )
702 711
712;;;###autoload
703(defun vc-cancel-version (norevert) 713(defun vc-cancel-version (norevert)
704 "Undo your latest checkin." 714 "Undo your latest checkin."
705 (interactive "P") 715 (interactive "P")
@@ -744,6 +754,7 @@ levels in the snapshot."
744 nil) 754 nil)
745 ) 755 )
746 756
757;;;###autoload
747(defun vc-update-change-log () 758(defun vc-update-change-log ()
748 "Find change log file and add entries from recent RCS logs." 759 "Find change log file and add entries from recent RCS logs."
749 (interactive) 760 (interactive)