merge trunk

diff --cc lisp/ChangeLog
index f4508b7bbceed30cda846f26459e4429b1b0b948,ec59ce1fb6629b1ae1aa0b2161950ebef3960e60..1abd0482ec60e35a463c3d12b567636f7666e17a
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,39 +1,45 @@@
 +2013-10-13  Kenichi Handa  <handa@gnu.org>
 +
 +      * international/mule-cmds.el (select-safe-coding-system): Remove a
 +      superfluous condition in chekcing whether a coding system is safe
 +      or not.
 +
+ 2013-10-13  Oleh Krehel  <ohwoeowho@gmail.com>
+ 
+       * replace.el (how-many): Fix rstart and !rend case.  (Bug#15589)
+ 
+ 2013-10-13  Andreas Politz  <politza@hochschule-trier.de>
+ 
+       * progmodes/sql.el (sql-add-product): Fix paren typo.  (Bug#15435)
+ 
+ 2013-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * menu-bar.el (menu-bar-update-buffers):
+       Unify Buffers menu prompt string.  (Bug#15576)
+ 
+       * face-remap.el (text-scale-adjust): Doc fix.  (Bug#15434)
+ 
+       * emacs-lisp/authors.el (authors-aliases, authors-ignored-files):
+       Add some entries.
+       (authors-fixed-entries): Use accented form of name.
+ 
+ 2013-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * progmodes/ruby-mode.el (ruby-smie-grammar): Add rule for paren-free
+       method calls (bug#bug#15594).
+       (ruby-smie--args-separator-p): New function.
+       (ruby-smie--forward-token, ruby-smie--backward-token): Use it to
+       recognize paren-free method calls.
+ 
+       * isearch.el (isearch-pre-command-hook): Don't build in knowledge about
+       internals of universal-argument.
+ 
+ 2013-10-11  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit.
+       Bind all menu-bar sequences to tty-menu-exit -- this pops down a
+       dropped menu on second mouse click on the menu bar.
+ 
  2013-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * progmodes/sh-script.el: Provide simpl(e|istic) completion.