* lisp/progmodes/grep.el: Use lexical-binding.
(grep-expand-template): Pass explicit lexical env to `eval'.
(zrgrep): Let-bind grep-find-template explicitly.

* lisp/emacs-lisp/cl-lib.el (current-case-table): Remove setter.
* lisp/leim/quail/sisheng.el (sisheng-list): Use with-case-table.

Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org

Regenerate ldefs-boot.el

lisp/ChangeLog: Fix Matthias Dahl's address.

Fix last commit.

Remove deprecated optional argument of make-face.

 lisp/faces.el (make-face): Remove deprecated optional argument. The
 conditional application of X resources is handled directly by
 make-face-x-resource-internal since Emacs 24.4.
 (make-empty-face): Don't pass optional argument to make-face.

Deprecate optional argument of make-face.

 lisp/faces.el (make-face): Deprecate optional argument as it is no
 longer needed/used since the conditional X resources handling
 has been pushed down to make-face-x-resource-internal itself.
 (make-empty-face): Don't pass optional argument to make-face.

Fix bug #17244 with line-move-visual when display string covers a lot of text.

 src/xdisp.c (move_it_by_lines): If a large portion of buffer text is
 covered by a display string that ends in a newline, and that cases
 going back by DVPOS lines to hit the search limit, lift the limit
 and go back until DVPOS is reached.
 src/indent.c (Fvertical_motion): Handle correctly the case when the
 display string is preceded by an empty line.

Set category of Coptic characters be 'g' (Greek).

Fix bug #17243 with case table entries for Coptic letters

 lisp/international/characters.el <standard-case-table>: Add entries
 for letters from the Coptic block u+2C80-u+2CFF.  (Bug#17243)

Don't break emacs <= 24.3 just yet

* progmodes/octave.el (completion-table-with-cache): Define if not
available.
(octave-goto-function-definition)
(octave-sync-function-file-names)
(octave-find-definition-default-filename): Backquote upattern for
compatibility.

* net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file
name twice due to backticks.  (Bug#17238)

src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant.

 src/w32.c (sys_umask) <WRITE_USER>: Remove redundant constant, and
 use S_IWRITE instead.

Doc fix for x-win-suspend-error

* lisp/term/w32-win.el (x-win-suspend-error):
* lisp/term/x-win.el (x-win-suspend-error): Sync docs.

Avoid EMACSDATA in user environment interfering with building

* admin/grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
* leim/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
* lisp/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
* test/automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
Unexport.

Fixes: debbugs:16429

Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

* make-dist: Distribute lib-src/update-game-score.exe.manifest.

* make-dist: Do not distribute generated admin/grammars/Makefile.

Fix for some etc/refcards encoding issues

* etc/refcards/cs-dired-ref.tex, etc/refcards/cs-refcard.tex:
* etc/refcards/cs-survival.tex, etc/refcards/sk-dired-ref.tex:
* etc/refcards/sk-refcard.tex, etc/refcards/sk-survival.tex:
Input "utf8off", which seems to be needed.

Bump version to 24.3.90; regenerate AUTHORS

* src/keyboard.c (Fopen_dribble_file): Make file private.

Fixes: debbugs:17187

* lisp/emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):
Remove left-over code.

* lisp/newcomment.el (comment-indent-new-line): Sink code where it's used.
Reuse the previous comment's indentation unconditionally if it's on its
own line.

ChangeLog fixes

Ediff's overlay priorities cause more trouble than they solve.
* lisp/vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
(ediff-highest-priority): Remove function.
* lisp/vc/ediff-util.el (ediff-highlight-diff-in-one-buffer):
* lisp/vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer)
(ediff-set-fine-diff-properties-in-one-buffer): Don't mess with
overlay priorities.

Fixes: debbugs:17234

Spelling fixes.

* automated/electric-tests.el: Fix spelling error in test name.
(whitespace-skipping-for-quotes-not-outside):
Rename from whitespace-skipping-for-quotes-not-ouside.

* lisp/progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format
entry; use symbol boundaries to avoid mis-matches.

* net/tramp.el (tramp-file-name-handler)
(tramp-completion-file-name-handler): Avoid recursive loading.

* net/tramp-sh.el (tramp-make-copy-program-file-name):
Quote result also locally.

Increase BASE_PURESIZE

Revert most of the recent change involving manifests on Cygwin.  (Bug#17176)

* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
* nt/emacs.rc: Revert last change.
* src/Makefile.in (EMACS_MANIFEST): Revert last change.

Make up-list and backward-up-list get out of more spots

Tweak regex from last change

New command rcirc-cmd-reconnect

* net/rcirc.el (rcirc-connection-info): New variable.
(rcirc-connect): Use it to store connection info.
(rcirc-buffer-process): Avoid get-buffer-process which returns nil
for killed process.
(rcirc-cmd-reconnect): New command.
(rcirc-mode, set-rcirc-encode-coding-system)
(set-rcirc-decode-coding-system, rcirc-connect): Use setq-local.

Fixes: debbugs:17045

* src/keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local.

Make cl-indent work better for elisp

Merge from emacs-24; up to 2014-04-02T16:17:08Z!dmantipov@yandex.ru

Fix python-triple-quote-pairing test

* test/automated/python-tests.el (python-triple-quote-pairing):
Enable/disable electric-pair-mode as needed.

* src/insdel.c (prepare_to_modify_buffer_1): Cancel lock-file checks and
region handling (and don't call signal_before_change) if
inhibit_modification_hooks is set.
(signal_before_change): Don't check inhibit_modification_hooks any more.
* lisp/subr.el (with-silent-modifications): Don't bind deactivate-mark,
buffer-file-name, and buffer-file-truename any more.

* electric-tests.el (electric-pair-backspace-1): Replace deleted function.

Highlight more Module methods

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more
Module methods.

Fixes: debbugs:17216

* lisp/help.el (describe-bindings): Fix buffer handling.
(describe-bindings-internal): Mark obsolete.

Fixes: debbugs:17210

Correct merge

More GC assertions

Rearrange pointer logging

Tweak completion documentation

Use lexical-binding and require cl-lib

* net/rcirc.el (rcirc, rcirc-handler-ctcp-KEEPALIVE)
(rcirc-handler-generic, rcirc-fill-paragraph)
(rcirc-format-response-string, rcirc-target-buffer)
(rcirc-last-line, rcirc-record-activity, rcirc-split-activity)
(rcirc-activity-string, rcirc-make-trees, rcirc-cmd-ctcp)
(rcirc-ctcp-sender-PING, rcirc-browse-url)
(rcirc-markup-timestamp, rcirc-markup-attributes)
(rcirc-markup-my-nick, rcirc-markup-urls)
(rcirc-markup-bright-nicks, rcirc-markup-fill)
(rcirc-check-auth-status, rcirc-handler-WALLOPS)
(rcirc-handler-JOIN, rcirc-handler-PART-or-KICK)
(rcirc-handler-PART, rcirc-handler-KICK, rcirc-handler-QUIT)
(rcirc-handler-NICK, rcirc-handler-PING, rcirc-handler-PONG)
(rcirc-handler-TOPIC, rcirc-handler-301, rcirc-handler-317)
(rcirc-handler-332, rcirc-handler-333, rcirc-handler-477)
(rcirc-handler-MODE, rcirc-handler-353, rcirc-handler-366)
(rcirc-authenticate, rcirc-handler-INVITE, rcirc-handler-ERROR)
(rcirc-handler-ctcp-VERSION, rcirc-handler-ctcp-TIME)
(rcirc-handler-CTCP-response): Fix unused arguments warnings and
use cl-lib.

ChangeLog fixes

Merged entries get today's date.
May as well combine consecutive separate entries by same author into one.
Backported entries should not appear twice.

ChangeLog fix (no need to merge to trunk)

Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu

* alloc.c: Simplify by removing use of HAVE_EXECINFO_H.

We have a substitute execinfo.h on hosts that lack it.
(suspicious_free_history): Make it EXTERNALLY_VISIBLE so it
isn't optimized away.

* src/alloc.c: Keep track of symbols referenced from pure space (bug#17168).
(symbol_block_pinned): New var.
(Fmake_symbol): Initialize `pinned'.
(purecopy): New function, extracted from Fpurecopy.  Mark symbols as
pinned and signal an error for un-purifiable objects.
(pure_cons): Use it.
(Fpurecopy): Use it, except for objects that can't be purified.
(mark_pinned_symbols): New function.
(Fgarbage_collect): Use it.
(gc_sweep): Remove hack made unnecessary.
* src/lisp.h (struct Lisp_Symbol): New bitfield `pinned'.

Auto-commit of loaddefs files.

Improve on previous quote autopairing change

Backported from trunk 2014-04-04T23:31:02Z!joaotavora@gmail.com

* lisp/elec-pair.el:
(electric-pair--syntax-ppss): When inside comments parse from
comment beginning.
(electric-pair--balance-info): Fix typo in comment.
(electric-pair--in-unterminated-string-p): Delete.
(electric-pair--unbalanced-strings-p): New function.
(electric-pair-string-bound-function): New var.
(electric-pair-inhibit-if-helps-balance): Decide quote pairing
according to `electric-pair--in-unterminated-string-p'

* test/automated/electric-tests.el (define-electric-pair-test): Don't
overtest..
(inhibit-in-mismatched-string-inside-ruby-comments): New test.
(inhibit-in-mismatched-string-inside-c-comments): New test.

Inhibit quote autopairing more frequently

Backported from trunk 2014-04-02T09:59:06Z!joaotavora@gmail.com

* lisp/elec-pair.el (electric-pair-inhibit-if-helps-balance): Inhibit
quote pairing if point-max is inside an unterminated string.
(electric-pair--looking-at-unterminated-string-p):
Delete.
(electric-pair--in-unterminated-string-p): New function.

* test/automated/electric-tests.el (inhibit-if-strings-mismatched):
New test, change from `inhibit-only-of-next-is-mismatched'.

* lisp/shell.el (shell-directory-tracker): Go back to just ignoring failures.

Fixes: debbugs:17159

lisp/ChangeLog, src/ChangeLog: Fix typos.

ChangeLog fix

Fix electric-pair-delete-adjacent-pairs in modes binding backspace.

* lisp/elec-pair.el (electric-pair-backward-delete-char): Delete.
(electric-pair-backward-delete-char-untabify): Delete.
(electric-pair-mode-map): Bind backspace to a menu item filtering
a new `electric-pair-delete-pair' command.
(electric-pair-delete-pair): New command.

Fixes: debbugs:16981

Fix triple-quoting electricity in python-mode

* lisp/progmodes/python.el (python-electric-pair-string-delimiter): Fix
triple-quoting electricity.

* test/automated/python-tests.el (python-triple-quote-pairing): New test.
(python-syntax-after-python-backspace): New test.

Fixes: debbugs:17192

Fix electric-pair-skip-whitespace with quotes in text-mode

* lisp/elec-pair.el (electric-pair-post-self-insert-function): Don't
skip whitespace for quote syntax when `electric-pair-text-pairs'
and `electric-pair-pairs' were used.

* test/automated/electric-tests.el (electric-pair-define-test-form):
More readable test docstrings.
(whitespace-skipping-for-quotes-not-ouside)
(whitespace-skipping-for-quotes-only-inside)
(whitespace-skipping-not-without-proper-syntax):

Fixes: debbugs:17183

* lisp/gnus/gnus-srvr.el (gnus-tmp-how, gnus-tmp-name, gnus-tmp-where)
(gnus-tmp-status, gnus-tmp-agent, gnus-tmp-cloud)
(gnus-tmp-news-server, gnus-tmp-news-method, gnus-tmp-user-defined):
Silence compiler warnings.
(gnus-server-insert-server-line): Don't use dyn-bind var as argument.

* lisp/dired-aux.el (dired-file-set-difference): Use lexical-scoping.

src/bidi.c: Describe the design of reordering engine in the commentary.

Fix bug #17199 with incorrect character produced by ipa-x-sampa IM.

 lisp/leim/quail/ipa.el (ipa-x-sampa): Fix the character produced for "<F>".

* lisp/mpc.el (mpc--status-timer-run): Disable timer if not displayed.
(mpc--status-idle-timer-run): Use mpc--status-timer-run.

Prefer 'ARRAYELTS (x)' to 'sizeof x / sizeof *x'.

* alloc.c (memory_full):
* charset.c (syms_of_charset):
* doc.c (Fsnarf_documentation):
* emacs.c (main):
* font.c (BUILD_STYLE_TABLE):
* keyboard.c (make_lispy_event):
* profiler.c (setup_cpu_timer):
* xgselect.c (xg_select):
* xterm.c (record_event, STORE_KEYSYM_FOR_DEBUG):
Use ARRAYELTS.
* font.c (FONT_PROPERTY_TABLE_SIZE): Remove.
Replace the only use with ARRAYELTS (font_property_table).
* xfaces.c (DIM): Remove.  All uses replaced by ARRAYELTS.

ChangeLog fix

Related entries do not get separated by blank lines (per standards.info).
Use form from admin/notes/changelogs for repeated items.

Minor doc updates related to dribble files

* doc/emacs/trouble.texi (Checklist):
* doc/lispref/os.texi (Recording Input): Dribble files may contain passwords.

* lisp/help.el (view-lossage): Doc tweak.

* src/keyboard.c (Fopen_dribble_file): Doc tweak.

Auto-commit of loaddefs files.

Fix bug #16434 with handling the -rv command-line option.

 lisp/faces.el (make-face-x-resource-internal): Do nothing when
 inhibit-x-resources is non-nil.  Don't touch the default face if
 reversed video is given--as was done in previous versions of Emacs.
 (face-set-after-frame-default): Don't call
 make-face-x-resource-internal here.

Fix bug #16378 with mishandling of empty faces.

 lisp/faces.el (face-spec-choose): Accept additional optional argument,
 whose value is returned if no matching attributes are found.
 (face-spec-recalc): Use the new optional argument when calling
 face-spec-choose.

Fix bug #16694 with theme face precedence.

 lisp/faces.el (face-spec-recalc): Call make-face-x-resource-internal
 only when inhibit-x-resources is nil, and do that earlier in the
 function.  Doc fix.

* emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
define-compilation-mode.

Improve on previous quote autopairing change

* lisp/elec-pair.el:
(electric-pair--syntax-ppss): When inside comments parse from
comment beginning.
(electric-pair--balance-info): Fix typo in comment.
(electric-pair--in-unterminated-string-p): Delete.
(electric-pair--unbalanced-strings-p): New function.
(electric-pair-string-bound-function): New var.
(electric-pair-inhibit-if-helps-balance): Decide quote pairing
according to `electric-pair--in-unterminated-string-p'

* test/automated/electric-tests.el (define-electric-pair-test): Don't
overtest..
(inhibit-in-mismatched-string-inside-ruby-comments): New test.
(inhibit-in-mismatched-string-inside-c-comments): New test.

* lisp/textmodes/reftex-parse.el (reftex--index-tags): Rename `index-tags'.
Move declaration before first use.
(reftex-move-to-next-arg): Silence compiler warning.

Fix bug#16090.

* lisp/doc-view.el (doc-view-bookmark-jump): Use
`bookmark-after-jump-hook' to jump to the right page after the
buffer is shown in a window.

* lisp/erc/erc.el (erc-invite-only-mode, erc-toggle-channel-mode): Simplify.
(erc-load-script): Tighten a regexp.

src/buffer.h, src/frame.h: Clarify doc of optimization variables.

Backport from trunk.
       * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
is nil.  If waiting for toolbar to complete, force a redraw.
(free_frame_tool_bar): Set wait_for_tool_bar = NO

       * nsterm.h (EmacsView): Add wait_for_tool_bar.

* nsterm.m (updateFrameSize:): If waiting for the tool bar and tool
       bar is zero height, just return (Bug#16976).
       (initFrameFromEmacs:): Initialize wait_for_tool_bar.

src/keyboard.c: Fix a typo in a comment to read_char.

Use `window-total-width' instead of `window-width'.

* textmodes/reftex-toc.el (reftex-toc, reftex-re-enlarge): Use
`window-total-width' instead of `window-width'.

A better fix for bug #17169.

 lisp/international/characters.el (mirroring): Fix last change:
 instead of loading uni-mirrored.el explicitly, do that implicitly
 by creating the 'mirroring' uniprop table.  This avoids announcing
 the loading of uni-mirrored.el.

Doc updates for buffer-stale-function now applying to file buffers too

* doc/emacs/arevert-xtra.texi (Supporting additional buffers):
* doc/lispref/backups.texi (Reverting):
Update for buffer-stale-function also applying to file-buffers.

* lisp/autorevert.el (auto-revert-buffers):
* lisp/files.el (buffer-stale--default-function)
(buffer-stale-function, revert-buffer--default): Doc tweaks.

* etc/NEWS: Related edits.

Doc updates for default values of some -function vars no longer being nil

* doc/emacs/files.texi (Backup Names):
* doc/emacs/arevert-xtra.texi (Supporting additional buffers):
* doc/lispref/backups.texi (Making Backups, Reverting):
Update for default values of some -function vars no longer being nil.

* etc/NEWS: Related edits.

Rename EARRAYSIZE to ARRAYELTS

Fix bug #17169 with infinite recursion in bidi_initialize under force-load-messages.

 lisp/international/characters.el: Preload uni-mirrored.el.

Don't use manifest on Cygwin.  (Bug#17176)

* nt/emacs.rc: Don't use manifest on Cygwin.
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
variables empty on Cygwin.
* src/Makefile.in (EMACS_MANIFEST): Update comment.

Assert that function cells contain valid lisp objects

Rearrange suspicious pointer logging

Refix previous NEWS fix

Tweak previous NEWS change

Clean up array size calculations

Doc updates related to changes in revert-buffer function variables

* lisp/files.el (make-backup-file-name-function)
(make-backup-file-name, make-backup-file-name--default-function)
(make-backup-file-name-1, find-backup-file-name)
(revert-buffer-function, revert-buffer-insert-file-contents-function)
(buffer-stale--default-function, buffer-stale-function)
(before-revert-hook, after-revert-hook, revert-buffer-in-progress-p)
(revert-buffer, revert-buffer--default)
(revert-buffer-insert-file-contents--default-function):
Doc fixes related to defaults no longer being nil.
(make-backup-file-name-function): Bump :version.
Restore nil as a valid but deprecated custom type.

* etc/NEWS: Related edit.

* make-dist: Further update AC_INIT regexp.

Add missing src/ChangeLog text that somehow ended up in last commit message instead

* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'
used as a variable.

Fixes: debbugs:17174

Fix typo

* alloc.c: Include execinfo.h if available.
(SUSPICIOUS_OBJECT_CHECKING): New macro; define unconditionally.
(suspicious_free_record): New structure.
(suspicious_objects,suspicious_object_index)
(suspicious_free_history, suspicious_free_history_index): New
variables.
(find_suspicious_object_in_range,detect_suspicious_free,Fsuspicious_object):
New functions.
(cleanup_vector): Call find_suspicious_object_in_range.

Add GC bug investigation code

* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Add "foreach"
and "for" statement modifiers introducing expressions.

Fixes: debbugs:17116