* net/tramp-adb.el (tramp-adb-get-ls-command): New defun.  Suppress
coloring, if possible (required for BusyBox based systems like
CynagenMod).
(tramp-adb-handle-file-attributes)
(tramp-adb-handle-insert-directory)
(tramp-adb-handle-file-name-all-completions): Use it.
(tramp-adb-get-toolbox): New defun.  Check for remote shell
implementation (BusyBox or Toolbox).
* lisp/progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class",
  "module" and "def" to have indentation before them.  Regression
  from 109911 (see the new test).

* test/automated/ruby-mode-tests.el
  (ruby-indent-after-block-in-continued-expression): New test.
* lisp/progmodes/ruby-mode.el (auto-mode-alist): `purecopy' the
Rakefile regexp.
(auto-mode-alist): Associate .gemspec files with ruby-mode
(https://bugs.ruby-lang.org/issues/5453).
Merge changes made in Gnus master

2012-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
* mml2015.el (mml2015-epg-key-image): Use mm-set-buffer-multibyte.

2012-12-25  Adam Sjøgren  <asjo@koldfront.dk>
* mml2015.el (mml2015-epg-key-image): use --attribute-fd rather than
  temporary file to get PGP key image. Pass no-show-photos when extracting
  image to avoid having it pop up twice.

2012-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
 * gnus-art.el (gnus-article-treat-types): Include text/html as parts
 eligible for treatment.
Cleanup comint-postoutput-scroll-to-bottom (Bug#13248).

* comint.el (comint-adjust-window-point): New function.
(comint-postoutput-scroll-to-bottom): Call
comint-adjust-window-point (Bug#13248).
Document cygwin-convert-file-name-{to|from}-windows

* doc/lispref/files.texi (File Names): Mention Cygwin conversion functions.

* src/cygw32.c (Fcygwin_convert_file_name_to_windows)
(Fcygwin_convert_file_name_from_windows): Doc fixes.

* etc/NEWS: Related markup.
* plstore.el (plstore-passphrase-callback-function): Fix file/buffer typo.
Merge from emacs-24; up to r111080
ChangeLog fix
remove dupe, mark tiny change by author without assignment
http://orgmode.org/w/?p=org-mode.git;a=patch;h=ae87b6e5f2a143bb69ab512515dc85b41ff0cd1e
Auto-commit of generated files.
lisp/gnus/mml2015.el (mml2015-epg-key-image): separate attribute stream from stderr
lisp/gnus/gnus-msg.el (gnus-summary-resend-message): Don't bug out on non-string posting styles (bug#13285)
* lisp/progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger
continuations, see <http://stackoverflow.com/questions/3582436>.
Fix bug #13277 with TTY cursor positioning in a line with overlay arrow.

 src/xdisp.c (set_cursor_from_row): Don't confuse a truncation or
 continuation glyph on a TTY with an indication of an empty line.
 src/dispextern.h: Improve commentary to glyph->charpos and
 glyph->object.
configure.ac fix for double quotes in configure command-line

* configure.ac (emacs_config_options): New.
Use $@ rather than undocumented $ac_configure_args.
Replace any embedded double quotes.
* net/tramp.el (tramp-handle-file-accessible-directory-p): New defun.

* net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add handler
for `file-accessible-directory-p'.  (Bug#13275)
fix last patch
* lisp/frame.el (frame-maximization-style): Remove user option.
(cycle-frame-maximized): Remove function.
(toggle-frame-maximized): Rewrite and bind to M-<f10>.
(toggle-frame-fullscreen): New command bound to <f11> instead of
`toggle-frame-maximized'.
http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00703.html
* lisp/info.el (Info-file-completions): New variable.
(Info-read-node-name-1): Complete node names in the Info file
when a file name is given.  Call `Info-build-node-completions'
with a file name.
(Info-build-node-completions): Add new arg `file'.  When it is
non-nil, visit it in a temporary buffer and cache its completions in
`Info-current-file-completions'.  Move most of the function body to
`Info-build-node-completions-1'.
(Info-build-node-completions-1): New function with the body from
`Info-build-node-completions'.
Gnus: Avoid `Invalid face reference: nil' messages