diff options
Diffstat (limited to 'lisp/vc/vc-svn.el')
| -rw-r--r-- | lisp/vc/vc-svn.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index e10cdd21698..88a280d10f3 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -366,8 +366,9 @@ FILE is a file wildcard, relative to the root directory of DIRECTORY." (defun vc-svn-ignore-completion-table (directory) "Return the list of ignored files in DIRECTORY." (with-temp-buffer - (vc-svn-command t t nil "propget" "svn:ignore" (expand-file-name directory)) - (split-string (buffer-string)))) + (when (zerop (vc-svn-command + t t nil "propget" "svn:ignore" (expand-file-name directory))) + (split-string (buffer-string) "\n")))) (defun vc-svn-find-admin-dir (file) "Return the administrative directory of FILE." @@ -479,7 +480,8 @@ The changes are between FIRST-VERSION and SECOND-VERSION." ((string= (match-string 2) "U") (vc-file-setprop file 'vc-state 'up-to-date) (vc-file-setprop file 'vc-checkout-time - (nth 5 (file-attributes file))) + (file-attribute-modification-time + (file-attributes file))) 0);; indicate success to the caller ;; Merge successful, but our own changes are still in the file ((string= (match-string 2) "G") @@ -729,7 +731,8 @@ Set file properties accordingly. If FILENAME is non-nil, return its status." (if (eq (char-after (match-beginning 1)) ?*) 'needs-update (vc-file-setprop file 'vc-checkout-time - (nth 5 (file-attributes file))) + (file-attribute-modification-time + (file-attributes file))) 'up-to-date)) ((eq status ?A) ;; If the file was actually copied, (match-string 2) is "-". @@ -757,7 +760,7 @@ Set file properties accordingly. If FILENAME is non-nil, return its status." ;; an uppercase or lowercase letter and can contain uppercase and ;; lowercase letters, digits, `-', and `_'. (and (string-match "^[a-zA-Z]" tag) - (not (string-match "[^a-z0-9A-Z-_]" tag)))) + (not (string-match "[^a-z0-9A-Z_-]" tag)))) (defun vc-svn-valid-revision-number-p (tag) "Return non-nil if TAG is a valid revision number." |