[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el vc.el
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el vc.el |
Date: |
Wed, 26 Aug 2009 07:42:15 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 09/08/26 07:42:15
Modified files:
lisp : ChangeLog vc-bzr.el vc.el
Log message:
* vc.el (vc-default-prettify-state-info): Remove function, unused.
* vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16017&r2=1.16018
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-bzr.el?cvsroot=emacs&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.724&r2=1.725
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16017
retrieving revision 1.16018
diff -u -b -r1.16017 -r1.16018
--- ChangeLog 26 Aug 2009 07:01:09 -0000 1.16017
+++ ChangeLog 26 Aug 2009 07:42:11 -0000 1.16018
@@ -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 <address@hidden>
Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- vc-bzr.el 25 Aug 2009 08:50:56 -0000 1.80
+++ vc-bzr.el 26 Aug 2009 07:42:14 -0000 1.81
@@ -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))
Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.724
retrieving revision 1.725
diff -u -b -r1.724 -r1.725
--- vc.el 26 Aug 2009 05:26:27 -0000 1.724
+++ vc.el 26 Aug 2009 07:42:14 -0000 1.725
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el vc.el,
Dan Nicolaescu <=