merge trunk

diff --cc lisp/ChangeLog
index 401dc6a1c7ed390b2e5598abe95aa08196634298,f59908ef353b232127467b604fd57e8abeb8280a..795dec24bf196c25d2c81573ddbccbeb3469d783
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,58 +1,63 @@@
 +2014-01-10  K. Handa  <handa@gnu.org>
 +
 +      * mail/rmail.el (rmail-get-coding-system): Check
 +      rmail-get-coding-function before "funcall"ing it.
 +
+ 2014-01-10  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs-lisp/authors.el (authors-fixed-entries):
+       Update for files that no longer exist.
+ 
+ 2014-01-10  Eric S. Raymond  <esr@thyrsus.com>
+ 
+       * version.el (emacs-bzr-get-version): Restore compatibilty with
+       24.3 (Tested).
+ 
+ 2014-01-10  Bozhidar Batsov  <bozhidar@batsov.com>
+ 
+       * progmodes/ruby-mode.el (auto-mode-alist): Add .podspec
+       and Podfile.
+ 
+ 2014-01-10  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * emacs-lisp/authors.el (authors-fixed-entries): Update my entry.
+ 
+ 2014-01-10  Chong Yidong  <cyd@gnu.org>
+ 
+       * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is
+       loaded.
+ 
+ 2014-01-10  Anders Lindgren  <andlind@gmail.com>
+ 
+       * follow.el (follow-cache-command-list): Include right-char and
+       left-char.
+ 
+ 2014-01-10  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Spelling fixes.
+       * mail/unrmail.el (unrmail-mbox-format): Choice is mboxo, not mboxro.
+       * woman.el (woman-mark-horizontal-position):
+       Rename from woman-mark-horizonal-position.  Use changed.
+ 
+ 2014-01-10  Glenn Morris  <rgm@gnu.org>
+ 
+       * info.el (info-initialize): If running uninstalled, ensure our
+       own info files are always found first, even if INFOPATH is set.
+ 
+       * help.el (view-order-manuals): Open emacs.info rather than ORDERS.
+ 
+ 2014-01-09  David Engster  <deng@randomsample.de>
+ 
+       * emacs-lisp/eieio-custom.el:
+       * emacs-lisp/eieio-opt.el: Set generated autoload file to
+       'eieio.el'.  This was accidentally removed in 2012-10-01T18:10:29Z!cyd@gnu.org.
+       * emacs-lisp/eieio.el: Regenerate autoloads.
+ 
+ 2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
+ 
+       * vc/vc-git.el (vc-git-print-log): Add --follow option to command,
+       following renames.  (Bug#8756)
+ 
  2014-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * simple.el (deactivate-mark, activate-mark): Force-mode-line-update