From: Dan Nicolaescu Date: Thu, 27 Mar 2008 22:18:10 +0000 (+0000) Subject: (vc-hg-state, vc-hg-dir-state): Deal with 'missing X-Git-Tag: emacs-pretest-23.0.90~6849 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4255034848ac788a718930a023c928ac7a522c5a;p=emacs.git (vc-hg-state, vc-hg-dir-state): Deal with 'missing files. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b939374d03e..171bb3f7f0f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-03-27 Dan Nicolaescu + * vc-hg.el (vc-hg-state, vc-hg-dir-state): Deal with 'missing + files. + * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Fix predicate. 2008-03-27 Stefan Monnier diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index ac87336d5d7..abf64a7f987 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -177,6 +177,7 @@ ((eq state ?M) 'edited) ((eq state ?I) 'ignored) ((eq state ?R) 'removed) + ((eq state ?!) 'missing) ((eq state ??) 'unregistered) ((eq state ?C) 'up-to-date) ;; Older mercurials use this (t 'up-to-date))))))) @@ -222,7 +223,8 @@ (vc-file-setprop file 'vc-backend 'none) (vc-file-setprop file 'vc-state 'unregistered)) ((eq status-char ?!) - nil) + (vc-file-setprop file 'vc-backend 'Hg) + (vc-file-setprop file 'vc-state 'missing)) (t ;; Presently C, might change to = in 0.9.6 (vc-file-setprop file 'vc-backend 'Hg) (vc-file-setprop file 'vc-state 'up-to-date)))