From c9f203eb46056b0e2cdd4f59b256e4f55f703a57 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 15 Sep 2008 23:28:39 +0000 Subject: [PATCH] * vc-rcs.el (vc-rcs-steal-lock, vc-rcs-checkout): Fix docstring typos. (vc-rcs-fetch-master-state, vc-rcs-system-release): Doc fixes. * vc-rcs.el (vc-rcs-rollback): Fix typos in docstring. --- lisp/ChangeLog | 15 ++++++++++++--- lisp/vc-rcs.el | 10 +++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3c4835ad9e..496ead2fbc3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-09-15 Juanma Barranquero + + * vc-rcs.el (vc-rcs-steal-lock, vc-rcs-checkout): Fix docstring typos. + (vc-rcs-fetch-master-state, vc-rcs-system-release): Doc fixes. + +2008-09-15 Eduard Wiebe (tiny change) + + * vc-rcs.el (vc-rcs-rollback): Fix typos in docstring. + 2008-09-15 Martin Rudalics * files.el (file-truename): Don't raise args-out-of-range error @@ -295,7 +304,7 @@ Better support for the property statement. Sometimes this keyword introduces a statement which requires an endproperty keyword, and sometimes it doesn't, dependening on the work before the property - word. If property is prefixed with assert, assume or cover + word. If property is prefixed with assert, assume or cover keyword, then the statement is ended with a ';'. Otherwise, property is like task or specify, and is followed by some number of statements, which are ended with an endproperty keyword. @@ -311,7 +320,7 @@ 2008-09-05 Vinicius Jose Latorre * whitespace.el: Fix auto-cleanup on kill prevents killing read-only - buffers (bug#360). New version 11.2.1. + buffers (bug#360). New version 11.2.1. (whitespace-action): New value `warn-read-only' to give a warning when buffer is read-only and whitespace action is cleanup or auto-cleanup. (whitespace-cleanup, whitespace-cleanup-region): Code fix. @@ -1408,7 +1417,7 @@ 2008-07-30 Michael McNamara * progmodes/verilog-mode.el (verilog-do-indent): Remove special indent - for declarations inside a parenthetical list. The code is ill-advised, + for declarations inside a parenthetical list. The code is ill-advised, and doesn't work given user defined types. (verilog-set-auto-endcomments): Enhance function automatic endcomment to support functions that return user defined types. diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index 14d65da2a5a..31ec90f586e 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -406,7 +406,7 @@ whether to remove it." (vc-switches 'RCS 'checkout))) (defun vc-rcs-checkout (file &optional editable rev) - "Retrieve a copy of a saved version of FILE. If FILE is a directory, + "Retrieve a copy of a saved version of FILE. If FILE is a directory, attempt the checkout for all registered files beneath it." (if (file-directory-p file) (mapc 'vc-rcs-checkout (vc-expand-dirs (list file))) @@ -473,7 +473,7 @@ attempt the checkout for all registered files beneath it." (defun vc-rcs-rollback (files) "Roll back, undoing the most recent checkins of FILES. Directories are -expanded to all regidtered subfuiles in them." +expanded to all registered subfiles in them." (if (not files) (error "RCS backend doesn't support directory-level rollback.")) (dolist (file (vc-expand-dirs files)) @@ -527,7 +527,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (defun vc-rcs-steal-lock (file &optional rev) "Steal the lock on the current workfile for FILE and revision REV. -If FUILEis a directory, steal the lock on all registered files beneath it. +If FILE is a directory, steal the lock on all registered files beneath it. Needs RCS 5.6.2 or later for -M." (if (file-directory-p file) (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file))) @@ -861,7 +861,7 @@ to its master version." (defun vc-rcs-fetch-master-state (file &optional working-revision) "Compute the master file's idea of the state of FILE. -If a WORKFILE-VERSION is given, compute the state of that version, +If a WORKING-REVISION is given, compute the state of that version, otherwise determine the workfile version based on the master file. This function sets the properties `vc-working-revision' and `vc-checkout-model' to their correct values, based on the master @@ -1063,7 +1063,7 @@ CVS releases are handled reasonably, too \(1.3 < 1.4* < 1.5\)." (defun vc-rcs-system-release () "Return the RCS release installed on this system, as a string. -Return symbol UNKNOWN if the release cannot be deducted. The user can +Return symbol `unknown' if the release cannot be deducted. The user can override this using variable `vc-rcs-release'. If the user has not set variable `vc-rcs-release' and it is nil, -- 2.11.4.GIT