318 |
(and (not (eq type 'MESSAGE)) |
(and (not (eq type 'MESSAGE)) |
319 |
(eq (car (memq func (cdr (assq type cvs-states)))) func)))) |
(eq (car (memq func (cdr (assq type cvs-states)))) func)))) |
320 |
|
|
321 |
(defun cvs-add-face (str face &optional keymap) |
(defun cvs-add-face (str face &optional keymap &rest properties) |
322 |
(when cvs-highlight |
(when (or cvs-highlight properties) |
323 |
(add-text-properties 0 (length str) |
(add-text-properties 0 (length str) |
324 |
(list* 'face face |
(append |
325 |
(when keymap |
(when cvs-highlight |
326 |
(list* 'mouse-face 'highlight |
(list* 'face face |
327 |
(when (keymapp keymap) |
(when keymap |
328 |
(list 'keymap keymap))))) |
(list* 'mouse-face 'highlight |
329 |
|
(when (keymapp keymap) |
330 |
|
(list 'keymap keymap)))))) |
331 |
|
properties) |
332 |
str)) |
str)) |
333 |
str) |
str) |
334 |
|
|
352 |
(cvs-add-face "*" 'cvs-marked-face) |
(cvs-add-face "*" 'cvs-marked-face) |
353 |
" ")) |
" ")) |
354 |
(file (cvs-add-face (cvs-fileinfo->pp-name fileinfo) |
(file (cvs-add-face (cvs-fileinfo->pp-name fileinfo) |
355 |
'cvs-filename-face t)) |
'cvs-filename-face t |
356 |
|
'cvs-goal-column t)) |
357 |
(base (or (cvs-fileinfo->base-rev fileinfo) "")) |
(base (or (cvs-fileinfo->base-rev fileinfo) "")) |
358 |
(head (cvs-fileinfo->head-rev fileinfo)) |
(head (cvs-fileinfo->head-rev fileinfo)) |
359 |
(type |
(type |
375 |
(when (and head (not (string= head base))) head) |
(when (and head (not (string= head base))) head) |
376 |
;; or nothing |
;; or nothing |
377 |
""))) |
""))) |
378 |
(format "%-11s %s %-11s %-11s %s" |
(format "%-11s %s %-11s %-11s %s" |
379 |
side status type base file))))))) |
side status type base file))))))) |
380 |
|
|
381 |
|
|
382 |
(defun cvs-fileinfo-update (fi fi-new) |
(defun cvs-fileinfo-update (fi fi-new) |