Commit bdb55eba authored by Sam Steingold's avatar Sam Steingold

(vc-cvs-status-extra-headers): Remove extraneous newlines.

parent 0615d903
2008-06-03 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-status-extra-headers): Remove extraneous newlines.
2008-06-03 John Paul Wallington <jpw@pobox.com> 2008-06-03 John Paul Wallington <jpw@pobox.com>
* progmodes/make-mode.el (makefile-cleanup-continuations) * progmodes/make-mode.el (makefile-cleanup-continuations)
......
...@@ -251,13 +251,13 @@ committed and support display of sticky tags." ...@@ -251,13 +251,13 @@ committed and support display of sticky tags."
help-echo help-echo
(string (string
(let ((def-ml (vc-default-mode-line-string 'CVS file))) (let ((def-ml (vc-default-mode-line-string 'CVS file)))
(setq help-echo (setq help-echo
(get-text-property 0 'help-echo def-ml)) (get-text-property 0 'help-echo def-ml))
def-ml))) def-ml)))
(propertize (propertize
(if (zerop (length sticky-tag)) (if (zerop (length sticky-tag))
string string
(setq help-echo (format "%s on the '%s' branch" (setq help-echo (format "%s on the '%s' branch"
help-echo sticky-tag)) help-echo sticky-tag))
(concat string "[" sticky-tag "]")) (concat string "[" sticky-tag "]"))
'help-echo help-echo))) 'help-echo help-echo)))
...@@ -422,7 +422,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION." ...@@ -422,7 +422,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
(with-current-buffer (get-buffer "*vc*") (with-current-buffer (get-buffer "*vc*")
(goto-char (point-min)) (goto-char (point-min))
(if (re-search-forward "conflicts during merge" nil t) (if (re-search-forward "conflicts during merge" nil t)
(progn (progn
(vc-file-setprop file 'vc-state 'conflict) (vc-file-setprop file 'vc-state 'conflict)
;; signal error ;; signal error
1) 1)
...@@ -477,7 +477,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION." ...@@ -477,7 +477,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
(message "Merging changes into %s...done" file)))) (message "Merging changes into %s...done" file))))
(defun vc-cvs-modify-change-comment (files rev comment) (defun vc-cvs-modify-change-comment (files rev comment)
"Modify the change comments for FILES on a specified REV. "Modify the change comments for FILES on a specified REV.
Will fail unless you have administrative privileges on the repo." Will fail unless you have administrative privileges on the repo."
(vc-cvs-command nil 0 files "admin" (concat "-m" rev ":" comment))) (vc-cvs-command nil 0 files "admin" (concat "-m" rev ":" comment)))
...@@ -850,7 +850,7 @@ state." ...@@ -850,7 +850,7 @@ state."
(setq subdir (expand-file-name (match-string 1)))) (setq subdir (expand-file-name (match-string 1))))
;; Unregistered files ;; Unregistered files
(while (looking-at "? \\(.*\\)") (while (looking-at "? \\(.*\\)")
(setq file (file-relative-name (setq file (file-relative-name
(expand-file-name (match-string 1) subdir))) (expand-file-name (match-string 1) subdir)))
(push (list file 'unregistered) result) (push (list file 'unregistered) result)
(forward-line 1)) (forward-line 1))
...@@ -890,8 +890,8 @@ state." ...@@ -890,8 +890,8 @@ state."
;; (goto-char (point-min)) ;; (goto-char (point-min))
;; (while (not (eobp)) ;; (while (not (eobp))
;; (if (looking-at "^[ACMPRU?] \\(.*\\)$") ;; (if (looking-at "^[ACMPRU?] \\(.*\\)$")
;; (push (list (match-string 1) ;; (push (list (match-string 1)
;; (cdr (assoc (char-after) translation))) ;; (cdr (assoc (char-after) translation)))
;; result) ;; result)
;; (cond ;; (cond
;; ((looking-at "cvs update: warning: \\(.*\\) was lost") ;; ((looking-at "cvs update: warning: \\(.*\\) was lost")
...@@ -935,7 +935,7 @@ state." ...@@ -935,7 +935,7 @@ state."
(insert-file-contents "CVS/Root") (insert-file-contents "CVS/Root")
(goto-char (point-min)) (goto-char (point-min))
(and (looking-at ":ext:") (delete-char 5)) (and (looking-at ":ext:") (delete-char 5))
(buffer-substring (point) (point-max))) (buffer-substring (point) (1- (point-max))))
(file-error nil))) (file-error nil)))
(module (module
(condition-case nil (condition-case nil
...@@ -947,17 +947,15 @@ state." ...@@ -947,17 +947,15 @@ state."
(file-error nil)))) (file-error nil))))
(concat (concat
(cond (module (cond (module
(concat (concat (propertize "Module : " 'face 'font-lock-type-face)
(propertize "Module : " 'face 'font-lock-type-face) (propertize module 'face 'font-lock-variable-name-face)))
(propertize module 'face 'font-lock-variable-name-face)))
(t "")) (t ""))
(cond (repo (cond (repo
(concat (concat (propertize "Repository : " 'face 'font-lock-type-face)
(propertize "Repository : " 'face 'font-lock-type-face) (propertize repo 'face 'font-lock-variable-name-face)))
(propertize repo 'face 'font-lock-variable-name-face)))
(t "")) (t ""))
;; In CVS, branch is a per-file property, not a per-directory property. We ;; In CVS, branch is a per-file property, not a per-directory property.
;; can't really do this here without making dangerous assumptions. ;; We can't really do this here without making dangerous assumptions.
;;(propertize "Branch: " 'face 'font-lock-type-face) ;;(propertize "Branch: " 'face 'font-lock-type-face)
;;(propertize "ADD CODE TO PRINT THE BRANCH NAME\n" ;;(propertize "ADD CODE TO PRINT THE BRANCH NAME\n"
;; 'face 'font-lock-warning-face) ;; 'face 'font-lock-warning-face)
...@@ -1107,7 +1105,7 @@ is non-nil." ...@@ -1107,7 +1105,7 @@ is non-nil."
(setq table (lazy-completion-table (setq table (lazy-completion-table
table (lambda () (vc-cvs-revision-table (car files))))) table (lambda () (vc-cvs-revision-table (car files)))))
table)) table))
(provide 'vc-cvs) (provide 'vc-cvs)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment