Mercurial > emacs
changeset 104618:7c3b132bf9bb
* vc.el (vc-default-prettify-state-info): Remove function, unused.
* vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 26 Aug 2009 07:42:11 +0000 |
| parents | abce8d2d9707 |
| children | 90578b9cc2d2 |
| files | lisp/ChangeLog lisp/vc-bzr.el lisp/vc.el |
| diffstat | 3 files changed, 3 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Aug 26 07:01:09 2009 +0000 +++ b/lisp/ChangeLog Wed Aug 26 07:42:11 2009 +0000 @@ -9,6 +9,9 @@ * vc.el: Document the desired behavior for reverted files in the `added' state. + (vc-default-prettify-state-info): Remove function, unused. + + * vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused. 2009-08-26 Glenn Morris <rgm@gnu.org>
--- a/lisp/vc-bzr.el Wed Aug 26 07:01:09 2009 +0000 +++ b/lisp/vc-bzr.el Wed Aug 26 07:42:11 2009 +0000 @@ -594,14 +594,6 @@ (apply #'process-file command nil (list (current-buffer) nil) nil args) (buffer-substring (point-min) (point-max))))) -(defun vc-bzr-prettify-state-info (file) - "Bzr-specific version of `vc-prettify-state-info'." - (if (eq 'edited (vc-state file)) - (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state) - 'edited)) ")") - ;; else fall back to default vc.el representation - (vc-default-prettify-state-info 'Bzr file))) - (defstruct (vc-bzr-extra-fileinfo (:copier nil) (:constructor vc-bzr-create-extra-fileinfo (extra-name))
--- a/lisp/vc.el Wed Aug 26 07:01:09 2009 +0000 +++ b/lisp/vc.el Wed Aug 26 07:42:11 2009 +0000 @@ -225,12 +225,6 @@ ;; The default implementation deals well with all states that ;; `vc-state' can return. ;; -;; - prettify-state-info (file) -;; -;; Translate the `vc-state' property of FILE into a string that can be -;; used in a human-readable buffer. The default implementation deals well -;; with all states that `vc-state' can return. -;; ;; STATE-CHANGING FUNCTIONS ;; ;; * create-repo (backend) @@ -2389,26 +2383,6 @@ (insert-file-contents-literally tmpfile))) (delete-file tmpfile)))) -(defun vc-default-prettify-state-info (backend file) - (let* ((state (vc-state file)) - (statestring - (cond - ((stringp state) (concat "(locked:" state ")")) - ((eq state 'edited) "(modified)") - ((eq state 'needs-merge) "(merge)") - ((eq state 'needs-update) "(update)") - ((eq state 'added) "(added)") - ((eq state 'removed) "(removed)") - ((eq state 'ignored) "(ignored)") - ((eq state 'unregistered) "(unregistered)") - ((eq state 'unlocked-changes) "(stale)") - (t (format "(unknown:%s)" state)))) - (buffer - (get-file-buffer file)) - (modflag - (if (and buffer (buffer-modified-p buffer)) "+" ""))) - (concat statestring modflag))) - (defun vc-default-rename-file (backend old new) (condition-case nil (add-name-to-file old new)