* test/indent/ruby.rb: Fix a spurious change, add more failing examples.

* trampver.texi: Update release number.

* net/tramp.el (tramp-handle-insert-file-contents): Improve handling
of BEG and END.

* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Use
`tramp-handle-insert-file-contents'.
(tramp-gvfs-handle-insert-file-contents): Remove function.

* net/tramp-sh.el (tramp-sh-handle-insert-directory): Use
`save-restriction' in order to keep markers.

* net/trampver.el: Update release number.

* alloc.c (Fmake_string): Fix last change.

emacs_read and emacs_write now use void *, not char *.

* alloc.c (valid_pointer_p) [!WINDOWSNT]: Remove now-unnecessary cast.
* sysdep.c (emacs_read, emacs_write, emacs_write_sig):
Buffer arg is now void *, not char *.  This matches plain
'read' and 'write' better, and avoids a constraint violation
on Solaris 9 with Oracle Studio.

* alloc.c (Fmake_string): For ASCII char initializer, prefer
memset to explicit loop.  Otherwise copy largest possible chunk
from initialized to uninitialized part, thus allowing the longer
memcpy runs and reducing the number of loop iterations.

* lisp/progmodes/compile.el (compilation-parse-errors):
Use compilation--put-prop.
(compilation--ensure-parse): Check compilation-multiline.

* lisp/emacs-lisp/easymenu.el (easy-menu-create-menu): Use closures.

* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Simplify, using lexical-binding.

* lisp/emacs-lisp/tq.el (tq-create): Use a closure instead of `(lambda...).

* doc/lispref/tips.texi (Comment Tips): Discourage use of triple semi-colons
for non-headings.

* lisp/progmodes/ruby-mode.el: Fix recently added tests.
(ruby-smie-grammar): Add - and +.
(ruby-smie--redundant-do-p, ruby-smie--forward-id)
(ruby-smie--backward-id): New functions.
(ruby-smie--forward-token, ruby-smie--backward-token): Use them.
(ruby-smie-rules): Handle hanging do.  Get rid of hack, not needed
any more.
* test/indent/ruby.rb: Add a few more tests; adjust some indentation.

* etc/NEWS: Mention new feature of register commands.

* register.el (register-preview-delay)
(register-preview-functions): New variables.
(register-read-with-preview, register-preview)
(register-describe-oneline): New functions.
(point-to-register, window-configuration-to-register)
(frame-configuration-to-register, jump-to-register)
(number-to-register, view-register, insert-register)
(copy-to-register, append-to-register, prepend-to-register)
(copy-rectangle-to-register): Use register-read-with-preview to
read register.

Fixes: debbugs:15525

* indent/ruby.rb: Fix a factual error.

* net/network-stream.el (network-stream-open-starttls): Don't add
--insecure if it's already present, because that gnutls-cli
rejects getting that parameter twice.

Don't force auto hide dock when hide menu changes.

(ns_update_auto_hide_menu_bar): Remove runtime check.
Don't auto hide dock unless menubar is also auto hidden.

* nsterm.m (ns_update_begin): If native fullscreen and no toolbar,
hide toolbar.
(windowDidEnterFullScreen:): If presentation options are zero,
set them here (Bug#15388).

Remove unnecessary @refill.

* test/automated/ruby-mode-tests.el: Add tests for `ruby-forward-sexp'
and `ruby-backward-sexp' that fail when `ruby-use-smie' is t.

* test/indent/ruby.rb: Two more failing examples.

* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
keyword, too.

* test/indent/ruby.rb: Fix a syntax error, add a few failing examples.

* lisp/newcomment.el (comment-use-global-state): Change default value
to t, mark obsolete.
(comment-beginning): In addition to `comment-to-syntax', check the
value of `comment-use-global-state'.

Fixes: debbugs:15251

Get Ruby's SMIE code to pass the test suite.
* lisp/progmodes/ruby-mode.el (ruby-use-smie): Change default.
(ruby-comment-column): Follow the global default, by default.
(ruby-smie-grammar): Add assignment syntax.
(ruby-smie--implicit-semi-p): No implicit semi-colon after an
open-paren, a comma, or a \.
(ruby-smie--forward-token, ruby-smie--backward-token): Handle heredocs,
and line continuations.
(ruby-smie-rules): Adjust handling of open-paren, now that it's never
followed by implicit semi-colons.  Add rule for string concatenation
and for indentation at BOB.
(ruby-forward-sexp, ruby-backward-sexp): Adjust for when smie is in use.

* lisp/emacs-lisp/smie.el (smie-next-sexp): Don't go back to pos before
calling next-sexp, since next-token may have skipped chars which
next-sexp doesn't know should be skipped!

* test/indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el.
Adjust indentation of continued line to the new SMIE behavior.

Revert 2013-10-05T02:26:39Z!dgutov@yandex.ru

`last-coding-system-used' is unreliable: it can be modified by other functions
in `after-save-hook'.

Minor doc fixes.

* nsterm.m (check_native_fs): Remove erroneous comment.

* doc/lispref/syntax.texi (Categories): Add an index for category sets.

Auto-commit of generated files.

* progmodes/octave.el (octave-send-region): Call
compilation-forget-errors.

* lisp/progmodes/ruby-mode.el (ruby-mode): Add `ruby-mode-set-encoding'
to `after-save-hook' instead of `before-save-hook', because then
we know exactly what encoding was used to write the file.
(ruby-mode-set-encoding): Use `last-coding-system-used' instead of
guessing.  Call `basic-save-buffer-1' after modifying the buffer.

New functions for finding the administrative directory in VC.

* vc/vc-svn.el (vc-svn-find-admin-dir):
* vc/vc-rcs.el (vc-rcs-find-admin-dir):
* vc/vc-mtn.el (vc-mtn-find-admin-dir):
* vc/vc-cvs.el (vc-cvs-find-admin-dir):
* vc/vc-arch.el (vc-arch-find-admin-dir): New functions.

* lisp/textmodes/css-mode.el (css-smie-rules): Toplevel's a list.
* test/automated/completion-tests.el:
* test/indent/css-mode.css: New files.

Fixes: debbugs:15467

* lisp/subr.el (read-passwd): Hide chars even when called within a context
where after-change-functions is disabled.
(set-temporary-overlay-map): Don't remove oneself from pre-command-hook
until we removed ourself from overriding-terminal-local-map.

Fixes: debbugs:15501

* progmodes/octave.el (inferior-octave-mode): Call
compilation-forget-errors.

* lisp/emacs-lisp/syntax.el (syntax-ppss): Doc fix.

In nt/gnulib.mk create <byteswap.h> from <byteswap.in.h>.

* gnulib.mk: Create <byteswap.h> from <byteswap.in.h>.

* xdisp.c (redisplay_internal): Simplify because scan_for_column now
uses find_newline instead of scan_newline and so doesn't move point.

* net/secrets.el (secrets-create-collection): Add optional
argument ALIAS.  Use proper Label keyword.  Append ALIAS as
dbus-call-method argument.  (Bug#15516)

Auto-commit of generated files.

* progmodes/octave.el (inferior-octave-error-regexp-alist)
(inferior-octave-compilation-font-lock-keywords): New variables.
(compilation-error-regexp-alist)
(compilation-mode-font-lock-keywords): Defvar to pacify compiler.
(inferior-octave-mode): Use compilation-shell-minor-mode.

Use hardware support for byteswapping on glibc x86 etc.

On Fedora 19 x86-64, the new bswap_64 needs 1 instruction,
whereas the old swap64 needed 30.
* admin/merge-gnulib (GNULIB_MODULES): Add byteswap.
* lib/byteswap.in.h, m4/byteswap.m4: New files, copied from Gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* src/fringe.c (init_fringe_bitmap) [WORDS_BIGENDIAN]:
* src/sound.c (le2hl, le2hs, be2hl) [!WINDOWSNT]:
Use byteswap.h's macros to swap bytes.
* src/lisp.h (swap16, swap32, swap64): Remove.
All uses replaced by bswap_16, bswap_32, bswap_64.

* bytecode.c (exec_byte_code): Use some more volatile variables

to work around local variables getting clobbered by longjmp.
Port to pre-C99, which doesn't allow decls after stmts.

* lisp/minibuffer.el (completion--replace): Be careful that `end' might be
a marker.

* lisp.h (eassert): Assume that COND is true when optimizing.

In other words, take on the behavior of eassert_and_assume.
This makes Emacs 0.2% smaller on my platform (Fedora 19, x86-64).
(eassert_and_assume): Remove.  All uses replaced by eassert.

Add an index for modify-syntax-entry.

* doc/lispref/syntax.texi (Syntax Flags): Add an index for comment style.

* xdisp.c (Qglyphless_char): Now static.

Auto-commit of generated files.

Add support for package signature checking.

* lisp/emacs-lisp/package.el (url-http-file-exists-p)
(epg-make-context, epg-context-set-home-directory)
(epg-verify-string, epg-context-result-for)
(epg-signature-status, epg-signature-to-string)
(epg-check-configuration, epg-configuration)
(epg-import-keys-from-file): Declare.
(package-check-signature): New user option.
(package-unsigned-archives): New user option.
(package-desc): Add `signed' field.
(package-load-descriptor): Set `signed' field if .signed file exists.
(package--archive-file-exists-p): New function.
(package--check-signature): New function.
(package-install-from-archive): Check package signature.
(package--download-one-archive): Check archive signature.
(package-delete): Remove .signed file.
(package-import-keyring): New command.
(package-refresh-contents): Import default keyring.
(package-desc-status): Add "unsigned" status.
(describe-package-1, package-menu--print-info)
(package-menu-mark-delete, package-menu--find-upgrades)
(package-menu--status-predicate): Support "unsigned" status.

* test/automated/data/package/signed/archive-contents:
* test/automated/data/package/signed/archive-contents.sig:
* test/automated/data/package/signed/signed-good-1.0.el:
* test/automated/data/package/signed/signed-good-1.0.el.sig:
* test/automated/data/package/signed/signed-bad-1.0.el:
* test/automated/data/package/signed/signed-bad-1.0.el.sig:
* test/automated/data/package/key.pub:
* test/automated/data/package/key.sec: New files.

* test/automated/package-test.el (package-test-update-listing)
(package-test-update-archives, package-test-describe-package):
Adjust to package.el change.
(package-test-signed): New test.

Merge from gnulib.

* src/conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
* src/lisp.h: Include <verify.h>, for 'assume'.

This also incorpoprates:
2013-10-02 verify: new macro 'assume'
2013-09-26 dup2, dup3: work around another cygwin crasher
2013-09-26 getdtablesize: work around cygwin issue

* eval.c (clobbered_eassert): New macro.

(internal_catch, internal_condition_case)
(internal_condition_case_1, internal_condition_case_2)
(internal_condition_case_n): Use it instead of eassert
when the argument contains locals clobbered by longjmp.
Don't use clobbered locals outside of clobbered_eassert.
(internal_lisp_condition_case): Use a volatile variable
to work around a local variable's getting clobbered.

Introduce new bytecodes for efficient catch/condition-case in lexbind.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Optimize under `condition-case' and `catch' if
byte-compile--use-old-handlers is nil.
(disassemble-offset): Handle new bytecodes.

* lisp/emacs-lisp/bytecomp.el (byte-pushcatch, byte-pushconditioncase)
(byte-pophandler): New byte codes.
(byte-goto-ops): Adjust accordingly.
(byte-compile--use-old-handlers): New var.
(byte-compile-catch): Use new byte codes depending on
byte-compile--use-old-handlers.
(byte-compile-condition-case--old): Rename from
byte-compile-condition-case.
(byte-compile-condition-case--new): New function.
(byte-compile-condition-case): New function that dispatches depending
on byte-compile--use-old-handlers.
(byte-compile-unwind-protect): Pass a function to byte-unwind-protect
when we can.

* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form): Adjust for
the new compilation scheme using the new byte-codes.

* src/alloc.c (Fgarbage_collect): Merge scans of handlerlist and catchlist,
and make them unconditional now that they're heap-allocated.

* src/bytecode.c (BYTE_CODES): Add Bpushcatch, Bpushconditioncase
and Bpophandler.
(bcall0): New function.
(exec_byte_code): Add corresponding cases.  Improve error message when
encountering an invalid byte-code.  Let Bunwind_protect accept
a function (rather than a list of expressions) as argument.

* src/eval.c (catchlist): Remove (merge with handlerlist).
(handlerlist, lisp_eval_depth): Not static any more.
(internal_catch, internal_condition_case, internal_condition_case_1)
(internal_condition_case_2, internal_condition_case_n):
Use PUSH_HANDLER.
(unwind_to_catch, Fthrow, Fsignal): Adjust to merged
handlerlist/catchlist.
(internal_lisp_condition_case): Use PUSH_HANDLER.  Adjust to new
handlerlist which can only handle a single condition-case handler at
a time.
(find_handler_clause): Simplify since we only a single branch here
any more.

* src/lisp.h (struct handler): Merge struct handler and struct catchtag.
(PUSH_HANDLER): New macro.
(catchlist): Remove.
(handlerlist): Always declare.

* lisp/subr.el (decode-char, encode-char): Use advertised-calling-convention
instead of the docstring to discourage use of the `restriction' arg.
(error): Use `declare'.
* src/charset.c (Fdecode_char, Fencode_char): Remove description of
`restriction' arg. now that it's hidden by advertised-calling-convention.

epg: doc improvement for verify functions

* epg.el (epg-verify-file): Add a comment saying that it does not
notify verification error as a return value nor a signal.
(epg-verify-string): Ditto.

* lisp/progmodes/compile.el (compilation-start): Try globbing the arg to `cd'.

Fixes: debbugs:15417

* macfont.m (macfont_draw): Use s->ybase for correct y position.

* frame.h (struct frame): Drop has_minibuffer member because...
(FRAME_HAS_MINIBUF_P): ...this macro can be implemented without it.
* frame.c (make_frame, make_minibuffer_frame): Adjust users.

Add an index for the table of syntax classes.

* doc/lispref/syntax.texi (Syntax Class Table): Add an index for syntax class table.

Sync with Tramp 2.2.8.

* tramp.texi (External packages): Use `non-essential'.
* trampver.texi: Update release number.

Sync with Tramp 2.2.8.

* net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers):
* net/tramp-cache.el (tramp-cache-print): Use `tramp-compat-funcall'.
* net/trampver.el: Update release number.

* window.h (struct window): Prefer enum text_cursor_kinds to int
for phys_cursor_type member.  Move the latter, phys_cursor_width,
phys_cursor_ascent and phys_cursor_height under HAVE_WINDOW_SYSTEM.
* window.c (replace_window, make_window): Adjust users.

* fringe.c (toplevel): Do not use HAVE_WINDOW_SYSTEM because
this module is never compiled otherwise.

* macfont.m (macfont_draw): Use CGRectMake rather than NSMakeRect
  (Bug#15500).

* themes/leuven-theme.el: Add Commentary and some headers, update
  face definitions, add autoload block which is used when
  distributed separately from Emacs.

* lisp/term/ns-win.el (ns-initialize-window-system): Set locale-coding-system
and default-process-coding-system for darwin only.

* lisp/emacs-lisp/package.el (package-desc): Simplify.

Fixes: debbugs:15495

* lisp/vc/vc-git.el (vc-git-grep): Disable pager.

Auto-commit of loaddefs files.

* lisp/emacs-lisp/package.el (package-buffer-info, describe-package-1):
Use :url instead of :homepage, as per
http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00622.html

* test/automated/package-test.el: Update all cases to use :url instead
of :homepage.

* test/automated/package-x-test.el
(package-x-test--single-archive-entry-1-3): Same.

* lisp/newcomment.el (comment-beginning): When `comment-use-syntax' is
non-nil, use `syntax-ppss'.

Fixes: debbugs:15251

* progmodes/octave.el (inferior-octave-startup-file): Prefer
~/.emacs.d/init_octave.m.

* lisp/emacs-lisp/package-x.el (package-upload-buffer-internal): Pass
`extras' slot from `package-desc' to `package-make-ac-desc'.

* lisp/emacs-lisp/package.el (package-desc-from-define): Accept
additional arguments as plist, convert it to an alist and store it
in the `extras' slot.
(package-generate-description-file): Convert extras alist back to
plist and append to the `define-package' form arguments.
(package--alist-to-plist): New function.
(package--ac-desc): Add `extras' slot.
(package--add-to-archive-contents): Check if the archive-contents
vector is long enough, and if it is, pass its `extras' slot value
to `package-desc-create'.
(package-buffer-info): Call `lm-homepage', pass the returned value
to `package-desc-from-define'.
(describe-package-1): Render the homepage button.

* test/automated/package-test.el (simple-single-desc-1-4): Remove, it
was unused.
(simple-single-desc): Expect :homepage property.
(multi-file-desc): Same.
(with-package-test): Do not save previous `default-directory'
value, let-bind the var instead.
(package-test-install-single): Expect :homepage property in the
generated pkg file.
(package-test-describe-package): Expect Homepage button.
(package-test-describe-non-installed-package)
(package-test-describe-non-installed-multi-file-package): Same.
(package-test-describe-not-installed-package): Remove, it was a
duplicate.

* test/automated/package-x-test.el
(package-x-test--single-archive-entry-1-3): Expect :homepage
property.
(package-x-test--single-archive-entry-1-4): Expect nil extras slot.

* test/automated/data/package/archive-contents: Add :homepage
properties to `simple-single' and `multi-file'.

* test/automated/data/package/simple-single-1.3.el: Add URL header.

Fixes: debbugs:13291

* term/ns-win.el (ns-initialize-window-system): Set locale-coding-system
and default-process-coding-system to utf-8-unix.

Fixes: debbugs:15402

Fix bug #15484 with link error in the --without-x configuration.

 src/xdisp.c (get_next_display_element): Don't call face_for_font in
 a build configured --without-x.

* window.c (calc_absolute_offset): #elif should be #elif defined.

* frame.c (delete_frame): Block/unblock input to overcome race
condition.

Fixes: debbugs:15475

In delete_frame record selected frame only after calling Qdelete_frame_functions (Bug#15477).

* frame.c (delete_frame): Record selected frame only after
calling Qdelete_frame_functions (Bug#15477).

Refine documentation of `looking-back'.

* lisp/subr.el (looking-back): Do not recommend using looking-back.  (bug#5689)
* doc/lispref/searching.texi (Regexp Search): Refine.

Remove unnecessary @refill.

* url/url-util.el (url-pretty-length): Make obsolete and all uses
changed to file-size-human-readable.

Remove an unnecessary FIXME.

Fix indentation/fontification of Java enum with "implements".

* progmodes/cc-langs.el (c-postfix-decl-spec-key): New variable, a
regexp which matches "implements", etc., in Java.
* progmodes/cc-engine.el (c-inside-bracelist-p): Check for extra
specifier clauses coming after "enum".
* progmodes/cc-fonts.el (c-font-lock-declarations)
(c-font-lock-enum-tail): Check for extra specifier clauses coming
after "enum".

Pick up default selection color on OSX when user defaults are not set.

* lisp/faces.el (region): Change ns_selection_color to
ns_selection_fg_color, add ns_selection_bg_color.

* src/nsterm.h (NS_SELECTION_BG_COLOR_DEFAULT): Renamed from
NS_SELECTION_COLOR_DEFAULT.
(NS_SELECTION_FG_COLOR_DEFAULT): New.

* src/nsterm.m (ns_selection_color): Remove.
(ns_get_color): Check for ns_selection_(fg|bg)_color using
NSColor selectedText(Background)Color.  Only for COCOA.
(ns_term_init): Remove assignment of ns_selection_color, logic
moved to ns_get_color.

Fix compilation under GLYPH_DEBUG, broken by conditional tool_bar_window.

 src/xdisp.c (Fdump_tool_bar_row): Ifdef away the body if 'struct
 frame' does not have the tool_bar_window member.

* progmodes/octave.el (inferior-octave-completion-table)
(inferior-octave-completion-at-point): Minor tweaks.

Rename lookup-words to ispell-lookup-words
(ispell-complete-word, ispell-command-loop): All uses changed.

* cedet/semantic/texi.el (semantic-analyze-possible-completions): Use
ispell-lookup-words instead.

Fixes: debbugs:15460

* lisp/progmodes/octave.el (octave-mode-map): Bind octave-send-buffer.
(octave-mode-menu): Add octave-send-buffer.
(octave-send-buffer): New function.

* lisp/progmodes/octave.el (octave-mode-map): Add key binding for
octave-lookfor.
(octave-mode-menu): Add octave-lookfor.
(inferior-octave-mode-map, octave-help-mode-map): Bind C-ha to
octave-lookfor.
(octave-lookfor): New function.

Fix typo.

Comment.

* lisp/emacs-lisp/cl-macs.el:
(cl--loop-destr-temps): Remove.
(cl--loop-iterator-function): Rename from cl--loop-map-form and change
its convention.
(cl--loop-set-iterator-function): New function.
(cl-loop): Adjust accordingly, so as not to use cl-subst.
(cl--parse-loop-clause): Adjust all uses of cl--loop-map-form.
Bind `it' with `let' instead of substituting it with `cl-subst'.
(cl--unused-var-p): New function.
(cl--loop-let): Don't use the cl--loop-destr-temps hack any more.
Eliminate some unused variable warnings.

Fixes: debbugs:15326

* doc-view.el (doc-view-scale-reset): Rename from
`doc-view-reset-zoom-level'.
(doc-view-scale-adjust): New command.
(doc-view-mode-map): Remap `text-scale-adjust' bindings to
`doc-view-scale-adjust'.

* doc-view.el (doc-view-reset-zoom-level): New command.
(doc-view-mode-map): Remap text-scale-adjust bindings to doc-view
zoom commands (bug#15466).

* doc/emacs/dired.texi (Flagging Many Files): Use @emph instead of @strong.

merge turnk

international/quail.el (quail-help): Make it not a command.

* doc/emacs/emacs.texi (Intro): Minor cleanup.

Signal error when reading an empty byte-code object (Bug#15405)
* lread.c (read1): signal error
* alloc.c (make_byte_code): eassert header size
(sweep_vectors): change an int to size_t

* minibuffer.el (completion-all-sorted-completions): Make args
optional as they are.

* emacs-lisp/cl-macs.el (cl-type-spec): Tell edebug what type
specs are and that they're not evaluated.