From: Glenn Morris <rgm@gnu.org>
Date: Sat, 4 Aug 2007 02:31:52 +0000 (+0000)
Subject: (auto-revert-tail-mode): auto-revert-tail-pos is zero, not nil, when
X-Git-Tag: emacs-pretest-23.0.90~11606
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0917bb33fd255a6cfa8e4f4429083628d6618eb9;p=emacs.git

(auto-revert-tail-mode): auto-revert-tail-pos is zero, not nil, when
the library is first loaded.  Check for a file that has been modified
on disk.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dde765a15e2..9ba954b2e6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-04  Glenn Morris  <rgm@gnu.org>
+
+	* autorevert.el (auto-revert-tail-mode): auto-revert-tail-pos is
+	zero, not nil, when the library is first loaded.  Check for a file
+	that has been modified on disk.
+
+	* progmodes/cperl-mode.el (cperl-compilation-error-regexp-alist):
+	Remove duplicate defvar preventing initialization.
+	(cperl-mode): Fix compilation-error-regexp-alist-alist setting.
+
 2007-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* diff-mode.el (diff-font-lock-keywords): Fix up false positives.
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 473e8e1976b..6c6dbd963d5 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -276,9 +276,9 @@ the list of old buffers.")
   "Position of last known end of file.")
 
 (add-hook 'find-file-hook
-	  (lambda ()
-	    (set (make-local-variable 'auto-revert-tail-pos)
-		 (nth 7 (file-attributes buffer-file-name)))))
+ 	  (lambda ()
+ 	    (set (make-local-variable 'auto-revert-tail-pos)
+ 		 (nth 7 (file-attributes buffer-file-name)))))
 
 ;; Functions:
 
@@ -334,9 +334,25 @@ Use `auto-revert-mode' for changes other than appends!"
       (auto-revert-tail-mode 0)
       (error "This buffer is not visiting a file"))
     (if (and (buffer-modified-p)
-	     (not auto-revert-tail-pos) ; library was loaded only after finding file
+	     (zerop auto-revert-tail-pos) ; library was loaded only after finding file
 	     (not (y-or-n-p "Buffer is modified, so tail offset may be wrong.  Proceed? ")))
 	(auto-revert-tail-mode 0)
+      ;; a-r-tail-pos stores the size of the file at the time of the
+      ;; last revert. After this package loads, it adds a
+      ;; find-file-hook to set this variable every time a file is
+      ;; loaded.  If the package is loaded only _after_ visiting the
+      ;; file to be reverted, then we have no idea what the value of
+      ;; a-r-tail-pos should have been when the file was visited.  If
+      ;; the file has changed on disk in the meantime, all we can do
+      ;; is offer to revert the whole thing. If you choose not to
+      ;; revert, then you might miss some output then happened
+      ;; between visiting the file and activating a-r-t-mode.
+      (and (zerop auto-revert-tail-pos)
+           (not (verify-visited-file-modtime (current-buffer)))
+           (y-or-n-p "File changed on disk, content may be missing.  \
+Perform a full revert? ")
+           ;; Use this (not just revert-buffer) for point-preservation.
+           (auto-revert-handler))
       ;; else we might reappend our own end when we save
       (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t)
       (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position