aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-12-09 19:51:13 +0200
committerEli Zaretskii2013-12-09 19:51:13 +0200
commit245ddcaa82a7778f662f28584eab8be48c7cfede (patch)
treeef41833e36492066f4e8e36d5ca4910686333826
parenta59f6567d06303117b5befc76988b4ace798ed8f (diff)
parent6aaca95125772b979d88fafc4c8d8b26c6ffcc5b (diff)
downloademacs-245ddcaa82a7778f662f28584eab8be48c7cfede.tar.gz
emacs-245ddcaa82a7778f662f28584eab8be48c7cfede.zip
Merge from trunk.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/autorevert.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a05b461121..8a4cff949ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-12-09 Eli Zaretskii <eliz@gnu.org>
2
3 * autorevert.el (auto-revert-notify-add-watch): Fix a thinko in
4 last commit.
5
12013-12-09 Michael Albinus <michael.albinus@gmx.de> 62013-12-09 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * autorevert.el (auto-revert-notify-add-watch): Do not handle 8 * autorevert.el (auto-revert-notify-add-watch): Do not handle
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f0929f95e38..677e5a9ea1f 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -508,7 +508,7 @@ will use an up-to-date value of `auto-revert-interval'"
508 ;; `auto-revert-use-notify' are non-nil. 508 ;; `auto-revert-use-notify' are non-nil.
509 (when (or (string-match auto-revert-notify-exclude-dir-regexp 509 (when (or (string-match auto-revert-notify-exclude-dir-regexp
510 (expand-file-name default-directory)) 510 (expand-file-name default-directory))
511 (not (file-symlink-p buffer-file-name))) 511 (file-symlink-p buffer-file-name))
512 ;; Fallback to file checks. 512 ;; Fallback to file checks.
513 (set (make-local-variable 'auto-revert-use-notify) nil)) 513 (set (make-local-variable 'auto-revert-use-notify) nil))
514 514