* 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)

Fix bug #8652 with indentation of variable docs.

 doc/lispref/text.texi (Special Properties): Move @defvar's out of the
 @table.

newsticker: Moved icons to etc/newsticker/images

lisp/ChangeLog:

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

* net/newst-treeview.el (newsticker-treeview-face): Changed default
family from helvetica to sans.
(newsticker-treeview-tool-bar-map): Moved tool-bar icons to
etc/images/newsticker.

* net/newst-reader.el (newsticker-feed-face): Changed default
family from helvetica to sans.

* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face): Changed default family from
helvetica to sans.
(newsticker--plainview-tool-bar-map): Moved tool-bar icons to
etc/images/newsticker.

* net/newst-backend.el (newsticker--do-run-auto-mark-filter),
(newsticker--process-auto-mark-filter-match): : Tell user about
auto-marking.

etc/ChangeLog:

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

* images/newsticker: Added.
* images/newsticker/browse-url.xpm: Added.
* images/newsticker/get-all.xpm: Added.
* images/newsticker/mark-immortal.xpm: Added.
* images/newsticker/mark-read.xpm: Added.
* images/newsticker/narrow.xpm: Added.
* images/newsticker/next-feed.xpm: Added.
* images/newsticker/next-item.xpm: Added.
* images/newsticker/prev-feed.xpm: Added.
* images/newsticker/prev-item.xpm: Added.
* images/newsticker/update.xpm: Added.

Common Lisp indentation improvements on defmethod and lambda-lists.
* cl-indent.el: Advertise the changes and remove obsolete TODO entries.
(lisp-lambda-list-keyword-parameter-indentation)
(lisp-lambda-list-keyword-parameter-alignment)
(lisp-lambda-list-keyword-alignment): New customizable user options.
(lisp-indent-defun-method): Improve docstring.
(extended-loop-p): Fix comment.
(lisp-indent-lambda-list-keywords-regexp): New variable.
(lisp-indent-lambda-list): New function.
(lisp-indent-259): Use it.
(lisp-indent-defmethod): Support for more than one
method qualifier and properly indent methods lambda-lists.
(defgeneric): Provide a missing common-lisp-indent-function property.

newsticker: Moved icons to etc/newsticker/images

lisp/ChangeLog:

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

* net/newst-treeview.el (newsticker-treeview-face): Changed default
family from helvetica to sans.
(newsticker-treeview-tool-bar-map): Moved tool-bar icons to
etc/images/newsticker.

* net/newst-reader.el (newsticker-feed-face): Changed default
family from helvetica to sans.

* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face): Changed default family from
helvetica to sans.
(newsticker--plainview-tool-bar-map): Moved tool-bar icons to
etc/images/newsticker.

* net/newst-backend.el (newsticker--do-run-auto-mark-filter),
(newsticker--process-auto-mark-filter-match): : Tell user about
auto-marking.

etc/ChangeLog:

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

* images/newsticker: Added.
* images/newsticker/browse-url.xpm: Added.
* images/newsticker/get-all.xpm: Added.
* images/newsticker/mark-immortal.xpm: Added.
* images/newsticker/mark-read.xpm: Added.
* images/newsticker/narrow.xpm: Added.
* images/newsticker/next-feed.xpm: Added.
* images/newsticker/next-item.xpm: Added.
* images/newsticker/prev-feed.xpm: Added.
* images/newsticker/prev-item.xpm: Added.
* images/newsticker/update.xpm: Added.

* fns.c: Fix misspellings.

* lisp/thingatpt.el (bounds-of-thing-at-point): Return nil rather than
bounds for the empty string.

Fixes: debbugs:8667

lisp/progmodes/python.el: Highlight keyword "nonlocal" (bug#8639).

gnus-html.el (gnus-html-put-image): Fix last change.

* editfns.c (Fformat): Fix several integer overflow problems.

For example, without this change, (format "%2147483648d" 1) dumps
core on x86-64 GNU/Linux.  Use EMACS_INT, not size_t, for sizes,
since we prefer using signed values, and EMACS_INT will be big
enough soon, even on 32-bit hosts.  Also, prefer EMACS_INT to int
for sizes.  Don't assume that pI is either "l" or ""; it might be
"ll" or "I64".  Check for width and precision greater than
INT_MAX, as this can make sprintf go kaflooey.  (Bug#8668)

gnus-html.el (gnus-html-put-image): Register a displayer.
shr.el (shr-image-displayer): Don't remove text props from alt text.

registry.el (prune-factor): New initialization parameter defaulting to 0.1.
 (registry-prune-hard): Use it.
gnus-registry.el (gnus-registry-fixup-registry): Set prune-factor to 0.1 expicitly.

* lisp/gnus/message.el (sendmail-program): Declare.

message.el trivia.

* lisp/gnu/message.el (message-send-mail-with-sendmail): Assume
sendmail-program is bound, since this function requires sendmail.

* lisp/mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail.

sendmail.el trivia.

* lisp/mail/sendmail.el (sendmail-program): Try executable-find first.
(sendmail-send-it): sendmail-program cannot be unbound.

* calendar/appt.el (appt-check): Change mode-line message at time of the appt.

* lisp/calendar/appt.el (appt-time-msg-list): Doc fix.

* lisp/calendar/appt.el (appt-make-list): Simplify.

Omit newline.

* dispextern.h (struct image): Don't assume time_t <= unsigned long.

* image.c (clear_image_cache): Likewise.

* term.c (term_mouse_position): Don't assume time_t wraparound.

Be more systematic about user-interface timestamps.

Before, the code sometimes used 'Time', sometimes 'unsigned long',
and sometimes 'EMACS_UINT', to represent these timestamps.  This
change causes it to use 'Time' uniformly, as that's what X uses.
This makes the code easier to follow, and makes it easier to catch
integer overflow bugs such as Bug#8664.
* frame.c (Fmouse_position, Fmouse_pixel_position):
Use Time, not unsigned long, for user-interface timestamps.
* keyboard.c (last_event_timestamp, kbd_buffer_get_event): Likewise.
(button_down_time, make_lispy_position, make_lispy_movement): Likewise.
* keyboard.h (last_event_timestamp): Likewise.
* menu.c (Fx_popup_menu) [!HAVE_X_WINDOWS]: Likewise.
* menu.h (xmenu_show): Likewise.
* term.c (term_mouse_position): Likewise.
* termhooks.h (struct input_event.timestamp): Likewise.
(struct terminal.mouse_position_hook): Likewise.
* xmenu.c (create_and_show_popup_menu, xmenu_show): Likewise.
* xterm.c (XTmouse_position, x_scroll_bar_report_motion): Likewise.
* systime.h (Time): New decl.  Pull it in from <X11/X.h> if
HAVE_X_WINDOWS, otherwise define it as unsigned long, which is
what it was before.
* menu.h, termhooks.h: Include "systime.h", for Time.

Add Bug#.

* keyboard.c (make_lispy_event): Fix problem in integer overflow.

Don't assume that the difference between two unsigned long values
can fit into an integer.  At this point, we know button_down_time
<= event->timestamp, so the difference must be nonnegative, so
there's no need to cast the result if double-click-time is
nonnegative, as it should be; check that it's nonnegative, just in
case.  This bug is triggered when events are more than 2**31 ms
apart (about 25 days).

* xselect.c (x_own_selection): Remove needless cast to unsigned long.

* lisp/progmodes/ld-script.el (ld-script-keywords)
(ld-script-builtins): Update keywords list.

* xselect.c (last_event_timestamp): Remove duplicate decl.

Put ChangeLog entries in the correct files.

* frame.h (struct frame): Use int for menu_bar_items_used

instead of EMACS_INT, since it always fits in int.

* xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes

that always fit in int.  Use a sentinel instead of a counter, to
avoid a temp and to allay GCC's concerns about possible int overflow.

* lisp/progmodes/grep.el (grep-filter): Don't trip on partial lines.

* lisp/shell.el (shell-completion-vars): New function.
(shell-mode):
* lisp/simple.el (read-shell-command): Use it.
(blink-matching-open): No need for " [...]" in minibuffer-message.

appt.el code simplifications.

* lisp/calendar/appt.el (appt-now-displayed): Remove pointless variable.
(appt-check): Simplify.

Details:
appt-now-displayed was set non-nil the first time a reminder was displayed.
Nothing ever set it back to nil again.  Thus when full-check was nil,
mode-line-only was always true, so the "(when (or full-check mode-line-only)"
was pointless.  That was the only use of full-check.  mode-line-only
was only used in a negative sense, and can be reduced to the zerop test.

* doc/lispref/display.texi (Image Descriptors): Fix typo.  (Bug#8495)

Small Makefile.in fixes for bug#8642.

* Makefile.in (src, install-arch-indep, bootstrap-clean, check-declare):
Shell portability fixes.

Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

* menu.c (grow_menu_items): Check for int overflow.

* xmenu.c (set_frame_menubar): Don't mishandle vectors with no nils.

bytecomp.el fix for bug#8647

* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
Let byte-compile-initial-macro-environment always take precedence.

* lisp/net/rcirc.el: Add support for SSL/TLS connections.
(rcirc-server-alist): New field `encryption'.
(rcirc): Check `encryption' settings.
(rcirc-connect): New arg `encryption'.  Use open-network-stream.
Merge make-local-variable into `set'.
(rcirc--connection-open-p): New function.
(rcirc-send-string, rcirc-clean-up-buffer): Use it to handle case where
the process is not a network process (e.g. running gnutls-cli).
(set-rcirc-decode-coding-system, set-rcirc-encode-coding-system):
Make rcirc-(en|de)code-coding-system local here.
(rcirc-mode): Merge make-local-variable into `set'.
(rcirc-parent-buffer): Make permanent buffer-local.
(rcirc-multiline-minor-mode): Don't do it here.
(rcirc-switch-to-server-buffer): Don't switch to a random buffer if
there's no server buffer.

* xterm.c: Use EMACS_INT for Emacs modifiers, and int for X modifiers.

Before, the code was not consistent.  These values cannot exceed
2**31 - 1 so there's no need to make them unsigned.
(x_x_to_emacs_modifiers): Accept int and return EMACS_INT.
(x_emacs_to_x_modifiers): Accept EMACS_INT and return int.
(x_x_to_emacs_modifiers, x_emacs_to_x_modifiers): Reject non-integers
as modifiers.
* xterm.h (x_x_to_emacs_modifiers): Adjust to signature change.

registry.el (registry-usage-test): Disable pruning test.

* lisp.h (XINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_INT.

(XUINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_UINT.
Otherwise, GCC 4.6.0 warns about printf (pI, XINT (...)),
presumably because the widths might not match.

* automated/gnus-tests.el: Require CL.