auto upstream

1 files changed, 31 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d4566a91a6..7eef2c80382 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,34 @@
+2013-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (top): Require 'cl in order to pacify byte compiler.
+        (auto-revert-notify-rm-watch): Ignore errors.
+        (auto-revert-notify-add-watch): Ignore errors.  Use '(modify) for
+        inotify, and '(size last-write-time) for w32notify.  Set
+        buffer-local `auto-revert-use-notify' to nil when adding a file
+        watch fails - this is a fallback to the file modification check.
+        (auto-revert-notify-event-p, auto-revert-notify-event-descriptor)
+        (auto-revert-notify-event-action)
+        (auto-revert-notify-event-file-name): New defuns.
+        (auto-revert-notify-handler): Use them.  Implement first
+        plausibility checks.
+        (auto-revert-handler): Handle also `auto-revert-tail-mode'.
+
+2013-01-11  Julien Danjou  <julien@danjou.info>
+
+        * color.el (color-rgb-to-hsv): Fix conversion computing in case min and
+        max are almost equal. Also return the correct value for V which is
+        already between 0 and 1.
+
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * emacs-lisp/ert.el (ert-run-test): Use point-max-marker.
+
+2013-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * autorevert.el (auto-revert-notify-rm-watch)
+        (auto-revert-notify-add-watch): Fix typos in w32notify function
+        names.
+
 2013-01-10  Michael Albinus  <michael.albinus@gmx.de>
 
         * autorevert.el (auto-revert-notify-enabled): Move up.