diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-sccs.el | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a7e97b435d2..5d4de7adc65 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-05-16 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * vc-rcs.el (vc-rcs-create-tag): | ||
| 4 | * vc-sccs.el (vc-sccs-create-tag): | ||
| 5 | Fix typo in error message and pass backend arg. | ||
| 6 | |||
| 1 | 2008-05-15 Michael Albinus <michael.albinus@gmx.de> | 7 | 2008-05-15 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 8 | ||
| 3 | * net/tramp.el (tramp-file-name-for-operation): Add `make-temp-name'. | 9 | * net/tramp.el (tramp-file-name-for-operation): Add `make-temp-name'. |
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index a5096da9643..5cf19064b59 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el | |||
| @@ -258,7 +258,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." | |||
| 258 | If FILE is a directory, all version-controlled files beneath are checked out. | 258 | If FILE is a directory, all version-controlled files beneath are checked out. |
| 259 | EDITABLE non-nil means that the file should be writable and | 259 | EDITABLE non-nil means that the file should be writable and |
| 260 | locked. REV is the revision to check out." | 260 | locked. REV is the revision to check out." |
| 261 | (if (file-directory-p file) | 261 | (if (file-directory-p file) |
| 262 | (mapc 'vc-sccs-checkout (vc-expand-dirs (list file))) | 262 | (mapc 'vc-sccs-checkout (vc-expand-dirs (list file))) |
| 263 | (let ((file-buffer (get-file-buffer file)) | 263 | (let ((file-buffer (get-file-buffer file)) |
| 264 | switches) | 264 | switches) |
| @@ -293,7 +293,7 @@ are expanded to all version-controlled subfiles." | |||
| 293 | (error "SCCS backend doesn't support directory-level rollback.")) | 293 | (error "SCCS backend doesn't support directory-level rollback.")) |
| 294 | (dolist (file files) | 294 | (dolist (file files) |
| 295 | (let ((discard (vc-working-revision file))) | 295 | (let ((discard (vc-working-revision file))) |
| 296 | (if (null (yes-or-no-p (format "Remove version %s from %s history? " | 296 | (if (null (yes-or-no-p (format "Remove version %s from %s history? " |
| 297 | discard file))) | 297 | discard file))) |
| 298 | (error "Aborted")) | 298 | (error "Aborted")) |
| 299 | (message "Removing revision %s from %s..." discard file) | 299 | (message "Removing revision %s from %s..." discard file) |
| @@ -304,7 +304,7 @@ are expanded to all version-controlled subfiles." | |||
| 304 | (defun vc-sccs-revert (file &optional contents-done) | 304 | (defun vc-sccs-revert (file &optional contents-done) |
| 305 | "Revert FILE to the version it was based on. If FILE is a directory, | 305 | "Revert FILE to the version it was based on. If FILE is a directory, |
| 306 | revert all subfiles." | 306 | revert all subfiles." |
| 307 | (if (file-directory-p file) | 307 | (if (file-directory-p file) |
| 308 | (mapc 'vc-sccs-revert (vc-expand-dirs (list file))) | 308 | (mapc 'vc-sccs-revert (vc-expand-dirs (list file))) |
| 309 | (vc-sccs-do-command nil 0 "unget" (vc-name file)) | 309 | (vc-sccs-do-command nil 0 "unget" (vc-name file)) |
| 310 | (vc-sccs-do-command nil 0 "get" (vc-name file)) | 310 | (vc-sccs-do-command nil 0 "get" (vc-name file)) |
| @@ -315,7 +315,7 @@ revert all subfiles." | |||
| 315 | 315 | ||
| 316 | (defun vc-sccs-steal-lock (file &optional rev) | 316 | (defun vc-sccs-steal-lock (file &optional rev) |
| 317 | "Steal the lock on the current workfile for FILE and revision REV." | 317 | "Steal the lock on the current workfile for FILE and revision REV." |
| 318 | (if (file-directory-p file) | 318 | (if (file-directory-p file) |
| 319 | (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file))) | 319 | (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file))) |
| 320 | (vc-sccs-do-command nil 0 "unget" | 320 | (vc-sccs-do-command nil 0 "unget" |
| 321 | (vc-name file) "-n" (if rev (concat "-r" rev))) | 321 | (vc-name file) "-n" (if rev (concat "-r" rev))) |
| @@ -325,7 +325,7 @@ revert all subfiles." | |||
| 325 | (defun vc-sccs-modify-change-comment (files rev comment) | 325 | (defun vc-sccs-modify-change-comment (files rev comment) |
| 326 | "Modify (actually, append to) the change comments for FILES on a specified REV." | 326 | "Modify (actually, append to) the change comments for FILES on a specified REV." |
| 327 | (dolist (file (vc-expand-dirs files)) | 327 | (dolist (file (vc-expand-dirs files)) |
| 328 | (vc-sccs-do-command nil 0 "cdc" (vc-name file) | 328 | (vc-sccs-do-command nil 0 "cdc" (vc-name file) |
| 329 | (concat "-y" comment) (concat "-r" rev)))) | 329 | (concat "-y" comment) (concat "-r" rev)))) |
| 330 | 330 | ||
| 331 | 331 | ||
| @@ -358,7 +358,7 @@ revert all subfiles." | |||
| 358 | 358 | ||
| 359 | (defun vc-sccs-create-tag (backend dir name branchp) | 359 | (defun vc-sccs-create-tag (backend dir name branchp) |
| 360 | (when branchp | 360 | (when branchp |
| 361 | (error "SCCS backend %s does not support module branches.")) | 361 | (error "SCCS backend %s does not support module branches" backend)) |
| 362 | (let ((result (vc-tag-precondition dir))) | 362 | (let ((result (vc-tag-precondition dir))) |
| 363 | (if (stringp result) | 363 | (if (stringp result) |
| 364 | (error "File %s is not up-to-date" result) | 364 | (error "File %s is not up-to-date" result) |