* admin/notes/bugtracker: Mention "found".

etc/NEWS: Add placeholder for finder-inf.el changes.

Merge changes made in Gnus trunk.

nnir.el: General clean-up, and reimplementation of various bits.
nnir.el (nnir-search-engine): Ressurect variable, since it's used later in the file.
shr.el (shr-generic): The text nodes should be text, not :text.
nnir.el: Move defvars around to silence compiler warnings.
shr.el (shr-tag-img): Output "*" instead of "[img]".

Check more carefully for packages before loading package.el.

* startup.el (command-line): Search for package directories, and
don't load package.el if none are found.

* emacs-lisp/package.el (describe-package, list-packages): Call
package-initialize if it has not been called yet.

gnus-start.el (gnus-find-new-newsgroups): Remove gnus-check-first-time-used.
gnus.el: Remove gnus-backup-default-subscribed-newsgroups.
gnus-group.el: Remove gnus-group-fetch-control.

nnimap.el (nnimap-update-info): Allow 'ticked and other flags to be set on groups that don't have \* permanentflags.

progmodes/cc-fonts.el (c-font-lock-enum-tail): New function which
fontifies the tail of an enum.
(c-basic-matchers-after): Insert a call to the above new function.
This fixes bug #7264.

Merge changes made in Gnus trunk.

gnus.el: Remove `gnus-nntp-service' variable.
gnus.el: Make gnus-nntp-server and gnus-secondary-servers obsolete.
gnus-sum.el (gnus-summary-delete-marked-as-read, gnus-summary-delete-marked-with): Remove obsolete defalias.
gnus.el (gnus-use-long-file-name): Fix docstring.
nnimap.el (nnimap-open-connection): Use AUTHENTICATE PLAIN on servers that say they support that.
gnus-msg.el (gnus-inews-do-gcc): Don't have the backends do the slow *-request-group, which seems unnecessary.
gnus-group.el (gnus-group-get-new-news-this-group): Don't have point move to the previous line on `M-g'.
nnimap.el (nnimap-split-incoming-mail): Note that the INBOX has been selected.
nnimap.el: Allow the user to say whether to split old messages or not in nnimap.
shr.el (shr-tag-table-1): Only insert the images after the top-level table.
shr.el (shr-tag-span): Drop colorisation of regions since we don't control the background color.
shr.el (shr-tag-img): Ignore very small web bug type images.
shr.el (shr-put-image): Add help-echo alt texts to the images.
shr.el (shr-tag-video): Show the video poster image.

Fix bug#7306; customization of minor-mode variables defined in C.

* lisp/cus-start.el: Add :set properties for minor modes menu-bar-mode,
tool-bar-mode, transient-mark-mode.
Include the :set property in the dumped Emacs.

SMIE: change indent rules format, improve smie-setup.
* lisp/emacs-lisp/smie.el (smie-precs-precedence-table)
(smie-merge-prec2s, smie-bnf-precedence-table, smie-prec2-levels):
Mark them pure so the tables gets built at compile time.
(smie-bnf-precedence-table): Store the closer-alist in the table.
(smie-prec2-levels): Preserve the closer-alist.
(smie-blink-matching-open): Be more forgiving in case of indentation.
(smie-hanging-p): Rename from smie-indent--hanging-p.
(smie-bolp): Rename from smie-indent--bolp.
(smie--parent, smie--after): New dynamic vars.
(smie-parent-p, smie-next-p, smie-prev-p): New funs.
(smie-indent-rules): Remove.
(smie-indent--offset-rule): Remove fun.
(smie-rules-function): New var.
(smie-indent--rule): New fun.
(smie-indent--offset, smie-indent-keyword, smie-indent-after-keyword)
(smie-indent-exps): Use it.
(smie-setup): Setup paren blinking; add keyword args for token
functions; extract closer-alist from op-levels.
(smie-indent-debug-log): Remove var.
(smie-indent-debug): Remove fun.
* lisp/progmodes/prolog.el (prolog-smie-indent-rules): Remove.
(prolog-smie-rules): New fun to replace it.
(prolog-mode-variables): Simplify.
* lisp/progmodes/octave-mod.el (octave-smie-closer-alist): Remove, now that
it's setup automatically.
(octave-smie-indent-rules): Remove.
(octave-smie-rules): New fun to replace it.
(octave-mode): Simplify.

gnus.el (gnus-buffers, gnus-group-buffer): Add docstrings.
gnus.el (gnus-group-startup-message): Simplify/update code.
gnus-ems.el (gnus-x-splash): Remove.
gnus-start.el (gnus-1): Remove x-splash calls.

gnus-group.el (gnus-group-make-tool-bar): Check for display graphic capability before doing anything.
gnus-group.el (gnus-group-insert-group-line): Remove useless gnus-group-remove-excess-properties.

Fix doc/misc/makefile.w32.in like 2010-10-28T07:21:43Z!rgm@gnu.org did with Makefile.in.

 makefile.w32-in (MAKEINFO): Add -I$(emacsdir).
 (ENVADD): Remove extra -I$(emacsdir), included in $(MAKEINFO).
 ($(infodir)/efaq): Remove -I$(emacsdir), included in $(MAKEINFO).
 ($(infodir)/calc, calc.dvi): Depend on $(emacsdir)/emacsver.texi.

Fix 2010-10-29T06:51:36Z!rgm@gnu.org for non-CLASH_DETECTION platforms.

 emacs.c (main): Call syms_of_filelock unconditionally.
 filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
 clause, but keep part of it conditioned on CLASH_DETECTION.

gnus-art.el (gnus-article-goto-part): Fix last change.

gnus-art.el (gnus-article-goto-part): Work for article narrowed by ^L.

Sync docs of some X, W32, NS C functions.

* src/nsfns.m (Fx-display-save-under, Fx-open-connection)
(Fxw-color-defined-p, Fxw-display-color-p, Fx-show-tip):
* src/w32fns.c (Fxw_color_defined_p, Fx_open_connection):
* src/xfns.c (Fxw_color_defined_p, Fx_open_connection):
Sync docs between X, W32, NS.

Remove duplicate Lisp definition of temporary-file-directory, from filelock.c.

* lisp/files.el (temporary-file-directory): Remove (already defined in C).
* lisp/cus-start.el: Add temporary-file-directory.

Remove duplicate Lisp definitions of define-minor-mode variables defined in C.

* lisp/abbrev.el (abbrev-mode):
* lisp/composite.el (auto-composition-mode):
* lisp/menu-bar.el (menu-bar-mode):
* lisp/simple.el (transient-mark-mode):
* lisp/tool-bar.el (tool-bar-mode): Adjust the define-minor-mode calls so
that they do not define the associated variables twice.
* lisp/simple.el (transient-mark-mode): Remove defvar.
* lisp/composite.el (auto-composition-mode): Make variable auto-buffer-local.
* lisp/cus-start.el: Add transient-mark-mode, menu-bar-mode, tool-bar-mode.
Handle multiple groups, and also custom-delayed-init-variables.
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.

* src/buffer.c (syms_of_buffer) <abbrev-mode, transient-mark-mode>:
* src/frame.c (syms_of_frame) <tool-bar-mode>: Move docs here from Lisp.

* lisp/emacs-lisp/pcase.el (pcase): New `string' and `guard' patterns.
(pcase-if): Add one minor optimization.
(pcase-split-equal): Rename from pcase-split-eq.
(pcase-split-member): Rename from pcase-split-memq.
(pcase-u1): Add strings to the member optimization.
Add `guard' variant of predicates.
(pcase-q1): Add string patterns.

gnus-sum.el (gnus-summary-rescan-group): Try to restore the window config after reselecting.

* lisp/vc/log-edit.el (log-edit-rewrite-fixes): State its safety pred.

shr.el (shr-put-image): Use point even if only inserting text; save-excursion on alt text.

nnir.el (nnir-run-swish-e): Remove hyrex support.

doc/Makefile fixes related to inclusion of emacsver.texi.

* doc/lispref/Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir.

* doc/misc/Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.
(($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi.
($(infodir)/efaq): Remove -I option now in $MAKEINFO.

Move ns-specific menu-bar code from term/ns-win.el to menu-bar.el.

* lisp/term/ns-win.el (global-map, menu-bar-final-items, menu-bar-help-menu):
Move menu-bar related settings to ../menu-bar.el.
* lisp/menu-bar.el (global-map, menu-bar-final-items, menu-bar-help-menu):
Move ns-specific settings here from term/ns-win.el.

gnus-art.el: Improve MIME part functions.

gnus-art.el (gnus-article-jump-to-part): Error on no part; fix prompt.
 (gnus-mime-copy-part): Check coding system, not charset.
 (gnus-mime-view-part-externally): Never remove part.
 (gnus-mime-view-part-internally): Don't remove part here.
 (gnus-article-part-wrapper): Make sure MIME tag is visible.
 (gnus-article-goto-part): Go to displayed or preferred subpart if it is multipart/alternative.

mm-decode.el (mm-display-part): Take optional arg `force'.

* lisp/simple.el (x-selection-owner-p): Remove unused declaration.

* lisp/minibuffer.el (completion-cycling): New var.
(minibuffer-complete, completion--do-completion):
Use completion--flush-all-sorted-completions.
(minibuffer-complete): Only cycle if completion-cycling is set.
(completion--flush-all-sorted-completions): Unset completion-cycling.
(minibuffer-force-complete): Set completion-cycling.
(completion-all-sorted-completions): Move declaration before first use.

Fixes: debbugs:7266

* lisp/iswitchb.el (iswitchb-kill-buffer): Avoid `iswitchb-make-buflist'
which changes the order of matches seen by users.

Fixes: debbugs:7231

* lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):
Don't confuse -omega as "-o mega".

gnus-group.el: Make gnus-group-default-list-level possibly a function.

* lisp/vc/log-edit.el (log-edit-rewrite-fixes): New var.
(log-edit-author): New dynamic var.
(log-edit-changelog-ours-p, log-edit-insert-changelog-entries): Use it
to return the author if different from committer.
(log-edit-insert-changelog): Use them to add Author: and Fixes headers.

* test/indent/octave.m: Add a test to ensure indentation is local.

* lisp/play/landmark.el: Adjust commenting convention.
(lm-nil-score): Rename from nil-score.
(Xscore, XXscore, XXXscore, XXXXscore, Oscore, OOscore, OOOscore)
(OOOOscore): Move into a let in lm-score-trans-table.
(lm-winning-threshold, lm-loosing-threshold): Use lm-score-trans-table.

* lisp/electric.el (electric-indent-chars): Autoload.
* lisp/progmodes/octave-mod.el (octave-mode):
* lisp/progmodes/ruby-mode.el (ruby-mode): Take advantage of it.
(ruby-mode-abbrev-table): Merge initialization and declaration.

nnimap.el (nnimap-retrieve-group-data-early): Remove bad comment.

* lisp/term/ns-win.el (ns-insert-file): Init in let.
(ns-find-file): Use let*.

* abbrev.el (abbrev-mode): Remove one of the three definitions of this variable.

ns-win.el trivia.

* term/ns-win.el: (ns-handle-nxopen): Optionally handle the temp-case.
(ns-handle-nxopentemp): Just call ns-handle-nxopen.
(ns-insert-file, ns-find-file): Use `pop'.

* server.el (server-host, server-port, server-auth-dir): Autoload risky.

mm-decode.el (mm-shr): Add undisplayer to MIME handle.

* lisp/term/ns-win.el: Restore require of cl when compiling.
(menu-bar-final-items): Remove non-existent `windows' menu.

gnus-group.el: Replace replace-regexp-in-string with gnus-replace-in-string.

* src/eval.c (init_eval_once): Set max_lisp_eval_depth to 600.
  Otherwise, bootstrapping on Windows fails to compile macroexp.el.

shr.el (shr-tag-div): Added.

cmds.c: (internal_self_insert): Don't insert for negative arguments.

Fix bug #7281.

 cmds.c (internal_self_insert): Don't insert if argument N is zero.

* lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case.

* term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map.  * term/common-win.el (x-setup-function-keys): Remove most of the keymappings.  Comment on the remaining ones.

Mention server-port.

Add ChangeLog bug ref.

Add server-port option.  (Bug#854)
* lisp/server.el (server-port): New option.
(server-start): Use server-port.

* lisp/term/ns-win.el (ns-ignore-2-arg): Remove unused function.
(Mistakenly committed the ChangeLog for this earlier.)

* gtkutil.c (qttip_cb): Set title to empty for ATK (Bug#7278).

Remove ns-handle-* functions that duplicate x-handle-*.

* lisp/term/ns-win.el (ns-version-string): Remove unused declaration.
(ns-invocation-args): Change to x-invocation-args.
(ns-handle-switch, ns-handle-numeric-switch, ns-handle-iconic)
(ns-handle-name-switch, ns-ignore-2-arg): Remove.
(ns-handle-nxopen, ns-handle-nxopentemp, ns-ignore-1-arg):
Use x-invocation-args instead of ns-invocation-args.
(ns-initialize-window-system, handle-args-function-alist):
Use x-handle-args instead of ns-handle-args.
* lisp/term/common-win.el (x-handle-args): Also handle nextstep arguments.
* lisp/startup.el (command-line-ns-option-alist): Replace
ns-handle-name-switch, ns-handle-switch, ns-handle-numeric-switch,
ns-handle-iconic with the x- equivalents.

* etc/images/README: Add (un)checked.xpm
* etc/images/checked.xpm, images/unchecked.xpm: Add copyright.

Let ns load common-win.

* lisp/term/common-win.el (x-select-enable-clipboard):
* lisp/term/pc-win.el (x-select-enable-clipboard): Doc fix.

* lisp/term/ns-win.el: No need to require cl when compiling.
(x-display-name, x-setup-function-keys, x-select-text, x-colors)
(xw-defined-colors): Use the common-win definitions.
(ns-alternatives-map): Make it an obsolete alias for x-alternatives-map.
(ns-handle-iconic): Make it an alias for x-handle-iconic.
* lisp/term/common-win.el (x-select-text, x-alternatives-map)
(x-setup-function-keys, x-colors, xw-defined-colors): Handle 'ns case.
* lisp/loadup.el [ns]: Load common-win.

Make epa-mail-encrypt expand mail aliases.

Make epa-mail-encrypt handle local-part only recipients.

* epa-mail.el (epa-mail-encrypt): Handle local-part only
recipients (Bug#7280).

gnus-util.el: Remove `gnus-with-local-quit'.
gnus-demon.el (gnus-demon-init): Use run-with-idle-timer function.

* configure.in (checking for -znocombreloc): Use AC_LANG_PROGRAM
to avoid warning.

Document GTK Emacs kill on display close in PROBLEMS.

* src/xterm.c (x_connection_closed): Update comment.

Don't use the word "PGP", since it is a non-free program.

gnus-sum.el (gnus-summary-select-article): Fix type error in checking the original article buffer.

Simplifications for lisp/term/common-win.el

* lisp/term/common-win.el (x-handle-switch): Simplify with pop.
Optionally handle numeric switches.
(x-handle-numeric-switch): Just call x-handle-switch.
(x-handle-initial-switch, x-handle-xrm-switch, x-handle-geometry)
(x-handle-name-switch, x-handle-display, x-handle-args):
Simplify with pop.

Add alternative key bindings for epa-mail commands.

* epa.texi (Mail-mode integration): Add alternative key bindings
for epa-mail commands; escape comma.

Move ns-win.el's rather wacky menu adjustments to menu-bar.el.

* lisp/term/ns-win.el: Do not require easymenu.
(menu-bar-edit-menu) <copy, paste, paste-from-menu, separator-undo>:
<spell>: Move adjustments to menu-bar.el.
* lisp/menu-bar.el (menu-bar-edit-menu) <copy, paste, paste-from-menu>:
<separator-undo, spell>: Move ns-win's adjustments here.
* lisp/loadup.el [ns]: Do not load easymenu.

* src/Makefile.in (SOME_MACHINE_LISP): Remove easymenu.elc.
* lib-src/makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.

Fix some ChangeLog entries.

Avoid inline image variables for checkboxes (Bug#7222).

* etc/images/checked.xpm:
* etc/images/unchecked.xpm: New images.

* image.el (image-checkbox-checked, image-checkbox-unchecked):
Deleted (Bug#7222).

* startup.el (fancy-startup-tail): Instead of using inline images,
refer to image files from etc/.

* wid-edit.el (checkbox): Likewise.
(widget-image-find): Center image specs.

Sync docs of some W32 and X C functions.

* src/w32fns.c (Fx_synchronize, Fx_change_window_property)
(Fx_window_property, Fx_file_dialog):
* src/xfns.c (Fx_synchronize, Fx_change_window_property)
(Fx_window_property, Fx_file_dialog): Sync docs between w32 and X.

calc.texi:  Use emacsver.texi to determine Emacs version.

Merge changes made in Gnus trunk.

message.el (message-default-headers): Fix type.
nnimap.el (nnimap-request-head, nnimap-request-move-article): Make internal nnimap moving slightly faster.
nnimap.el (nnimap-transform-headers): Don't bug out on bodiless articles.
nnimap.el (nnimap-send-command): Have no outstanding messages if the IMAP server doesn't support streaming.
nnimap.el (nnimap-transform-headers): Fold {quoted} strings more sloppily.

ChangeLog fix.

Move some more shared x-, w32- things to common-win.

* term/ns-win.el (x-select-text): Doc fix.
* w32-fns.el (x-alternatives-map, x-setup-function-keys)
(x-select-text): Move to term/common-win.
* term/w32-win.el (xw-defined-colors): Move to common-win.
* term/x-win.el (xw-defined-colors, x-alternatives-map)
(x-setup-function-keys, x-select-text): Move to common-win.
* term/common-win.el (x-select-text, x-alternatives-map)
(x-setup-function-keys, xw-defined-colors): Merge x- and w32-
definitions here.

Fix 2010-10-10 keymap fixes.

* net/mairix.el (mairix-searches-mode-map):
* mail/mspools.el (mspools-mode-map): Fix 2010-10-10 change.

Merge changes from emacs-23 branch.

Merge changes from emacs-23

* xterm.c (x_connection_closed): Kill Emacs unconditionally.

Regenerated.

* configure.in: Remove the BROKEN annotation from gnutls.

Merge read-color and facemenu-read-color (Bug#7242).

* lisp/facemenu.el (facemenu-read-color): Alias for read-color.
(facemenu-set-foreground, facemenu-set-background): Use
read-color.

* lisp/faces.el (read-color): Use the completion code from
facemenu-read-color.  Require match in completion.  Doc fix.

* lisp/frame.el (set-background-color, set-foreground-color)
(set-cursor-color, set-mouse-color, set-border-color): Use
read-color.

Use recursive-trash feature for eshell deletion (Bug#7011).

* lisp/eshell/em-unix.el (eshell-remove-entries): Use the TRASH
argument of delete-file and delete-directory (Bug#7011).

* emacs.c (argmatch): Don't treat "--" as "--chdir".

* package.el (package-menu-mode-map): Inherit from button-buffer-map.

Fix last commit.

Make the *Packages* buffer read-only.

* emacs-lisp/package.el (package--generate-package-list): Make the
*Packages* buffer read-only.

progmodes/cc-fonts.el (c-font-lock-declarations): Cache the result of
`c-beginning-of-decl-1' between invocations of a lambda function (Bug
#7265).

gnus-sum.el (gnus-summary-select-article): Make sure we have the original article buffer live.
gnus-sum.el (gnus-summary-select-article-buffer): Mention gnus-widen-article-buffer.
shr.el (shr-tag-object): Added.
nnir.el, gnus-group.el: Make nnir work by default.
gnus-agent.el (gnus-agent-fetch-group): Don't download stuff if the group isn't covered by the agent.
gnus-sum.el (gnus-group-make-articles-read): Propagate marks to the backend for unknown groups.
gnus-html.el (gnus-html-prefetch-images): Decode entities before prefetching images.

Try to use "gpg2" if "gpg" isn't available.

* epg-config.el (epg-gpg-program): Try to use "gpg2" if "gpg"
executable is not available on the system (Bug#7268).

Sync docs of selection-coding-system between C and Lisp.
* src/w16select.c (syms_of_win16select) <selection-coding-system>:
* src/w32select.c (syms_of_w32select) <selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (selection-coding-system): Sync doc with C versions.

Sync Lisp and C docs of next-selection-coding-system.

* src/w16select.c (syms_of_win16select) <next-selection-coding-system>:
* src/w32select.c (syms_of_w32select) <next-selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (next-selection-coding-system): Sync doc with C versions.

Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.

* lisp/w32-vars.el (x-select-enable-clipboard):
* lisp/term/x-win.el (x-select-enable-clipboard): Move to common-win.
* lisp/term/common-win.el (x-select-enable-clipboard): Move here.

Remove duplicate definition of tty-defined-color-alist.

* src/xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
Lisp version.
* lisp/term/tty-colors.el (tty-defined-color-alist): Remove duplicate
definition of C variable.

Sync X and MS-Windows docs for x-use-underline-position-properties.
* src/w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
Sync doc with the xterm.c version.

Sync X and MS-Windows docs of x-toolkit-scroll-bars.
* src/w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
* src/xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.

Avoid redefining some C defcustoms.

* lisp/frame.el (show-trailing-whitespace, auto-hscroll-mode)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Don't redefine things that are defined in C.
* lisp/cus-start.el: Also handle :risky, :safe, :set, and :tag.
(show-trailing-whitespace, auto-hscroll-mode)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Set up the appropriate custom properties.

gnus-group.el (gnus-group-completing-read): Remove all newlines from group names.  They mess up the group buffer badly.
shr.el (shr-tag-strong): Added.

Bind "C-c ]" to block-closing commands in several modes.

Bind "C-c ]" to ...
* progmodes/f90.el (f90-mode-map): ... f90-insert-end.
* nxml/nxml-mode.el (nxml-mode-map): ... nxml-finish-element.
* textmodes/tex-mode.el (tex-mode-map): ... latex-close-block.
* textmodes/sgml-mode.el (sgml-mode-map): ... sgml-close-tag.

* lisp/textmodes/flyspell.el (flyspell-mode): If there was an error,
say what it was.

Otherwise someone is going to report the same meaningless bug for the
rest of time.

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5574
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5576
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7272