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.

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

* lisp/nxml/nxml-mode.el (nxml-electric-slash): Reindent when completion is
enabled.  Suggested by James Ahlborn <jahlborn@gmail.com>.

Fixes: debbugs:8704

.bzrignore: Add lib/stdio.in-h, lib/stdbool.h, and lib/stdint.h.

Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org, 2011-05-20T00:41:03Z!rgm@gnu.org.

 config.bat: Concatenate lisp.mk onto the end of src/Makefile.
 msdos/sed1v2.inp (make-docfile commands): Recognize only if the line
 begins with a TAB.  Use $(etc) rather than a literal "../etc".
 (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
 (@lisp_frag@): Edit out.
 msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
 zero.
 src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to
 report_file_error introduced by the change from 2011-05-07.

* systime.h (Time): Define only if emacs is defined.

This is to allow ../lib-src/profile.c to be compiled on FreeBSD,
where the include path doesn't have X11/X.h by default.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.

gnus-sum.el (gnus-summary-hide-thread): Fix bug where moving to hide the thread moves us backwards and so we loop forever.

merge trunk

Small break-hardlink-on-save fix.

* files.el (basic-save-buffer-2):
Fix handling of break-hardlink-on-save with non-existent files.

composite.c (find_automatic_composition): Fix previous change.

Auto-commit of generated files.

Remove $shortlisp from src/Makefile.in.

* configure.in (lisp_frag): New output file.

* src/lisp.mk: New file, split from Makefile.in, and inheriting its
  copyright years.
* src/Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
(shortlisp): Remove.
($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.

* lisp/loadup.el, doc/misc/Makefile.in: Comment changes.

mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading whitespace in base64 data lines.

* lisp/net/rcirc.el (rcirc-markup-urls): Check if rcirc-url-regexp is nil.

* lisp/net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil.

Fix whitespace in previous change.

* doc/lispref/lists.texi (Sets And Lists): Mention cl provides union etc.

Misc small lispref fixes.

* windows.texi (Displaying Buffers): pop-to-buffer is not a command.

* text.texi (Parsing HTML): Update for function name changes.

* syntax.texi (Syntax Flags): Small fix.

* keymaps.texi (Active Keymaps): Typo fix.
(Changing Key Bindings): Grammar fix.

* frames.texi (Minibuffers and Frames): Grammar fix.
(Window System Selections): x-select-enable-clipboard now defaults to t.

* customize.texi (Common Keywords):
* display.texi (Abstract Display):
* modes.texi (Auto-Indentation):
* nonascii.texi (Converting Representations): Typo fixes.

* control.texi (Examples of Catch): Call it "goto" not "go to".

Auto-commit of generated files.

* lisp/progmodes/f90.el (f90-type-def-re): Handle "type, bind(c)".  (Bug#8691)

Remove the SOME_MACHINE_LISP distinction in src/Makefile.in.

See discussion in http://debbugs.gnu.org/8302

* configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(WINDOW_SUPPORT): Remove output variables that are no longer used.

* lib-src/makefile.w32-in (echolisp): Remove rule that is no longer needed.
(clean): No more echolisp.tmp.

* .bzrignore: Remove lib-src/echolisp.tmp.

* lisp/emacs-lisp/autoload.el (batch-update-autoloads):
Set autoload-excludes by parsing lisp/loadup.el rather than Makefiles.

* lisp/loadup.el: Update commentary.

* msdos/sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
* msdos/sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT)
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more.

* src/Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
(lisp): Set the order to that of loadup.el.
(shortlisp): Make it a copy of $lisp.
(SOME_MACHINE_LISP): Remove.
($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
Use just $shortlisp, not $SOME_MACHINE_LISP too.

merge trunk

gnus.texi (Gnus Registry Setup): Rename from "Setup".
 (Store custom flags and keywords): Mention `gnus-registry-user-format-function-M' and `gnus-registry-user-format-function-M2'.
gnus-registry.el (gnus-registry-user-format-function-M): Use `mapconcat'.
 (gnus-registry-user-format-function-M2): Use to see the full text of the marks.  Make "," the mark text separator.

nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication with auth-source.

Make find_automatic_composition more efficient.

* net/tramp.el (tramp-process-actions): Set "first-password-request"
property for the correct connection in case of multihops.

lisp/ChangeLog: Fix typos.

src/makefile.w32-in: Update dependencies.

Auto-commit of generated files.

Fix last commit.

ChangeLog changes for 2011-05-18T00:35:01Z!eggert@cs.ucla.edu.

 ChangeLog: Entry for gnulib sync.
 doc/misc/ChangeLog: Entry for gnulib sync.

* lisp/emacs-lisp/authors.el (authors-fixed-entries): Remove fakemail.c

Remove lib-src/fakemail.c.

* lib-src/fakemail.c: Remove file.

* lib-src/Makefile.in (UTILITIES): Remove fakemail${EXEEXT}.
(fakemail${EXEEXT}): Remove rule.

* lib-src/makefile.w32-in ($(BLD)/fakemail.exe, fakemail)
($(BLD)/fakemail.$(O)): Remove.

* lisp/mail/sendmail.el (sendmail-program): Fall back to just "sendmail".

* lisp/mail/feedmail.el: Update commentary.

* doc/emacs/ack.texi (Acknowledgments): Remove fakemail.c.

* etc/NEWS: Mention this.

* INSTALL: Remove fakemail.

Rationalize calendar handling of day and month abbrev-arrays.

* lisp/calendar/calendar.el (calendar-customized-p): New function.
(calendar-abbrev-construct, calendar-make-alist): Change what it does.
(calendar-day-name-array, calendar-month-name-array): Doc fix.
Add :set function.
(calendar-abbrev-length, calendar-day-abbrev-array)
(calendar-month-abbrev-array): Make defcustoms, with appropriate :set.
(calendar-day-abbrev-array, calendar-month-abbrev-array):
Elements may no longer be nil.
(calendar-day-name, calendar-month-name):
Update for changed nature of abbrev arrays.
* calendar/diary-lib.el (diary-name-pattern):
Update for changed nature of abbrev arrays.
(diary-mark-entries-1): Update calendar-make-alist calls.
(diary-font-lock-date-forms): Doc fix for changed abbrev arrays.
* calendar/cal-html.el (cal-html-day-abbrev-array):
Simply inherit from calendar-day-abbrev-array.

* etc/NEWS: Mention this.

Last commit was missing updated source file.

* menu.c: Include limits.h (fixes the MS-Windows build broken by
revision 2011-05-18T00:52:24Z!eggert@cs.ucla.edu).

Add header for integer overflow fixes.

Merge from mainline.

Merge from gnulib.

* src/term.c (Fresume_tty): Restore hooks before reinitializing.

Fixes: debbugs:8687

nt/README.W32: Add information about GnuTLS libraries.

* lisp/progmodes/grep.el (grep-mode): Disable default
compilation-directory-matcher setting.

Fixes: debbugs:8684

* net/tramp.el (tramp-handle-insert-file-contents): Use "dd"
instead of "head" and "tail".  There were problems with SunOS 5.9,
and it performs better.

* lisp/calendar/appt.el: Fix doc typo in previous.

* INSTALL: Mention yum-builddep.

* lisp/progmodes/cc-defs.el: Comment change.

* lisp/mail/mail-utils.el (mail-dont-reply-to): Silence compiler.

* idlw-shell.el (idlwave-shell-complete-filename): Replace obsolete function.

* lisp/shell.el (pcomplete-parse-arguments-function): Declare.

appt.el mainly doc fixes.

* lisp/calendar/appt.el (appt-message-warning-time, appt-display-mode-line)
(appt-display-diary, appt-display-interval, appt-prev-comp-time)
(appt-check): Doc fixes.
(appt-disp-window-function, appt-delete-window-function):
Remove needless special case in custom :type.
(appt-display-count): Default to 0, not nil.
(appt-check): Reset appt-display-count to 0, not nil.

* gnus-group.el (gnus-import-other-newsrc-file): Use insert-file-contents.

* doc/misc/gnus.texi (Face): Fix typo.

Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.

gnus-sum.el (gnus-summary-hide-all-threads): Add update message every 1000 iterations.

* lisp/emacs-lisp/eieio.el (defmethod): Fix quoting of code.

Fixes: debbugs:8677

* lisp/info-look.el (makefile-automake-mode): New setups, looking in
automake manual, then makefile-mode.
(makefile-mode): Remove automake manual, have it just in
makefile-automake-mode since there's various things different or
not relevant to plain make.
(makefile-mode): Remove "other-modes" non-existent automake-mode,
believe a hypothetical automake-mode would go to makefile-mode,
not the other way around.

nntp.el (nntp-open-connection): Check if process-type is available.

Fix last entry in leim/ChangeLog.

Fix last change

Actually add leim/quail/persian.el.

New input methods for Persian/Farsi.

 leim/quail/persian.el: New file.
 leim/Makefile.in (OTHERS): Add $(srcdir)/quail/georgian.elc.
 leim/makefile.w32-in (MISC): Add $(srcdir)/quail/georgian.elc.
 etc/NEWS: Mention the new input methods.

shr.el (shr-tag-del): Add support for del tag.

Merge from mainline.

* character.c: Minor spelling and indenting fixes.

* w32menu.c: Change 'unsigned long' to 'Time' in #if-0 code.

* insdel.c (count_size_as_multibyte): Check for string overflow.

* character.c (lisp_string_width): Check for string overflow.

Use EMACS_INT, not int, for string indexes and lengths; in
particular, 2nd arg is now EMACS_INT, not int.  Do not crash if
the resulting string length overflows an EMACS_INT; instead,
report a string overflow if no precision given.  When checking for
precision exhaustion, use a check that cannot possibly have
integer overflow.  (Bug#8675)
* character.h (lisp_string_width): Adjust to new signature.

* alloc.c (string_overflow): New function.

(Fmake_string): Use it.  This doesn't change behavior, but saves
a few bytes and will simplify future changes.
* character.c (string_escape_byte8): Likewise.
* lisp.h (string_overflow): New decl.

* vc/diff-mode.el (diff-fixup-modifs): Remove stray ')' (Bug#8672).

Merge from gnulib.

* lisp/vc/diff-mode.el: Fix paren typo.

Merge: user-interface timestamps and other int overflow patches.

Backport fix for Bug#8672 from trunk

Text-fitting fixes for printed Emacs manual on 7x9 paper.

* building.texi (Flymake, Breakpoints Buffer):
* calendar.texi (Appointments):
* cmdargs.texi (General Variables, Display X):
* custom.texi (Saving Customizations, Face Customization)
(Directory Variables, Minibuffer Maps, Init Rebinding):
* display.texi (Font Lock, Font Lock, Useless Whitespace):
* fixit.texi (Spelling):
* frames.texi (Creating Frames, Fonts):
* help.texi (Help Files):
* mini.texi (Minibuffer File):
* misc.texi (emacsclient Options, Emulation):
* msdog.texi (Windows Startup, Windows HOME, Windows Fonts):
* mule.texi (International Chars, Language Environments)
(Select Input Method, Modifying Fontsets, Charsets):
* programs.texi (Custom C Indent):
* rmail.texi (Rmail Labels):
* text.texi (Table Conversion):
* trouble.texi (Known Problems, Known Problems):
* windows.texi (Change Window):
* xresources.texi (GTK resources): Reflow text and re-indent code
examples to avoid TeX overflows and underflows on 7x9 paper.

* emacs.texi: Fix the (commented out) smallbook command.

* macos.texi (Mac / GNUstep Events):
* xresources.texi (Lucid Resources): Remove extraneous examples.

Backport fix for Bug#8672 from trunk

Fix minor bug of diff-fixup-modifs on small diffs (Bug#8672).

* vc/diff-mode.el (diff-fixup-modifs): Locate correct position for
hunk-end tags.

Bind = to diff command in vc-annotate mode (Bug#8671)

* lisp/vc/vc-annotate.el (vc-annotate-mode-map): Bind = to
vc-annotate-show-diff-revision-at-line.

Auto-commit of generated files.

add-log font-lock fix for mutilple authors (bug#8644)

* lisp/vc/add-log.el (change-log-font-lock-keywords): Also handle multiple
author lines with leading tabs.

add-log.el fix for multiple author entries (bug#8645)

* lisp/vc/add-log.el (add-change-log-entry): Don't start adding a new entry
in the middle of an existing one with multiple authors.

Remove obsolete comment.

Use a single Author: header.

* lisp/allout.el: Comment fix.

* doc/misc/dired-x.texi (Omitting Examples): Minor addition.

Make configure.in give an error if no X-toolkit was detected.

* configure.in: Treat failure to find an X toolkit the same way we treat
failure to find X and image support.

appt.el trivia.

* lisp/calendar/appt.el (appt-check): Rename some local variables.
Some simplification/reordering.

* admin/notes/bugtracker: Small updates.

* admin/notes/bzr: Update changelog_merge branch details.

* msdos.c (mouse_get_pos): Likewise.

* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.

* lisp/mail/feedmail.el (bbdb-dwim-net-address, vm-mail): Declare.

Clean-up previous feedmail.el merge.

* lisp/mail/feedmail.el (feedmail-confirm-outgoing-timeout)
(feedmail-sendmail-f-doesnt-sell-me-out)
(feedmail-queue-slug-suspect-regexp, feedmail-debug)
(feedmail-debug-sit-for, feedmail-queue-express-hook)
(feedmail-queue-runner-message-sender): Set :version.
(bbdb-search, bbdb-records, smtp-via-smtp, smtp-server): Declare.
(feedmail-binmail-gnulinuxish-template):
Rename from feedmail-binmail-linuxish-template.
(feedmail-buffer-to-smtp, feedmail-vm-mail-mode):
Use insert-buffer-substring.

newsticker: Added README to etc/newsticker/images

etc/ChangeLog:

2011-05-14  Ulf Jasper  <ulf.jasper@web.de>

* images/newsticker/README: Added.

Update from version on author's website.

* lisp/mail/feedmail.el (feedmail-patch-level): Increase.
(feedmail-debug): New custom group.
(feedmail-confirm-outgoing-timeout)
(feedmail-sendmail-f-doesnt-sell-me-out)
(feedmail-queue-slug-suspect-regexp, feedmail-debug)
(feedmail-debug-sit-for, feedmail-queue-express-hook): New options.
(feedmail-sender-line, feedmail-from-line)
(feedmail-fiddle-headers-upwardly, feedmail-enable-spray)
(feedmail-spray-this-address, )
(feedmail-spray-address-fiddle-plex-list)
(feedmail-queue-use-send-time-for-date)
(feedmail-queue-use-send-time-for-message-id)
(feedmail-last-chance-hook, feedmail-queue-runner-mode-setter)
(feedmail-buffer-eating-function):
Doc fixes.
(feedmail-spray-via-bbdb, feedmail-buffer-to-smtp)
(feedmail-vm-mail-mode, feedmail-message-action-scroll-up)
(feedmail-message-action-scroll-down): New functions.
(feedmail-queue-directory, feedmail-queue-draft-directory):
Use expand-file-name.
(feedmail-prompt-before-queue-standard-alist): Add scroll entries.
Remove C-v help entry.
(feedmail-queue-buffer-file-name): New variable.
(feedmail-mail-send-hook-splitter, feedmail-buffer-to-binmail)
(feedmail-buffer-to-smtpmail, feedmail-queue-express-to-draft)
(feedmail-message-action-send-strong, feedmail-message-action-edit)
(feedmail-message-action-draft, feedmail-message-action-draft-strong)
(feedmail-message-action-queue, feedmail-message-action-queue-strong)
(feedmail-message-action-toggle-spray)
(feedmail-run-the-queue-no-prompts)
(feedmail-run-the-queue-global-prompt, feedmail-queue-reminder)
(feedmail-look-at-queue-directory, feedmail-queue-subject-slug-maker)
(feedmail-create-queue-filename, feedmail-rfc822-time-zone):
(feedmail-fiddle-header, feedmail-give-it-to-buffer-eater)
(feedmail-envelope-deducer, feedmail-fiddle-from)
(feedmail-fiddle-sender, feedmail-default-date-generator)
(feedmail-fiddle-date, feedmail-fiddle-message-id)
(feedmail-fiddle-spray-address)
(feedmail-fiddle-list-of-spray-fiddle-plexes)
(feedmail-fiddle-list-of-fiddle-plexes)
(feedmail-fill-to-cc-function, feedmail-fill-this-one)
(feedmail-one-last-look, feedmail-fqm-p): Add debug calls.
(feedmail-queue-runner-message-sender, feedmail-binmail-template):
Change default.  Doc fix.
(feedmail-queue-runner-cleaner-upper): Use feedmail-say-chatter.
(feedmail-binmail-linuxish-template): New constant.
(feedmail-buffer-to-sendmail): Doc fix.  Add debug call.
Respect feedmail-sendmail-f-doesnt-sell-me-out.
(feedmail-send-it): Add debug call.
Use feedmail-queue-buffer-file-name, and
feedmail-send-it-immediately-wrapper.
(feedmail-message-action-send): Add debug call.
Use feedmail-send-it-immediately-wrapper.
(feedmail-queue-express-to-queue): Add debug call.
Run feedmail-queue-express-hook.
(feedmail-message-action-help): Add debug call.  Use feedmail-p-h-b-n.
(feedmail-message-action-help-blat):
Rename from feedmail-queue-send-edit-prompt-help-first.
(feedmail-run-the-queue): Add debug call.  Set buffer-file-type.
Check line-endings.  Handle errors better.
(feedmail-queue-reminder-brief, feedmail-queue-reminder-medium):
Doc fix.  Add debug call.
(feedmail-queue-send-edit-prompt): Doc fix.  Add debug call.
Use feedmail-queue-send-edit-prompt-inner.
(feedmail-queue-runner-prompt, feedmail-scroll-buffer): New functions.
(feedmail-queue-send-edit-prompt-inner): New function, extracted
from feedmail-queue-send-edit-prompt.
(feedmail-queue-send-edit-prompt-help)
(feedmail-queue-send-edit-prompt-help-later): Remove functions.
(feedmail-tidy-up-slug): Add debug call.
Respect feedmail-queue-slug-suspect-regexp.
(feedmail-queue-subject-slug-maker): Use buffer-substring-no-properties.
(feedmail-dump-message-to-queue): Add debug call.
Expand queue-directory.
(feedmail-dump-message-to-queue): Change message slightly.
Use feedmail-say-chatter.
(feedmail-rfc822-date): Add debug call.  Bind system-time-locale.
(feedmail-send-it-immediately-wrapper): New function.
(feedmail-send-it-immediately): Add debug calls.  Use let not let*.
Insert empty string rather than newline.  Handle full-frame case.
Use catch/throw.  Use feedmail-say-chatter.
(feedmail-fiddle-from): Try mail-host-address.
(feedmail-default-message-id-generator): Doc fix.
Bind system-time-locale.  Handle missing end.
(feedmail-fiddle-x-mailer): Add debug call.
Handle feedmail-x-mailer-line being nil.
(feedmail-accume-n-nuke-header, feedmail-deduce-address-list):
Add debug call.  Use buffer-substring-no-properties.
(feedmail-say-debug, feedmail-say-chatter): New functions.
(feedmail-find-eoh): Give an explicit error.

Fix minor errors in ELisp manual.

 doc/lispref/nonascii.texi (Character Properties): Fix inconsistencies with
 implementation.

Fixups, following up to the user-interface timestamp change.

* nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
for UI timestamps, instead of unsigned long.
* w32gui.h (Time): Define by including "systime.h" rather than by
declaring it ourselves.  (Bug#8664)