Use set-temporary-overlay-map.
* lisp/repeat.el: Use lexical-binding.
(repeat-last-self-insert, repeat-num-input-keys-at-self-insert)
(repeat-undo-count): Remove.
(repeat):
* lisp/progmodes/octave-mod.el (octave-abbrev-start):
* lisp/progmodes/f90.el (f90-abbrev-start):
* lisp/face-remap.el (text-scale-adjust):
* lisp/kmacro.el (kmacro-call-macro): Use set-temporary-overlay-map.

* lisp/emacs-lisp/pcase.el (pcase--let*): New function.
(pcase--expand, pcase-codegen, pcase--q1): Use it to reduce nesting
a bit more.
(pcase--split-pred): Be more clever about ruling out overlap between
a predicate and some constant pattern.
(pcase--q1): Use `null' instead of (eq foo nil).

New function set-temporary-overlay-map and macros (defvar|setq)-local.
* lisp/subr.el (setq-local, defvar-local): New macros.
(kbd): Redefine as an alias.
(with-selected-window): Leave unrelated frames alone.
(set-temporary-overlay-map): New function.

Add new error and function `user-error'.
* lisp/subr.el (user-error): New function.
* lisp/window.el (switch-to-buffer):
* lisp/vc/smerge-mode.el (smerge-resolve-function, smerge-resolve)
(smerge-match-conflict):
* lisp/simple.el (previous-matching-history-element)
(next-matching-history-element, goto-history-element, undo-more)
(undo-start):
* lisp/progmodes/etags.el (visit-tags-table-buffer, find-tag-tag)
(find-tag-noselect, find-tag-in-order, etags-goto-tag-location)
(next-file, tags-loop-scan, list-tags, complete-tag):
* lisp/progmodes/compile.el (compilation-loop):
* lisp/mouse.el (mouse-minibuffer-check):
* lisp/man.el (Man-bgproc-sentinel, Man-goto-page):
* lisp/info.el (Info-find-node-2, Info-extract-pointer, Info-history-back)
(Info-history-forward, Info-follow-reference, Info-menu)
(Info-extract-menu-item, Info-extract-menu-counting)
(Info-forward-node, Info-backward-node, Info-next-menu-item)
(Info-last-menu-item, Info-next-preorder, Info-last-preorder)
(Info-next-reference, Info-prev-reference, Info-index)
(Info-index-next, Info-follow-nearest-node)
(Info-copy-current-node-name):
* lisp/imenu.el (imenu--make-index-alist)
(imenu-default-create-index-function, imenu-add-to-menubar):
* lisp/files.el (basic-save-buffer, recover-file):
* lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* lisp/emacs-lisp/checkdoc.el (checkdoc-continue, checkdoc-comments)
(checkdoc-message-text, checkdoc-defun):
* lisp/dabbrev.el (dabbrev-completion, dabbrev--abbrev-at-point):
* lisp/cus-edit.el (customize-changed-options, customize-rogue)
(customize-saved, custom-variable-set, custom-variable-mark-to-save)
(custom-variable-mark-to-reset-standard)
(custom-variable-reset-backup, custom-face-mark-to-reset-standard)
(custom-file):
* lisp/completion.el (check-completion-length):
* lisp/comint.el (comint-search-arg)
(comint-previous-matching-input-string-position)
(comint-previous-matching-input)
(comint-replace-by-expanded-history-before-point, comint-send-input)
(comint-copy-old-input, comint-backward-matching-input)
(comint-goto-process-mark, comint-set-process-mark):
* lisp/calendar/calendar.el (calendar-cursor-to-date): Use it.
* lisp/bindings.el (debug-ignored-errors): Remove regexps, add `user-error'.
* src/data.c (PUT_ERROR): New macro.
(syms_of_data): Use it.  Add new error type `user-error'.
* src/undo.c (user_error): New function.
(Fprimitive_undo): Use it.
* src/print.c (print_error_message): Adjust print style for `user-error'.
* src/keyboard.c (user_error): New function.
(Fexit_recursive_edit, Fabort_recursive_edit): Use it.

* doc/misc/Makefile.in (info): Make it the first target again.

* lisp/dabbrev.el (dabbrev--ignore-case-p): New function.
(dabbrev-completion, dabbrev-expand, dabbrev--substitute-expansion):
Use it.

* lisp/files.el (automount-dir-prefix): Mark as obsolete.

Auto-commit of generated files.

Give info files the .info extension

Ref http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00354.html

* configure.in (INFO_EXT, INFO_OPTS): New output variables.

* doc/emacs/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/emacs/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS): Use $INFO_EXT.
($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT, and -o.

* doc/lispintro/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
(${infodir}/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/lispintro/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS, clean): Use $INFO_EXT.
($(infodir)/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.

* doc/lispref/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/lispref/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(info, maintainer-clean): Use $INFO_EXT.
($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.

* doc/misc/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(INFO_TARGETS): Use $INFO_EXT.
Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o.
* doc/misc/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS): Use $INFO_EXT.
Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o.

* patcomp.el, play/bruce.el: Move to obsolete/.
* etc/NEWS: Mention this.

Fix minor Y10k bugs.

* lisp/arc-mode.el (archive-unixdate):
* lisp/autoinsert.el (auto-insert-alist):
* lisp/calc/calc-forms.el (math-this-year):
* lisp/gnus/nnweb.el (nnweb-google-parse-1):
* lisp/emacs-lisp/copyright.el (copyright-current-year)
(copyright-update-year, copyright):
* lisp/tar-mode.el (tar-clip-time-string):
* lisp/time.el (display-time-update):
Don't assume years have 4 digits.

* iswitchb.el (iswitchb-all-frames): Fix last change.

Convert more defvars to defcustoms.

* dos-w32.el (file-name-buffer-file-type-alist)
(direct-print-region-use-command-dot-com):
* ffap.el (ffap-menu-regexp):
* follow.el (follow-debug):
* forms.el (forms--debug):
* iswitchb.el (iswitchb-all-frames):
* ido.el (ido-all-frames):
* mail/feedmail.el (feedmail-mail-send-hook)
(feedmail-mail-send-hook-queued):
* mail/footnote.el (footnote-signature-separator):
* mail/mailabbrev.el (mail-alias-separator-string)
(mail-abbrev-mode-regexp):
* mail/rmail.el (rmail-speedbar-match-folder-regexp):
* progmodes/idlwave.el (idlwave-libinfo-file)
(idlwave-default-completion-case-is-down)
(idlwave-library-routines): Convert defvars to defcustoms.

* mail/rmail.el (rmail-decode-mime-charset):
* progmodes/idlw-shell.el (idlwave-shell-print-expression-function)
(idlwave-shell-fix-inserted-breaks)
(idlwave-shell-activate-alt-keybindings)
(idlwave-shell-use-breakpoint-glyph):
* facemenu.el (facemenu-unlisted-faces): Delete obsolete vars.

* doc/lispref/os.texi (Timers): Use defopt for timer-max-repeats.

Do not limit current-time-string to years 1000..9999.

* src/editfns.c (TM_YEAR_IN_ASCTIME_RANGE): Remove.
(Fcurrent_time_string): Support any year that is supported by the
underlying localtime representation.  Don't use asctime, as it
has undefined behavior for years outside the range -999..9999.
* doc/lispref/os.texi (Time of Day): Do not limit current-time-string
to years 1000..9999.
* etc/NEWS: Do not limit current-time-string to years 1000..9999.

* minibuffer.el (completion--twq-all): Beware completion-ignore-case.

Merge verilog-mode.el from upstream.
* progmodes/verilog-mode.el (font-lock-keywords):
Fix mis-highligting auto.  Reported by Craig Barner.
(verilog-auto, verilog-auto-undef): Add AUTOUNDEF to remove
defines from global name space. Reported by Dan Dever.
(verilog-auto-reset, verilog-auto-reset-widths)
(verilog-auto-tieoff): Support using unbased numbers for
AUTORESET and AUTOTIEOFF.
(verilog-submit-bug-report): Update variable list.
(verilog-read-auto-params): Fix AUTOINPUT regexps containing
parenthesis from not matching. Reported by Michael Rytting.
(verilog-auto-template-lint): Fix hash error when linting modules
with no used templates.
(verilog-warn, verilog-warn-error)
(verilog-warn-fatal): When non-interactive report multiple
warnings before exiting.  Suggested by Brad Dobbie.
(verilog-auto-template-lint, verilog-auto-template-warn-unused)
(verilog-read-auto-template): Add `verilog-auto-template-warn-unused'
to report unused template errors.  Reported by Brad Dobbie.
(verilog-read-decls): Fix AUTOWIRE etc on supply0, supply1 type
nets, bug438. Reported by Vns Blore.
(verilog-auto-inout-module, verilog-auto-reg)
(verilog-read-decls, verilog-read-sub-decls-sig)
(verilog-signals-edit-wire-reg, verilog-signals-with):
Fix passing of Verilog data types in ANSI input/output ports
such as "output logic" into the AUTOs. Special case "wire" and
"reg" for backwards compatibility presuming Verilog 2001.
(verilog-auto-ascii-enum): Add "auto enum" as alias.
(verilog-preprocess): Fix replication of preprocess output.
Reported by Brad Dobbie.
(verilog-auto-inst-interfaced-ports):
Create verilog-auto-inst-interfaced-ports, bug429.
Reported by Julian Gorfajn.
(verilog-after-save-font-hook)
(verilog-before-save-font-hook): New variable.
(verilog-modi-cache-results, verilog-save-font-mod-hooked)
(verilog-save-font-mods): Wrap disabling fontification, reported
by David Rogoff.
(verilog-do-indent, verilog-pretty-declarations-auto)
(verilog-sk-def-reg): Fix obeying `verilog-auto-lineup', bug305.
Reported by Pierre-David Pfister.
(verilog-set-auto-endcomments): Fix endtask auto comments outside
of class declarations, bug292.  Reported by Kevin Heilman.
(verilog-read-decls): Fix 'parameter type' not appearing in
AUTOINSTPARAM, bug340.  Reported by Jonathan Greenlaw.
(verilog-auto-logic): Fix when AUTOLOGIC present to properly do
AUTOINPUTs, bug411. Reported by Jonathan Greenlaw.
(verilog-read-auto-lisp): Avoid syntax-ppss warning on AUTOLISP.
Reported by David Kravitz.

* progmodes/verilog-mode.el (verilog-pretty-expr): Don't line up
assignment with tests in ifs and for loops.
(verilog-extended-complete-re, verilog-complete-reg): Change so
that DPI inport functions don't look like fuction declarations.
(verilog-pretty-expr): Don't line up assignment
operations to the test and increment in if and for loops
(verilog-extended-complete-re, verilog-complete-reg): Change so
that DPI inport functions don't look like fuction declarations

Auto-commit of loaddefs files.

Auto-commit of generated files.

merge trunk

mail/rmailmm.el (rmail-show-mime): Catch an error caused by text decoding, and show a warning message without signalling an error (Bug#11282).

* lisp/emacs-lisp/bytecomp.el
(byte-compile-file-form-custom-declare-variable): Compile all elements,
since cconv.el might have introduced :fun-body, internal-make-closure,
and friends for bytecomp to handle.
* lisp/custom.el (defcustom): Avoid ((λ ..) ..).

Fixes: debbugs:11391

Fix race conditions involving setenv, gmtime, localtime, asctime.

Without this fix, interrupts could mess up code that uses these
nonreentrant functions, since setting TZ invalidates existing
tm_zone or tzname values, and since most of these functions return
pointers to static storage.
* editfns.c (format_time_string, Fdecode_time, Fencode_time)
(Fcurrent_time_string, Fcurrent_time_zone, Fset_time_zone_rule):
Grow the critical sections to include not just invoking
localtime/gmtime, but also accessing these functions' results
including their tm_zone values if any, and any related TZ setting.
(format_time_string): Last arg is now struct tm *, not struct tm **,
so that the struct tm is saved in the critical section.  All
callers changed.  Simplify allocation of initial buffer, partly
motivated by the fact that memory allocation needs to be outside
the critical section.

* subr.el (read-passwd): Better clean after ourselves.

Fixes: debbugs:11392

NEWS addition re configure.in and BSD -L options

* intervals.c (adjust_intervals_for_insertion): Initialize `newi'
with RESET_INTERVAL.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer):
Remove duplicated buffer name initialization.

configure.in tweak for LD_SWITCH_SYSTEM on FreeBSD, NetBSD (bug#10313)

* configure.in (LD_SWITCH_SYSTEM):
Don't try to defeat the choices made by FreeBSD and NetBSD.

Yet more merged ChangeLog fixes

Fix merged ChangeLog entry

Auto-commit of generated files.

Add customization data to several built-in variables.

* lisp/cus-start.el (gc-cons-percentage, exec-suffixes)
(dos-display-scancodes, dos-hyper-key, dos-super-key)
(dos-keypad-mode, debug-on-signal, vertical-centering-font-regexp)
(make-cursor-line-fully-visible, void-text-area-pointer)
(font-list-limit): Add customization data.

* doc/lispref/display.texi (Font Lookup):
* doc/lispref/frames.texi (Pointer Shape):
* doc/lispref/processes.texi (Subprocess Creation): Use defopt for options.

Fix ChangeLog typos.

Silence byte-compiler warnings.

lisp/notifications.el (dbus-debug):
lisp/term/linux.el (gpm-mouse-enable):
lisp/term/screen.el (xterm-register-default-colors): Declare.

lib-src/emacsclient.c (min): Undef before redefining it.

Fix naming of abnormal hook vars in allout.el.

* lisp/allout.el (allout-exposure-change-functions)
(allout-structure-added-functions)
(allout-structure-deleted-functions)
(allout-structure-shifted-functions): Rename abnormal hooks from *-hook,
and convert to defcustoms.
(allout-after-copy-or-kill-hook, allout-post-undo-hook): Convert
to defcustoms.
(allout-mode-hook, allout-mode-deactivate-hook): Doc fix.

* lisp/allout-widgets.el: Hook callers changed.

* lib-src/emacsclient.c (send_to_emacs): Avoid invalid strcpy
upon partial send.

Fixes: debbugs:11374

* src/xfns.c (x_window): Use xstrdup (Bug#11375).

* src/xterm.c (x_term_init): Use memcpy instead of strncpy.

Fixes: debbugs:11373

Don't hard-code the list of info files in the top-level Makefile

The sed '/ing directory/d' piece is to remove the annoying
"entering/leaving directory" messages that GNU make insists on
printing when called recursively.  --no-print-directory isn't portable.

* Makefile.in (INFO_FILES): Remove variable.
(INFO_NONMISC): New variable.
(install-arch-indep, uninstall): Don't use $INFO_FILES.

* doc/misc/Makefile.in (echo-info): New phony target, used by top-level.

Add change missed from previous merge from emacs-24

Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org

* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".

* Makefile.in (uninstall): Remove useless-use-of-for.
For some reason it caused problems on an old Solaris.

Makefile.in fix for systems without /bin/install or somesuch

* Makefile.in (install-arch-indep, uninstall):
Ensure that INSTALL-type commands are run from top-level.

* Makefile.in (INFO_FILES): Add emacs-gnutls;
accidentally omitted from 2012-04-12 backport from trunk.
(Do not merge to trunk.)

* Makefile.in (install-arch-indep): Combine install-data, install-info loops.

Fix some info/dir entries

* doc/misc/emacs-gnutls.texi, doc/misc/ert.texi, doc/misc/org.texi:
Fix dircategory, direntry to match info/dir.

* doc/misc/viper.texi: Make direntry shorter (also it is no longer "newest").

* info/dir: Make some entries consistent with the source texi files.

* configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.

Ref http://debbugs.gnu.org/6190

auth.texi (Help for users): Update for .gpg file being second

* lisp/cus-start.el (suggest-key-bindings): Remove, now it is in Lisp.

Don't hard-code manual pages in top-level Makefile.in

* Makefile.in (MAN_PAGES): Remove.
(install-arch-indep, uninstall): Don't use $MAN_PAGES.

Some updates for etc/TODO

Further doc fix.

* lisp/eshell/esh-cmd.el (eshell-debug-command): Doc fix.  Add :set.

* lisp/cus-edit.el (custom-variable-documentation): Simplify with format.

* lisp/gnus/nnimap.el (nnimap-open-connection-1): Don't leave an "opening..."
message once it's actually open.

Reimplement execute-extended-command in Elisp.
* src/keyboard.c (Fexecute_extended_command, Vsuggest_key_bindings):
Move to simple.el.
* lisp/simple.el (suggest-key-bindings, execute-extended-command):
Move from keyboard.c.

Fix mouse wheel scrolling in Follow mode.

* lisp/follow.el (follow-mwheel-scroll): New function.
(follow-redraw-after-event): Fix last change.

Fixes: debbugs:4112

* lisp/follow.el: Rework, eliminating reliance on advice.
(set-process-filter, process-filter, sit-for): Advice deleted.
(follow-mode-off-hook): Obsolete hook removed.
(follow-avoid-tail-recenter-p, follow-process-filter-alist): Vars
deleted.
(follow-auto): Use a :set function.
(follow-mode): Rewritten.  Don't advise process filters.
(follow-switch-to-current-buffer-all, follow-scroll-up)
(follow-scroll-down): Assume follow-mode is bound.
(follow-comint-scroll-to-bottom)
(follow-align-compilation-windows): New functions.
(follow--window-sorter): New function.
(follow-all-followers): Use it to explicitly sort windows by their
positions; don't make assumptions about next-window order.
(follow-windows-start-end, follow-delete-other-windows-and-split)
(follow-calc-win-start): Doc fix.
(follow-windows-aligned-p, follow-select-if-visible): Don't call
vertical-motion unnecessarily.
(follow-adjust-window): New function.
(follow-post-command-hook): Use it.
(follow-call-set-process-filter, follow-call-process-filter)
(follow-intercept-process-output, follow-tidy-process-filter-alist)
(follow-stop-intercept-process-output, follow-generic-filter):
Functions deleted.
(follow-scroll-bar-toolkit-scroll, follow-scroll-bar-drag)
(follow-scroll-bar-scroll-up, follow-scroll-bar-scroll-down): New
functions, replacing advice on scroll-bar-* commands.

* lisp/comint.el (comint-adjust-point): New function.
(comint-postoutput-scroll-to-bottom): Use it.  Call
follow-comint-scroll-to-bottom for Follow mode buffers.

Auto-commit of loaddefs files.

Auto-commit of generated files.

Only print the edition number of the manuals in the TeX version

Frankly, I think the edition conveys little to no information.
The version number of Emacs is much more relevant.
No-one seems to know what the rules are for updating the edition anyway...

* doc/emacs/emacs.texi (@copying): Only print EDITION in the TeX version.

* doc/lispref/elisp.texi (@copying):
* doc/lispref/intro.texi (Introduction): Only print VERSION in the TeX version.

Remove no-byte-compile setting from some lisp/term files.

Not that compiling these will bring any noticeable speed benefit, but
there's really no reason not to compile them.  The extra disk space
and build time is negligible, and it might reveal use of obsolete
functions, bugs, etc.

Remove references to macros that are not defined anywhere

* src/syssignal.h: Remove reference to BROKEN_SIGINFO (last used in
s/ptx4.h), BROKEN_SIGTSTP (last used in m/ustation.h, m/dpx2.h),
and BROKEN_SIGURG (was in s/gnu-linux.h prior to 2008-02-10).
All were removed before 23.1.

Fix typo in previous rpath-related change (thanks hydra)

Use libtinfo in preference to libncurses (bug#9741)

* configure.in: Try libtinfo for tputs.
(LIBS_TERMCAP) [gnu*]: Use libtinfo if it was found.

* etc/NEWS: Mention this.

* configure.in: Combine adjacent $opsys case blocks.

* configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2.

* configure.in: Invert the TERMINFO logic
(since "yes" is far more common than "no")

Update comment in configure.in

Remove HAVE_LIBNCURSES; it is required to be true

Also, it was a confusing name, since it does not necessarily mean that
we literally have libncurses; rather that we have tputs etc.

* configure.in (HAVE_LIBNCURSES): Remove; it is required to be true.

* src/dispnew.c: Remove HAVE_LIBNCURSES test;
it is always true on relevant platforms.

* nt/config.nt (HAVE_LIBNCURSES): Remove undef; not needed.

* lisp/minibuffer.el (completion-table-with-quoting): Fix compatibility
all-completions code to not return a number in the last cdr.

Rename autoconf output variable LD_SWITCH_X_SITE_AUX_RPATH

* configure.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.

* src/Makefile.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.

Remove LD_SWITCH_X_SITE_AUX, which is no longer used

* configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.

* .gdbinit (xpr): Remove checks for no longer existing misc types.
(xintfwd, xboolfwd, xobjfwd, xbufobjfwd, xkbobjfwd, xbuflocal):
Remove.

Resurrect encoding of replies by Rmail which was lost in 2012-04-11T21:37:13Z!monnier@iro.umontreal.ca.

 lisp/mail/rmail.el (rmail-yank-current-message): Use the encoding of
 the yanked message in preference to the default value of
 buffer-file-coding-system.

* lisp/ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer
read-only error.

Fix entry in display-buffer--action-function-custom-type

Regenerate etc/refcards/*.pdf

* doc/emacs/search.texi (Regexp Search): Just say "Emacs".

Tweak page break in display.texi

* doc/emacs/display.texi (Auto Scrolling):
Reword to avoid repetition and improve page break.

Fixes: debbugs:11380
* make-docfile.c (scan_lisp_file) [DEBUG]: Also skip if and
byte-code forms.

Fix bug #11367 with assertion violation during vertical motion in egg.el.

 src/xdisp.c (pos_visible_p): If already at a newline from the
 display string before the 'while' loop, don't walk back the glyphs
 from it3.glyph_row.  Solves assertion violation when the display
 string begins with a newline (egg.el).

* doc/lispref/text.texi (Change Hooks): Minor fix for after-change-functions.

Fix Follow mode's calculation of window ends.

* lisp/follow.el (follow-calc-win-end): Rewrite to handle partial
screen lines correctly.
(follow-avoid-tail-recenter): Minor cleanup.

Fixes: debbugs:8390

Do not avoid creating empty evaporating overlays (Bug#9642).

* buffer.c (Fmove_overlay): Revert the change of 2012-04-23.
That is, do not delete an evaporating overlay if it becomes
empty after its bounds are adjusted to fit within its buffer.
This fix caused other problems, and I'm reverting it until we get
to the bottom of them.

Avoid the obsolete `assoc' package.
* lisp/speedbar.el (speedbar-refresh): Avoid adelete.
(speedbar-file-lists): Simplify and avoid aput.
* lisp/man.el (Man--sections, Man--refpages): New vars, replacing
Man-sections-alist and Man-refpages-alist.
(Man-build-section-alist, Man-build-references-alist):
Use them; avoid aput.
(Man--last-section, Man--last-refpage): New vars.
(Man-follow-manual-reference): Use them.
Use the `default' arg of completing-read.
(Man-goto-section): Idem.  Move prompt to the `interactive' spec.
* lisp/gnus/auth-source.el (auth-source--aput-1, auth-source--aput)
(auth-source--aget): New functions and macros.
Use them instead of aput/aget.

Add some shell indentation test cases.
* test/indent/shell.sh:
* test/indent/shell.rc: Add some test cases.

Remove some overfull lines in doc/misc/faq

* doc/misc/faq.texi: (File-name conventions):
Shorten section name to avoid overfull line.
(How to add fonts): Use smallexample to avoid overfull lines.

* doc/misc/faq.texi: Convert @inforefs to @xrefs.
Fix some malformed cross-references.

* emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox.

Auto-commit of generated files.

Reword some doc/lispref to remove/reduce some overly long/short lines.

* package.texi (Packaging Basics):
* loading.texi (Autoload):
* files.texi (Magic File Names):
Reword to remove/reduce some overly long/short lines.

Reword some doc/emacs to remove/reduce some overly long/short lines.

* xresources.texi (Resources):
* mule.texi (Language Environments):
* misc.texi (Amusements):
* maintaining.texi (VC Change Log):
* frames.texi (Fonts):
* custom.texi (Specifying File Variables, Minibuffer Maps):
* cmdargs.texi (Initial Options):
* building.texi (Flymake):
Reword to remove/reduce some overly long/short lines.

Update CC Mode version to 5.32.3.

Bump version to 24.0.96.
Regenerate AUTHORS and ldefs-boot.el.

* lisp/vc/diff.el (diff-sentinel): Go to bob.

Fixes: debbugs:10259

Fix org-ctags.el change from trunk 2012-04-09T13:05:48Z!cyd@gnu.org

* lisp/org/org-ctags.el (org-ctags-new-topic-template):
Revert 2012-04-09 removal of * from defcustom value, not doc.

Fix dates of some merged ChangeLog entries

Fix application of menu-bar-mode etc. by X resources.

* lisp/startup.el (x-apply-session-resources): New function.

* lisp/term/ns-win.el (ns-initialize-window-system):
* lisp/term/w32-win.el (w32-initialize-window-system):
* lisp/term/x-win.el (x-initialize-window-system): Use it to properly
set menu-bar-mode and other vars from X resources, even if the initial
frame is not a window-system frame (Bug#2299).

Merge changes from emacs-24 branch