aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-09-15 23:28:39 +0000
committerJuanma Barranquero2008-09-15 23:28:39 +0000
commitc9f203eb46056b0e2cdd4f59b256e4f55f703a57 (patch)
treed7dc989398339123c6c34381189ac4ccf8224c7a
parent98c78ffe7a73b96953f97daf715825074c594721 (diff)
downloademacs-c9f203eb46056b0e2cdd4f59b256e4f55f703a57.tar.gz
emacs-c9f203eb46056b0e2cdd4f59b256e4f55f703a57.zip
* 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.
-rw-r--r--lisp/ChangeLog15
-rw-r--r--lisp/vc-rcs.el10
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 @@
12008-09-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * vc-rcs.el (vc-rcs-steal-lock, vc-rcs-checkout): Fix docstring typos.
4 (vc-rcs-fetch-master-state, vc-rcs-system-release): Doc fixes.
5
62008-09-15 Eduard Wiebe <usenet@pusto.de> (tiny change)
7
8 * vc-rcs.el (vc-rcs-rollback): Fix typos in docstring.
9
12008-09-15 Martin Rudalics <rudalics@gmx.at> 102008-09-15 Martin Rudalics <rudalics@gmx.at>
2 11
3 * files.el (file-truename): Don't raise args-out-of-range error 12 * files.el (file-truename): Don't raise args-out-of-range error
@@ -295,7 +304,7 @@
295 Better support for the property statement. Sometimes this keyword 304 Better support for the property statement. Sometimes this keyword
296 introduces a statement which requires an endproperty keyword, and 305 introduces a statement which requires an endproperty keyword, and
297 sometimes it doesn't, dependening on the work before the property 306 sometimes it doesn't, dependening on the work before the property
298 word. If property is prefixed with assert, assume or cover 307 word. If property is prefixed with assert, assume or cover
299 keyword, then the statement is ended with a ';'. Otherwise, 308 keyword, then the statement is ended with a ';'. Otherwise,
300 property is like task or specify, and is followed by some number 309 property is like task or specify, and is followed by some number
301 of statements, which are ended with an endproperty keyword. 310 of statements, which are ended with an endproperty keyword.
@@ -311,7 +320,7 @@
3112008-09-05 Vinicius Jose Latorre <viniciusjl@ig.com.br> 3202008-09-05 Vinicius Jose Latorre <viniciusjl@ig.com.br>
312 321
313 * whitespace.el: Fix auto-cleanup on kill prevents killing read-only 322 * whitespace.el: Fix auto-cleanup on kill prevents killing read-only
314 buffers (bug#360). New version 11.2.1. 323 buffers (bug#360). New version 11.2.1.
315 (whitespace-action): New value `warn-read-only' to give a warning when 324 (whitespace-action): New value `warn-read-only' to give a warning when
316 buffer is read-only and whitespace action is cleanup or auto-cleanup. 325 buffer is read-only and whitespace action is cleanup or auto-cleanup.
317 (whitespace-cleanup, whitespace-cleanup-region): Code fix. 326 (whitespace-cleanup, whitespace-cleanup-region): Code fix.
@@ -1408,7 +1417,7 @@
14082008-07-30 Michael McNamara <mac@mail.brushroad.com> 14172008-07-30 Michael McNamara <mac@mail.brushroad.com>
1409 1418
1410 * progmodes/verilog-mode.el (verilog-do-indent): Remove special indent 1419 * progmodes/verilog-mode.el (verilog-do-indent): Remove special indent
1411 for declarations inside a parenthetical list. The code is ill-advised, 1420 for declarations inside a parenthetical list. The code is ill-advised,
1412 and doesn't work given user defined types. 1421 and doesn't work given user defined types.
1413 (verilog-set-auto-endcomments): Enhance function automatic 1422 (verilog-set-auto-endcomments): Enhance function automatic
1414 endcomment to support functions that return user defined types. 1423 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."
406 (vc-switches 'RCS 'checkout))) 406 (vc-switches 'RCS 'checkout)))
407 407
408(defun vc-rcs-checkout (file &optional editable rev) 408(defun vc-rcs-checkout (file &optional editable rev)
409 "Retrieve a copy of a saved version of FILE. If FILE is a directory, 409 "Retrieve a copy of a saved version of FILE. If FILE is a directory,
410attempt the checkout for all registered files beneath it." 410attempt the checkout for all registered files beneath it."
411 (if (file-directory-p file) 411 (if (file-directory-p file)
412 (mapc 'vc-rcs-checkout (vc-expand-dirs (list file))) 412 (mapc 'vc-rcs-checkout (vc-expand-dirs (list file)))
@@ -473,7 +473,7 @@ attempt the checkout for all registered files beneath it."
473 473
474(defun vc-rcs-rollback (files) 474(defun vc-rcs-rollback (files)
475 "Roll back, undoing the most recent checkins of FILES. Directories are 475 "Roll back, undoing the most recent checkins of FILES. Directories are
476expanded to all regidtered subfuiles in them." 476expanded to all registered subfiles in them."
477 (if (not files) 477 (if (not files)
478 (error "RCS backend doesn't support directory-level rollback.")) 478 (error "RCS backend doesn't support directory-level rollback."))
479 (dolist (file (vc-expand-dirs files)) 479 (dolist (file (vc-expand-dirs files))
@@ -527,7 +527,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
527 527
528(defun vc-rcs-steal-lock (file &optional rev) 528(defun vc-rcs-steal-lock (file &optional rev)
529 "Steal the lock on the current workfile for FILE and revision REV. 529 "Steal the lock on the current workfile for FILE and revision REV.
530If FUILEis a directory, steal the lock on all registered files beneath it. 530If FILE is a directory, steal the lock on all registered files beneath it.
531Needs RCS 5.6.2 or later for -M." 531Needs RCS 5.6.2 or later for -M."
532 (if (file-directory-p file) 532 (if (file-directory-p file)
533 (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file))) 533 (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file)))
@@ -861,7 +861,7 @@ to its master version."
861 861
862(defun vc-rcs-fetch-master-state (file &optional working-revision) 862(defun vc-rcs-fetch-master-state (file &optional working-revision)
863 "Compute the master file's idea of the state of FILE. 863 "Compute the master file's idea of the state of FILE.
864If a WORKFILE-VERSION is given, compute the state of that version, 864If a WORKING-REVISION is given, compute the state of that version,
865otherwise determine the workfile version based on the master file. 865otherwise determine the workfile version based on the master file.
866This function sets the properties `vc-working-revision' and 866This function sets the properties `vc-working-revision' and
867`vc-checkout-model' to their correct values, based on the master 867`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\)."
1063 1063
1064(defun vc-rcs-system-release () 1064(defun vc-rcs-system-release ()
1065 "Return the RCS release installed on this system, as a string. 1065 "Return the RCS release installed on this system, as a string.
1066Return symbol UNKNOWN if the release cannot be deducted. The user can 1066Return symbol `unknown' if the release cannot be deducted. The user can
1067override this using variable `vc-rcs-release'. 1067override this using variable `vc-rcs-release'.
1068 1068
1069If the user has not set variable `vc-rcs-release' and it is nil, 1069If the user has not set variable `vc-rcs-release' and it is nil,