auto upstream

1 files changed, 76 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7eef2c80382..7723528c886 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,84 @@
+2013-01-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-notify-watch-descriptor): Give it
+        `permanent-local' property.
+        (auto-revert-notify-handler): Use `file-equal-p'.
+
+2013-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * autorevert.el (auto-revert-notify-handler): Fix filtering of
+        file notification by ACTION. For filtering by file name, compare
+        only the non-directory part of the file name.
+
+2013-01-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * autorevert.el: Use cl-lib instead of cl.
+
+        * vc/vc-bzr.el (vc-bzr--sanitize-header): New function (bug#13307).
+        (vc-bzr-checkin): Use it.
+        * vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION
+        will preserve match-data.
+
+2013-01-11  Felix H. Dahlke  <fhd@ubercode.de>
+
+        * progmodes/js.el: Fix multiline declarations's indentation (bug#8576).
+        (js--declaration-keyword-re): New var.
+        (js--multi-line-declaration-indentation): New function.
+        (js--proper-indentation): Use it.
+
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * calc/calc.el (calc-highlight-selections-with-faces)
+         (calc-dispatch):
+        * comint.el (comint-history-isearch-message):
+        * emacs-lisp/edebug.el (edebug-read, edebug-eval-defun):
+        * ffap.el (ffap-string-at-point-region, ffap-next)
+        (ffap-string-at-point, ffap-string-around)
+        (ffap-copy-string-as-kill, ffap-highlight-overlay)
+        (ffap-literally):
+        * font-lock.el (font-lock-keywords-alist)
+        (font-lock-removed-keywords-alist):
+        * help-mode.el (help-xref-symbol-regexp):
+        * info.el (Info-find-emacs-command-nodes):
+        * international/mule.el (add-to-coding-system-list):
+        * isearch.el (isearch-message-function, isearch-fail-pos):
+        * misearch.el (multi-isearch-next-buffer-function):
+        * newcomment.el (comment-box):
+        * printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
+        (pr-setting-database):
+        * progmodes/cc-fonts.el (c-font-lock-keywords-3)
+        (c++-font-lock-keywords-3, objc-font-lock-keywords-3)
+        (java-font-lock-keywords-3, idl-font-lock-keywords-3)
+        (pike-font-lock-keywords-3):
+        * progmodes/compile.el (compile):
+        * progmodes/etags.el (tags-table-files)
+        (tags-table-files-function, tags-included-tables-function):
+        * progmodes/gdb-mi.el (gdb, gdb-setup-windows)
+        (gdb-restore-windows):
+        * ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
+        (ps-n-up-filling-database):
+        * server.el (server-buffer, server-log):
+        * simple.el (newline, delete-backward-char, delete-forward-char)
+        (minibuffer-history-isearch-message, kill-line, track-eol)
+        (temporary-goal-column):
+        * textmodes/flyspell.el (flyspell-mark-duplications-flag)
+        (flyspell-default-deplacement-commands):
+        * textmodes/ispell.el (ispell-accept-output):
+        * textmodes/sgml-mode.el (html-tag-help):
+        * vc/compare-w.el (compare-ignore-whitespace)
+        (compare-ignore-case, compare-windows-dehighlight):
+        * vc/diff.el (diff):
+        * whitespace.el (whitespace-point)
+        (whitespace-font-lock-refontify, whitespace-bob-marker)
+        (whitespace-eob-marker): Fix ambiguous doc string cross-reference(s).
+
 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
+        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)