diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 8 | ||||
| -rw-r--r-- | lisp/vc.el | 26 |
3 files changed, 3 insertions, 34 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1408e8ef075..8b30443e837 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 314122487cc..b7e0b65e48a 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -594,14 +594,6 @@ stream. Standard error output is discarded." (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)) diff --git a/lisp/vc.el b/lisp/vc.el index 085de45ad1c..de6fc319193 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -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 @@ to provide the `find-revision' operation instead." (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) |