* fns.c: Fix minor problems prompted by GCC 4.6.0 warnings.

(crypto_hash_function): Now static.
Fix pointer signedness problems.  Avoid unnecessary initializations.

* doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.

Support X clipboard managers.

* lisp/select.el (xselect-convert-to-targets): Add MULTIPLE target to list.
(xselect-convert-to-save-targets): New function.

* src/xselect.c: Support for clipboard managers.
(Vselection_alist): Move to termhooks.h as terminal-local var.
(LOCAL_SELECTION): New macro.
(x_atom_to_symbol): Handle x_display_info_for_display fail case.
(symbol_to_x_atom): Remove gratuitous arg.
(x_handle_selection_request, lisp_data_to_selection_data)
(x_get_foreign_selection, Fx_register_dnd_atom): Callers changed.
(x_own_selection, x_get_local_selection, x_convert_selection): New
arg, specifying work frame.  Use terminal-local Vselection_alist.
(some_frame_on_display): Delete unused function.
(Fx_own_selection_internal, Fx_get_selection_internal)
(Fx_disown_selection_internal, Fx_selection_owner_p)
(Fx_selection_exists_p): New optional frame arg.
(frame_for_x_selection, Fx_clipboard_manager_save): New functions.
(x_handle_selection_clear): Don't treat other terminals with the
same keyboard specially.  Use the terminal-local Vselection_alist.
(x_clear_frame_selections): Use Frun_hook_with_args.

* src/termhooks.h (Vselection_alist): Make it terminal-local.

* src/terminal.c (create_terminal): Initialize it.

* src/xterm.c (x_term_init): Intern ATOM and CLIPBOARD_MANAGER atoms.

* src/xterm.h: Add support for those atoms.

Merge from emacs-23; up to 2010-06-12T10:58:54Z!romain@orebokech.com.

mail/sendmail.el (mail-encode-header): Avoid double encoding by let-binding rfc2047-encode-encoded-words to nil.

* lisp/mail/emacsbug.el: Don't require url-util.

* lisp/shell.el (shell-directory-tracker): Case matters.  (Bug#8735)

Tweak previous modes.texi change.

Make set-auto-mode respect mode: entries at the end of the file (bug#8586)

* lisp/files.el (set-auto-mode):
Also respect mode: entries at the end of the file.

* doc/lispref/modes.texi (Auto Major Mode):
Update for set-auto-mode changes.

* doc/emacs/custom.texi (Specifying File Variables):
Major modes no longer need come first.

* etc/NEWS: Mention this.

Repeat previous gnus-group.el change for bugs.debian.org.

* lisp/gnus/gnus-group.el (gnus-bug-group-download-format-alist):
Use the "maintainer" version of debian reports as well.

src/xselect.c (x_handle_selection_request): Fix typo in last change.

* src/xselect.c: ICCCM-compliant handling of MULTIPLE targets.
(converted_selections, conversion_fail_tag): New global variables.
(x_selection_request_lisp_error): Free the above.
(x_get_local_selection): Remove unnecessary code.
(x_reply_selection_request): Args changed; handle arbitrary array
of converted selections stored in converted_selections.  Separate
the XChangeProperty and SelectionNotify steps.
(x_handle_selection_request): Rewrite to handle MULTIPLE target.
(x_convert_selection): New function.
(x_handle_selection_event): Simplify.
(x_get_foreign_selection): Don't ignore incoming requests while
waiting for an answer; this will fail when we implement
SAVE_TARGETS, and seems unnecessary anyway.
(selection_data_to_lisp_data): Recognize ATOM_PAIR type.
(Vx_sent_selection_functions): Doc fix.

* variables.texi (File Local Variables): More hack-local-variables details.

Restrict regexp match in previous emacsbug.el change.

* lisp/files.el (hack-local-variables, hack-local-variables-apply): Doc fixes.

Downcase mode names in recent files.el changes.

* lisp/files.el (hack-local-variables-prop-line, hack-local-variables):
Downcase mode names, as seems to be traditional.

Allow empty regions in transpose-regions

See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8699.

Adjust prompt in previous emacsbug.el change.

* configure.in: Comment fix.

Tiny doc/lispref/variables.texi update.

* doc/lispref/variables.texi (File Local Variables):
Update hack-local-variables `mode-only' return value.

Try to check From address in bug reports (bug#8038)

* lisp/mail/emacsbug.el (report-emacs-bug): Mention checking From address.
(report-emacs-bug-hook): Try to validate the From address.

Minor gnus-group.el change.

* lisp/gnus/gnus-group.el (gnus-bug-group-download-format-alist):
Use the "maintainer" version of debbugs.gnu.org reports.

Auto-commit of generated files.

* textmodes/rst.el (rst-define-level-faces): Do not define face
symbol if it is already defined.

* lib-src/Makefile.in (all, clean): Use $EXE_FILES.

Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.

Take account of periodic fringe bitmap's dependency on y-position in redrawing.

* dispextern.h (struct glyph_row): New member fringe_bitmap_periodic_p.

* dispnew.c (shift_glyph_matrix, scrolling_window): Mark scrolled row
for fringe update if it has periodic bitmap.
(row_equal_p): Also compare left_fringe_offset, right_fringe_offset,
and fringe_bitmap_periodic_p.

* fringe.c (get_fringe_bitmap_data): New function.
(draw_fringe_bitmap_1, update_window_fringes): Use it.
(update_window_fringes): Record periodicity of fringe bitmap in glyph
row.  Mark glyph row for fringe update if periodicity changed.

* xdisp.c (try_window_reusing_current_matrix): Don't mark scrolled row
for fringe update unless it has periodic bitmap.

merge emacs-23

Small further clean-up in lib-src/Makefile.in

* lib-src/Makefile.in (.c.o): Remove (every .o file has an explicit rule).
(insrcdir): New.
(stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
Use $insrcdir to suppress unaesthetic ignored errors.
(clean): Simplify list of things to delete.

* lib-src/Makefile.in (movemail${EXEEXT}): Build in one step, not via .o file.

xdisp.c (get_next_display_element): Set correct it->face_id for a static composition.

Tiny simplifications in lib-src/Makfile.in

* lib-src/Makfile.in (REGEXPOBJ, REGEXPDEPS): Remove.  Replace by expansion.
(etags${EXEEXT}): Just depend on regex.o, not regex.h as well.

* Makefile.in (check): Just give a message if no test/ directory.

* configure.in: Avoid using variables inside AC_CONFIG_FILES.

* lisp/play/5x5.el (5x5-new-game, 5x5-randomize):
Reset 5x5-solver-output to nil when a new grid is cast.
(5x5-log-init, 5x5-log): Use defsubst instead of defmacro to shunt
these debugging traces, as defmacro breaks the compiled code.

* lisp/isearch.el (isearch-range-invisible): Use invisible-p.

Fixes: debbugs:8721

Auto-commit of generated files.

Reimplement trunk 2011-05-24T08:02:58Z!rgm@gnu.org in a way visible to automake.

* configure.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
(SUBDIR_MAKEFILES_IN): New output variable.
* Makefile.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES_IN): Let configure set it.

Auto-commit of generated files.

Revert 2011-05-24T08:02:58Z!rgm@gnu.org, for now at least.
Some automakes don't seem to like it (?).

Mention function `sha1' and the removal of sha1.el in NEWS

gnus-art.el (gnus-mime-delete-part): Fix mm-handle-filename usage.

Implement primitive `sha1' and remove sha1.el

Remove dead code in configure.in.

* configure.in: Remove test for already configured source directory.
AM_INIT_AUTOMAKE has already done a more stringent test.  (Bug#953)

Add crypto/sha1 module from gnulib

* Makefile.in (TAGS, tags, check): Pass MFLAGS to sub-makes.

Define the list of subdir Makefiles only in configure.in.

* configure.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
(SUBDIR_MAKEFILES_IN): New output variable.
* Makefile.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES_IN): Let configure set it.

Auto-commit of generated files.

Fix previous Makefile change.

* configure.in (OPT_MAKEFILES_IN): Use full path.
* Makefile.in (SUBDIR_MAKEFILES_IN): Use full path.
(SUBDIR_MAKEFILES): Use relative path.

Auto-commit of generated files.

Restore test/ to its non-distributed state (bug#8107)

* make-dist: Don't distribute test/.
* configure.in (OPT_MAKEFILES_IN): New output variable.
(AC_CONFIG_FILES): Conditionally include test/automated/Makefile.
* Makefile.in (OPT_MAKEFILES_IN): New, set by configure.
(SUBDIR_MAKEFILES_IN): Use $OPT_MAKEFILES_IN.
(check): Give an explicit error if test/ is not present.

Merge from emacs-23; up to 2010-06-11T21:26:13Z!lekktu@gmail.com.

* lib-src/Makefile.in (update-game-score${EXEEXT}): Use a single rule.

Eliminate some duplication in top-level Makefile.in.

* Makefile.in (SUBDIR_MAKEFILES_IN): New variable.
(SUBDIR_MAKEFILES): Derive from $SUBDIR_MAKEFILES_IN.
(Makefile): Use $SUBDIR_MAKEFILES_IN.

* lisp/progmodes/python.el (brm-menu): Declare.

* lisp/emulation/viper.el (viper-set-hooks): Declare.

Small cleanup of recent 5x5.el changes.

* lisp/play/5x5.el (5x5-log-init, 5x5-log): Evaluate when compiling.
(5x5-log-init, 5x5-log, 5x5-solver): Doc fixes.
(math-map-vec, math-sub, math-mul, math-make-intv, math-reduce-vec)
(math-format-number, math-pow, calcFunc-arrange, calcFunc-cvec)
(calcFunc-diag, calcFunc-trn, calcFunc-inv, calcFunc-mrow)
(calcFunc-mcol, calcFunc-vconcat, calcFunc-index): Declare.

Add an :exit-function for completion-at-point.
* lisp/minibuffer.el (completion--done): New fun.
(completion--do-completion): Use it.  New arg `expect-exact'.
(minibuffer-complete, minibuffer-complete-word): Don't output message,
since completion--do-completion does it for us now.
(minibuffer-force-complete): Use completion--done and
completion--replace.  Handle sole-completion case with more care.
(minibuffer-complete-and-exit): Use new `expect-exact' arg.
(completion-extra-properties): New var.
(completion-annotate-function): Make obsolete.
(minibuffer-completion-help): Adjust accordingly.
Use completion-list-insert-choice-function.
(completion-at-point, completion-help-at-point):
Bind completion-extra-properties.
(completion-pcm-word-delimiters): Add | (for uniquify, for example).
* lisp/simple.el (completion-list-insert-choice-function): New var.
(completion-setup-function): Preserve it.
(choose-completion): Pay attention to it, shuffle the code a bit.
(choose-completion-string): New arg `insert-function'.

* lisp/textmodes/bibtex.el: Convert to lexical binding.
(bibtex-mode-map): Use completion-at-point.
(bibtex-mode): Use define-derived-mode&completion-at-point-functions.
(bibtex-completion-at-point-function): New fun, from bibtex-complete.
(bibtex-complete): Define as obsolete alias.
(bibtex-complete-internal): Remove.
(bibtex-format-entry): Remove unused sub-group in regexp.
* lisp/shell.el (shell--command-completion-data)
(shell-environment-variable-completion):
* lisp/pcomplete.el (pcomplete-completions-at-point):
* lisp/comint.el (comint--complete-file-name-data): Use :exit-function
instead of completion-table-with-terminator so it also works for
choose-completion.

* lib/verify.h: Merge from gnulib.

Don't quote lambda expressions with `quote'.

* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.

Fixes: debbugs:8710

* lisp/emacs-lisp/lisp.el (up-list): Fix forward movement.

Fixes: debbugs:8708

* allout.el (allout-inhibit-auto-fill-on-headline): Create new
customization variable and implement: If non-nil, auto-fill will be
inhibited while on topic's header line.

* lisp/play/5x5.el: I/ Add an arithmetic solver to suggest positions to
click on. II/ Make 5x5 multisession. III/ Ensure that random grids
always have a solution in grid size = 5 cases.
(5x5-mode-map): Add keybinding to function `5x5-solve-suggest'.
(5x5-solver-output, 5x5-log-buffer): New vars.
(5x5-grid, 5x5-x-pos, 5x5-y-pos, 5x5-moves, 5x5-cracking):
Make these variables buffer local to achieve 5x5 multi-session-ness.
(5x5): Set 5x5-grid-size only if SIZE is non-negative.
(5x5-grid-to-vec, 5x5-vec-to-grid, 5x5-log-init, 5x5-log, 5x5-solver)
(5x5-solve-suggest): New funs.
(5x5-randomize): Use 5x5-make-move instead of 5x5-flip-cell to
randomize a grid so that we ensure that there is always a solution.
(5x5-make-random-grid): Allow other movement than flipping.

* lisp/emacs-lisp/advice.el (ad-read-advised-function):
Use `function-called-at-point' as the default default, if it has
advice and passes PREDICATE.

RFC2047-encode header of outgoing mails.

* lisp/emacs-lisp/bytecomp.el (byte-compile-function-form): Only call
byte-compile-lambda if it's actually a lambda.

* lisp/emacs-lisp/eieio.el (eieio-defgeneric-form-primary-only-one):
Fix function quoting.  Use backquote better.

* gnutls.c: Remove unused macros.

(fn_gnutls_transport_set_lowat, fn_gnutls_transport_set_pull_function):
(fn_gnutls_transport_set_push_function) [!WINDOWSNT]:
Remove macros that are defined and never used.
Caught by gcc -Wunused-macros (GCC 4.6.0, Fedora 14).

Remove var mistakenly introduced in 2011-05-22T19:46:47Z!cyd@stupidchicken.com.

* src/xselect.c (syms_of_xselect): Remove unused symbol SAVE_TARGETS.
(Fx_get_selection_internal): Minor cleanup.
(Fx_own_selection_internal): Rename arguments for consistency with
select.el.

Merge from mainline.

* xselect.c (QSAVE_TARGETS): New static var, to fix build failure.

Merge from gnulib.

Make rng-xsd-check-pattern case sensitive (Bug#8516).

* nxml/rng-xsd.el (rng-xsd-check-pattern): Use case-sensitive
matching.

* src/xselect.c (syms_of_xselect): Include character.h; use DEFSYM.

Maked "edited" tag stand out in vc-dir (Bug#8178).

* vc/vc-dir.el (vc-default-dir-printer): Give edited tag a
different face.

Fix diff-changed face definition.

* lisp/vc/diff-mode.el (diff-changed): Don't use terminal specs for
defface (Bug#8144).

Doc fixes for mule.texi.

* mule.texi (Specify Coding, Text Coding, Communication Coding):
(File Name Coding, Terminal Coding): Add command names (Bug#8312).

Mark last change as tiny.

Fix for sc-nested-citation-p in supercite.el.

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=109145

* mail/supercite.el (sc-default-cite-frame): Handle
sc-nested-citation-p when sc-cite-blank-lines-p is non-nil.

* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Convert ' to #' for
funcall as well.  Warn when performing those conversions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-form): Fix error report.

Fixes: debbugs:8712

* lisp/progmodes/grep.el (grep-mode): Fix it for good!

Fixes: debbugs:8684

Further tweak previous files.el change.

* lisp/files.el (hack-local-variables): In the MODE-ONLY case, try to
ignore minor modes.

Tweak previous files.el change.

* lisp/files.el (hack-local-variables-prop-line)
(hack-local-variables): In the MODE-ONLY case, return the full mode
symbol, including "-mode".

More small hack-local-variables tweaks for MODE-ONLY case.

* lisp/files.el (hack-local-variables-prop-line): Small simplifications.
(hack-local-variables, hack-local-variables-prop-line):
If MODE-ONLY, return the mode, rather than just `t'.

* lisp/progmodes/grep.el (grep-mode): Fix last change.

Fixes: debbugs:8684

Small files.el hack-local changes for mode-only case.

* lisp/files.el (hack-local-variables-prop-line, hack-local-variables):
If only interested in the mode, don't bother doing the other stuff.

* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.

Auto-commit of loaddefs files.

* Makefile.in (AUTOMAKE_INPUTS): Add $(srcdir)/lib/gnulib.mk.

* lib-src/etags.c: Fix typo in previous comment change.

Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri@jurta.org.

image-mode fix for bug#8567.

* image-mode.el (image-after-revert-hook):
Redraw all frames on which the image is visible.

* lib-src/etags.c: Comment.

* dired-aux.el (dired-touch-initial): Just use current-time.  (Bug#6887)

* wid-edit.el (widget-checklist-match-inline): Fix 2011-04-19 change.  (Bug#8649)

* src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files.

* src/Makefile.in ($(etc)/DOC): Make second command line even shorter.

* dispnew.c (scrolling_window): Don't exclude the case that the
last enabled row in the desired matrix touches the bottom boundary.

* lisp/emacs-lisp/checkdoc.el (checkdoc-sentencespace-region-engine):
Also allow singlespace after single-letter capitals followed by a dot.