Cherry-pick a fix from trunk; fix level handling in bidi_resolve_brackets.
Fix a typo in a comment.
	* files.el (auto-mode-alist): Use javascript-mode for .jsm
	(bug #18719).
Trigger showing when point is in the "periphery" of a line or just
inside a paren.
paren.el (show-paren-style, show-paren-delay)
(show-paren-priority, show-paren-ring-bell-on-mismatch): Remove
superfluous :group specifications.
(show-paren-when-point-inside-paren)
(show-paren-when-point-in-periphery): New customizable variables.
(show-paren-highlight-openparen): Make into a defcustom.
(show-paren--unescaped-p, show-paren--categorize-paren)
(show-paren--locate-near-paren): New defuns.
(show-paren--default): Refaactor and trigger on more paren
positions.
(show-paren-function): Small consequential changes.
lisp/gnus/gnus-icalendar.el: Support vcal format timezones
lisp/gnus/message.el (message-insert-signature): Make signature respect format=flowed
Bump version to 24.4
Regenerate ldefs-boot and AUTHORS
* lisp/emacs-lisp/eieio-base.el: Use lexical-binding and cl-lib.
* lisp/emacs-lisp/eieio-core.el: Use lexical-binding and cl-lib.
(list-of): New type.
(eieio--typep): Remove.
(eieio-perform-slot-validation): Use cl-typep instead.
* lisp/emacs-lisp/eieio.el: Use lexical-binding drop non-GV fallback.
(defclass, defgeneric, defmethod): Add doc-string position.
(with-slots): Require cl-lib.
* lisp/emacs-lisp/cl-macs.el (cl--make-type-test): Avoid ((lambda ..) ..).
Fix display on X of 1-pixel R2L characters.

 src/xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
 1-pixel R2L characters.
 Reported by Dmitry Antipov <dmantipov@yandex.ru>, see
 http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html.
tildify.el (tildify--pick-alist-entry): rename from tildify-mode-alist

tildify-mode-alist does not really describe what the functino does so
rename it to tildify--pick-alist-entry.  This also makes it clear that
the function is an internal one.
Fix lisp/ChangeLog entry added in rev. 118139
Regenerate ldefs-boot
Merge from emacs-24; up to r117592
* configure.ac: Simplify OS X $canonical tests.

* etc/NEWS: Clarify OS X entries.
Mention new whitespace-mode option: big-indent.

* etc/NEWS: Mention new whitespace-mode option: big-indent.
Add a 'big-indent style to `whitespace-mode'.

* lisp/whitespace.el (whitespace-style, whitespace-big-indent)
(whitespace-big-indent-regexp, whitespace-style-value-list)
(whitespace-toggle-option-alist, whitespace-interactive-char)
(whitespace-toggle-options)
(global-whitespace-toggle-options, whitespace-help-text)
(whitespace-style-face-p, whitespace-color-on): Add a 'big-indent
style to `whitespace-mode' to indicate that the line indentation
is too deep.  By default, 32 SPACEs or four TABs are considered
too many but `whitespace-big-indent-regexp' can be configured.
net/gnutls.el: pass correct data to `gnutls-boot'.

* net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
correct data to `gnutls-boot'.
Reported by Toke Høiland-Jørgensen <toke@toke.dk>.
Ensure 8-byte stack alignment in w32select's callback.

 src/w32select.c (owner_callback): Mark with ALIGN_STACK attribute.
Fix processing of brackets in isolates and crash in w32select.c.
Check that a "macro" found near point-min isn't a ## operator.  Fixes
bug #18749.
progmodes/cc-engine.el (c-macro-is-genuine-p): New function.
(c-beginning-of-macro): Use the above new function.