diff options
| author | Dan Nicolaescu | 2009-08-26 07:42:11 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-08-26 07:42:11 +0000 |
| commit | dc81064982de88b01b14fc200067a9f50522934e (patch) | |
| tree | 1bcd6a7fea4d6ae50d84e2a748a19c57e22b3505 | |
| parent | 2ddf440db15a2a683e10c9fb43a69b457872b41f (diff) | |
| download | emacs-dc81064982de88b01b14fc200067a9f50522934e.tar.gz emacs-dc81064982de88b01b14fc200067a9f50522934e.zip | |
* vc.el (vc-default-prettify-state-info): Remove function, unused.
* vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused.
| -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 @@ | |||
| 9 | 9 | ||
| 10 | * vc.el: Document the desired behavior for reverted files in the | 10 | * vc.el: Document the desired behavior for reverted files in the |
| 11 | `added' state. | 11 | `added' state. |
| 12 | (vc-default-prettify-state-info): Remove function, unused. | ||
| 13 | |||
| 14 | * vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused. | ||
| 12 | 15 | ||
| 13 | 2009-08-26 Glenn Morris <rgm@gnu.org> | 16 | 2009-08-26 Glenn Morris <rgm@gnu.org> |
| 14 | 17 | ||
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." | |||
| 594 | (apply #'process-file command nil (list (current-buffer) nil) nil args) | 594 | (apply #'process-file command nil (list (current-buffer) nil) nil args) |
| 595 | (buffer-substring (point-min) (point-max))))) | 595 | (buffer-substring (point-min) (point-max))))) |
| 596 | 596 | ||
| 597 | (defun vc-bzr-prettify-state-info (file) | ||
| 598 | "Bzr-specific version of `vc-prettify-state-info'." | ||
| 599 | (if (eq 'edited (vc-state file)) | ||
| 600 | (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state) | ||
| 601 | 'edited)) ")") | ||
| 602 | ;; else fall back to default vc.el representation | ||
| 603 | (vc-default-prettify-state-info 'Bzr file))) | ||
| 604 | |||
| 605 | (defstruct (vc-bzr-extra-fileinfo | 597 | (defstruct (vc-bzr-extra-fileinfo |
| 606 | (:copier nil) | 598 | (:copier nil) |
| 607 | (:constructor vc-bzr-create-extra-fileinfo (extra-name)) | 599 | (: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 @@ | |||
| 225 | ;; The default implementation deals well with all states that | 225 | ;; The default implementation deals well with all states that |
| 226 | ;; `vc-state' can return. | 226 | ;; `vc-state' can return. |
| 227 | ;; | 227 | ;; |
| 228 | ;; - prettify-state-info (file) | ||
| 229 | ;; | ||
| 230 | ;; Translate the `vc-state' property of FILE into a string that can be | ||
| 231 | ;; used in a human-readable buffer. The default implementation deals well | ||
| 232 | ;; with all states that `vc-state' can return. | ||
| 233 | ;; | ||
| 234 | ;; STATE-CHANGING FUNCTIONS | 228 | ;; STATE-CHANGING FUNCTIONS |
| 235 | ;; | 229 | ;; |
| 236 | ;; * create-repo (backend) | 230 | ;; * create-repo (backend) |
| @@ -2389,26 +2383,6 @@ to provide the `find-revision' operation instead." | |||
| 2389 | (insert-file-contents-literally tmpfile))) | 2383 | (insert-file-contents-literally tmpfile))) |
| 2390 | (delete-file tmpfile)))) | 2384 | (delete-file tmpfile)))) |
| 2391 | 2385 | ||
| 2392 | (defun vc-default-prettify-state-info (backend file) | ||
| 2393 | (let* ((state (vc-state file)) | ||
| 2394 | (statestring | ||
| 2395 | (cond | ||
| 2396 | ((stringp state) (concat "(locked:" state ")")) | ||
| 2397 | ((eq state 'edited) "(modified)") | ||
| 2398 | ((eq state 'needs-merge) "(merge)") | ||
| 2399 | ((eq state 'needs-update) "(update)") | ||
| 2400 | ((eq state 'added) "(added)") | ||
| 2401 | ((eq state 'removed) "(removed)") | ||
| 2402 | ((eq state 'ignored) "(ignored)") | ||
| 2403 | ((eq state 'unregistered) "(unregistered)") | ||
| 2404 | ((eq state 'unlocked-changes) "(stale)") | ||
| 2405 | (t (format "(unknown:%s)" state)))) | ||
| 2406 | (buffer | ||
| 2407 | (get-file-buffer file)) | ||
| 2408 | (modflag | ||
| 2409 | (if (and buffer (buffer-modified-p buffer)) "+" ""))) | ||
| 2410 | (concat statestring modflag))) | ||
| 2411 | |||
| 2412 | (defun vc-default-rename-file (backend old new) | 2386 | (defun vc-default-rename-file (backend old new) |
| 2413 | (condition-case nil | 2387 | (condition-case nil |
| 2414 | (add-name-to-file old new) | 2388 | (add-name-to-file old new) |