mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.

Browse Source
This commit is contained in:
Glenn Morris 2011-01-19 23:17:22 -08:00
parent e885315dd0
commit dbfb414e49
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2011-01-20 Glenn Morris <rgm@gnu.org>
* vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.
* simple.el (read-expression-history): Remove, it's in minibuf.c.
2011-01-20 Chong Yidong <cyd@stupidchicken.com>

5
lisp/vc/vc-svn.el
View File

@ -180,8 +180,9 @@ want to force an empty list of arguments, use t."
(let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
(propstat (cdr (assq (aref (match-string 2) 0) state-map)))
(filename (match-string 4)))
(if (memq propstat '(conflict edited))
(setq state propstat))
(and (memq propstat '(conflict edited))
(not (eq state 'conflict)) ; conflict always wins
(setq state propstat))
(and remote (string-equal (match-string 3) "*")
;; FIXME are there other possible combinations?
(cond ((eq state 'edited) (setq state 'needs-merge))