auto upstream

3 files changed, 35 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 676ce21ff14..c2a58265ffd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2013-01-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-notify-watch-descriptor): Make it
+        buffer local, again.  This was lost with the fix on 2013-01-12.
+
+2013-01-17  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * eshell/esh-util.el (eshell-path-env): Make it buffer local, in
+        order to support several eshell buffers in parallel.
+
+2013-01-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-use-notify): In the :set function, do
+        not modify `kill-buffer-hook'.
+        (auto-revert-notify-rm-watch): Remove
+        `auto-revert-notify-rm-watch' from `kill-buffer-hook'.
+        (auto-revert-notify-add-watch): Do not call
+        `auto-revert-notify-rm-watch', but add it to a buffer local
+        `kill-buffer-hook'.
+
 2013-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/trace.el (trace--read-args): Use a closure and an honest
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index c9180482cd9..1b5460ff2cf 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -273,13 +273,12 @@ through Custom only."
   :type 'boolean
   :set (lambda (variable value)
          (set-default variable (and auto-revert-notify-enabled value))
-         (if (symbol-value variable)
-             (add-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch)
-           (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch)
+         (unless (symbol-value variable)
            (when auto-revert-notify-enabled
              (dolist (buf (buffer-list))
                (with-current-buffer buf
-                 (auto-revert-notify-rm-watch))))))
+                 (when (symbol-value 'auto-revert-notify-watch-descriptor)
+                   (auto-revert-notify-rm-watch)))))))
   :version "24.4")
 
 ;; Internal variables:
@@ -311,6 +310,7 @@ Hash key is a watch descriptor, hash value is the corresponding buffer.")
 
 (defvar auto-revert-notify-watch-descriptor nil
   "The file watch descriptor active for the current buffer.")
+(make-variable-buffer-local 'auto-revert-notify-watch-descriptor)
 (put 'auto-revert-notify-watch-descriptor 'permanent-local t)
 
 (defvar auto-revert-notify-modified-p nil
@@ -472,14 +472,15 @@ will use an up-to-date value of `auto-revert-interval'"
                    'inotify-rm-watch 'w32notify-rm-watch)
                auto-revert-notify-watch-descriptor))
     (remhash auto-revert-notify-watch-descriptor
-             auto-revert-notify-watch-descriptor-hash-list))
+             auto-revert-notify-watch-descriptor-hash-list)
+    (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch))
   (setq auto-revert-notify-watch-descriptor nil
         auto-revert-notify-modified-p nil))
 
 (defun auto-revert-notify-add-watch ()
   "Enable file watch for current buffer's associated file."
-  (when (and buffer-file-name auto-revert-use-notify)
-    (auto-revert-notify-rm-watch)
+  (when (and buffer-file-name auto-revert-use-notify
+             (not auto-revert-notify-watch-descriptor))
     (let ((func (if (fboundp 'inotify-add-watch)
                     'inotify-add-watch 'w32notify-add-watch))
           (aspect (if (fboundp 'inotify-add-watch)
@@ -489,9 +490,12 @@ will use an up-to-date value of `auto-revert-interval'"
               (funcall
                func buffer-file-name aspect 'auto-revert-notify-handler)))
       (if auto-revert-notify-watch-descriptor
-          (puthash auto-revert-notify-watch-descriptor
-                   (current-buffer)
-                   auto-revert-notify-watch-descriptor-hash-list)
+          (progn
+            (puthash auto-revert-notify-watch-descriptor
+                     (current-buffer)
+                     auto-revert-notify-watch-descriptor-hash-list)
+            (add-hook (make-local-variable 'kill-buffer-hook)
+                      'auto-revert-notify-rm-watch))
         ;; Fallback to file checks.
         (set (make-local-variable 'auto-revert-use-notify) nil)))))
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 2f49a21e76c..f9b86219e9b 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -229,6 +229,7 @@ If N or M is nil, it means the end of the list."
   "Content of $PATH.
 It might be different from \(getenv \"PATH\"\), when
 `default-directory' points to a remote host.")
+(make-variable-buffer-local 'eshell-path-env)
 
 (defun eshell-parse-colon-path (path-env)
   "Split string with `parse-colon-path'.