[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/12/27 16:17:19

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -b -r1.497 -r1.498
--- vc.el       27 Dec 2007 15:26:02 -0000      1.497
+++ vc.el       27 Dec 2007 16:17:16 -0000      1.498
@@ -2330,11 +2330,18 @@
 (defun vc-dired-ignorable-p (filename)
   "Should FILENAME be ignored in VC-Dired listings?"
   (catch t 
+    ;; Ignore anything that wouldn't be found by completion (.o, .la, etc.)
     (dolist (ignorable completion-ignored-extensions)
       (let ((ext (substring filename 
                              (- (length filename)
                                 (length ignorable)))))
        (if (string= ignorable ext) (throw t t))))
+    ;; Ignore Makefiles derived from something else
+    (when (string= (file-name-nondirectory filename) "Makefile")
+      (let* ((dir (file-name-directory filename))
+           (peers (directory-files (or dir default-directory))))
+       (if (or (member "Makefile.in" peers) (member "Makefile.am" peers))
+          (throw t t))))
     nil))
 
 (defun vc-dired-hook ()
@@ -2390,11 +2397,17 @@
          (t
          (let ((backend (vc-backend filename)))
            (cond
-            ((and backend
-                  (not (and vc-dired-terse-mode
-                            (vc-up-to-date-p filename))))
+            ;; Not registered
+            ((not backend)
+             (if vc-dired-terse-mode
+                 (dired-kill-line)
+               (vc-dired-reformat-line "?")
+               (forward-line 1)))
+            ;; Either we're in non-terse mode or it's out of date 
+            ((not (and vc-dired-terse-mode (vc-up-to-date-p filename)))
              (vc-dired-reformat-line (vc-call dired-state-info filename))
              (forward-line 1))
+            ;; Remaining cases are under version control but uninteresting 
             (t
              (dired-kill-line)))))))
        ;; any other line
@@ -2405,7 +2418,7 @@
     (widen)
     (cond ((eq (count-lines (point-min) (point-max)) 1)
            (goto-char (point-min))
-           (message "No files locked under %s" default-directory)))))
+           (message "No changes pending under %s" default-directory)))))
 
 (defun vc-dired-purge ()
   "Remove empty subdirs."