Could you review this patch?

* looking for [EMAIL PROTECTED] to compare with
* comparing to [EMAIL PROTECTED]

  M lisp/xtla.el 
  M lisp/xtla-defs.el 
                                                                        


* modified files

--- orig/lisp/xtla-defs.el
+++ mod/lisp/xtla-defs.el
@@ -2584,6 +2584,12 @@
   :group 'tla-faces)
 
 ;;;###autoload
+(defface tla-unknown
+  '((t (:inherit font-lock-warning-face)))
+  "Face to highlight unknown status modification"
+  :group 'tla-faces)
+
+;;;###autoload
 (defface tla-modified
   '((t (:inherit font-lock-function-name-face)))
   "Face to highlight modified files"


--- orig/lisp/xtla.el
+++ mod/lisp/xtla.el
@@ -2026,6 +2026,7 @@
   "Return a face adapted to MODIF, a string, which can be A, M, C, or D."
   (cond
    ((string= "A" status) 'tla-added)
+   ((string= "?" status) 'tla-unknown)
    ((string= "M" modif) 'tla-modified)
    ((string= "M" status) 'tla-modified)
    ((string= "-" modif) 'tla-modified)
@@ -2174,7 +2175,9 @@
   (while (or (eq (char-after) ?*)
              (eq (char-after) ?.)
              (looking-at "Searching for best merge")
-             (looking-at "^\\(.\\)\\([ /Abfl>-]?\\)\\(/?\\) 
+\\([^\t\n]*\\)\\(\t\\(.*\\)\\)?$"))
+             ;; WARNING: If `-' doesn't stand for a range,
+             ;; it must be at the last in `[]'.
+             (looking-at "^\\(.\\)\\([ /Abfl>M-]?\\)\\(/?\\) 
+\\([^\t\n]*\\)\\(\t\\(.*\\)\\)?$"))
     (if (or (looking-at "Searching for best merge")
             (eq (char-after) ?*)
             (eq (char-after) ?.))
@@ -2216,7 +2219,10 @@
                 ((string= modif "-")
                  (setq baz-status "P")
                  (setq baz-modif " "))
-                )
+                ((and (string= modif "?")
+                      (string= dir "M"))
+                 (setq baz-status "?")
+                 (setq baz-modif " ")))
           (with-current-buffer changes-buffer
             (if newname
                 (ewoc-enter-last tla-changes-cookie





Reply via email to