merge from trunk

1 files changed, 32 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7984dc214c4..beeb53d5c31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
+2013-09-12  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
+        (vc-compilation-mode): Declare.
+        (vc-bzr-pull): Require vc-dispatcher.
+        * vc/vc-git.el (vc-compilation-mode): Declare.
+        (vc-git-pull): Require vc-dispatcher.
+
+        * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Declare.
+
+        * progmodes/octave.el (help-button-action): Declare.
+
+        * shell.el (shell-directory-tracker): Output error as a message
+        rather than just returning it as a string.
+        (shell-process-pushd): Remove useless use of message.
+
+        * dframe.el (dframe-timer-fn):
+        * files.el (dir-locals-read-from-file):
+        * mpc.el (mpc--status-timer-run, mpc--status-idle-timer-run)
+        (mpc-format):
+        * reveal.el (reveal-post-command):
+        * saveplace.el (load-save-place-alist-from-file):
+        * shell.el (shell-resync-dirs):
+        * w32-common-fns.el (x-get-selection-value):
+        * emacs-lisp/copyright.el (copyright-find-copyright):
+        * emacs-lisp/eldoc.el (eldoc-print-current-symbol-info):
+        * emulation/tpu-edt.el (tpu-copy-keyfile):
+        * play/bubbles.el (bubbles--mark-neighbourhood):
+        * progmodes/executable.el
+        (executable-make-buffer-file-executable-if-script-p):
+        * term/pc-win.el (x-get-selection-value): Use with-demoted-errors.
+
 2013-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         Cleanup Eshell to rely less on dynamic scoping.