* thingatpt.el (thing-at-point-email-regexp): Don't require two chars
  before the "@" in an email address.  Andreas Roehler noticed this problem.

* thingatpt.el: Add support for email addresses (`email').
  (thing-at-point, bounds-of-thing-at-point): Document `email' support.
  (thing-at-point-email-regexp): New variable.
  (`email'): Put `bounds-of-thing-at-point' and `thing-at-point'
  properties on this symbol, with lambda forms for values.

* vc-bzr.el (vc-bzr-root): Cache the output of shell command execution.

* vc.el (vc-dired-hook): check the backend returned from `vc-responsible-backend' can really handle `subdir'.

(widget-add-documentation-string-button): Fix handling of
documentation indent.

* wid-edit.el (widget-add-documentation-string-button): Fix
handling of documentation indent.

*** empty log message ***

New file.

*** empty log message ***

* vc.el (vc-dired-mode): Show backend name as part of mode name.

*** empty log message ***

*** empty log message ***

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 45-48)

   - Gnus ChangeLog tweaks
   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 230-231)

   - ChangeLog tweak
   - Update from CVS

2007-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-agent.el (gnus-agent-fetch-headers)
   (gnus-agent-retrieve-headers): Bind
   gnus-decode-encoded-address-function to identity.

   * lisp/gnus/nntp.el (nntp-send-xover-command): Recognize an xover command
   is available also when the server returns simply a dot.

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Redisplay window before measuring
   it.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-800

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 230-231)

   - ChangeLog tweak
   - Update from CVS

2007-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-agent.el (gnus-agent-fetch-headers)
   (gnus-agent-retrieve-headers): Bind
   gnus-decode-encoded-address-function to identity.

   * lisp/gnus/nntp.el (nntp-send-xover-command): Recognize an xover command
   is available also when the server returns simply a dot.

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Redisplay window before measuring
   it.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-48

Use emacs.manifest.

Manifest for Windows XP and later. Links Emacs to comctl32.dll version 6 for
the new style scrollbars.

Manifest for Windows XP and later. Links Emacs to comctl32.dll version 6 for
the new style scrollbars.

(update_compositions): Fix last fix.

* composite.c (update_compositions): Fix last fix.

(update_compositions): Check validity of compositions.

* composite.c (update_compositions): Check validity of compositions.

(widget-default-create): Move ?h handling here...
(widget-default-format-handler): ...from here.
(widget-docstring, widget-add-documentation-string-button): New funs.
(documentation-string): Add :visibility-widget property.
(widget-documentation-string-value-create): Use it.

(custom-split-regexp-maybe): Simplify.
(custom-buffer-create-internal): Simplify message.
(custom-variable-tag): Reduce height to normal.
(custom-variable-value-create, custom-face-value-create)
(custom-visibility): New widget.
(custom-visibility): New face.
(custom-group-value-create): Call
widget-add-documentation-string-button, using `custom-visibility'.

* wid-edit.el (widget-default-create): Move ?h handling here...
(widget-default-format-handler): ...from here.
(widget-docstring, widget-add-documentation-string-button): New funs.
(documentation-string): Add :visibility-widget property.
(widget-documentation-string-value-create): Use it.

* cus-edit.el (custom-split-regexp-maybe): Simplify.
(custom-buffer-create-internal): Simplify message.
(custom-variable-tag): Reduce height to normal.
(custom-variable-value-create, custom-face-value-create)
(custom-visibility): New widget.
(custom-visibility): New face.
(custom-group-value-create): Call
widget-add-documentation-string-button, using `custom-visibility'.

(byte-compile-current-group, byte-compile-nogroup-warn, byte-compile-file):
Revert part of last change.  Apparently the "warning even if the group is
implicit" is a feature rather than a bug.

moved my entry from etc/ChangeLog to lisp/ChangeLog
was put in etc/ChangeLog by mistake

2007-06-14  Michael Kifer  <kifer@cs.stonybrook.edu>

* viper.el (viper-describe-key-ad, viper-describe-key-briefly-ad):
different advices for Emacs and XEmacs. Compile them conditionally.
(viper-version): belated version change.

typo

typo

(Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.

(get_process_times_fn): New function pointer.
(globals_of_w32): Intialize it if present in kernel32.dll.
(w32_get_internal_run_time): New function.

(update_compositions): Check the validness of
compositions.

*** empty log message ***

*** empty log message ***

Changes from arch/CVS synchronization

Gnus ChangeLog tweaks

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-45

Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 725, 740-741, 749, 768, 777, 786, 788-789, 792)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - Merge from emacs--rel--22, gnus--rel--5.10

 * gnus--rel--5.10  (patch 217-229)

   - Update from CVS
   - Merge from emacs--devo--0, emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-44

(init_user_info): Fix weird formatting not following GNU coding guidelines.

Changes from arch/CVS synchronization

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 43-44)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 229)

   - Merge from emacs--devo--0, emacs--rel--22

2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/font-lock.el (font-lock-add-keywords): In case font-lock was only
   half-activated, forcefully activate it completely.

2007-06-11  Richard M. Stallman  <rms@gnu.org>

   * lisp/cus-edit.el (custom-variable-type): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-797

(update_tool_bar, redisplay_tool_bar, redisplay_window)
[USE_MAC_TOOLBAR]: Sync with GTK+ tool bar display.

(struct mac_output) [USE_MAC_TOOLBAR]: New member
toolbar_win_gravity.
(struct scroll_bar) [MAC_OSX]: New member fringe_extended_p.
(update_frame_tool_bar, free_frame_tool_bar) [USE_MAC_TOOLBAR]:
Add externs.

(x_draw_fringe_bitmap) [MAC_OSX]: Extend fringe
background to scroll bar gap.
(x_scroll_bar_create) [MAC_OSX]: Set bar->fringe_extended_p.
(XTset_vertical_scroll_bar) [MAC_OSX]: Put leftmost/rightmost
scroll bars on frame edge.  Check fringe background extension.
Don't clear extended fringe background area.
(TOOLBAR_IDENTIFIER, TOOLBAR_ICON_ITEM_IDENTIFIER)
(TOOLBAR_ITEM_COMMAND_ID_OFFSET, TOOLBAR_ITEM_COMMAND_ID_P)
(TOOLBAR_ITEM_COMMAND_ID_VALUE, TOOLBAR_ITEM_MAKE_COMMAND_ID):
[USE_MAC_TOOLBAR]: New macros.
(mac_move_window_with_gravity, mac_get_window_origin_with_gravity)
(mac_handle_toolbar_event, mac_image_spec_to_cg_image)
(mac_create_frame_tool_bar, update_frame_tool_bar, free_frame_tool_bar)
(mac_tool_bar_note_mouse_movement, mac_handle_toolbar_command_event)
[USE_MAC_TOOLBAR]: New functions.
(mac_handle_window_event) [USE_MAC_TOOLBAR]: Reposition window
manually if previous repositioning has failed.
(mac_handle_keyboard_event): Use precomputed event kind.
(XTread_socket) [USE_MAC_TOOLBAR]: Handle click in structure region
as tool bar item click.  Handle mouse movement over tool bar items.

[TARGET_API_MAC_CARBON] (menu_target_item_handler):
Return immediately unless popup is activated.

(USE_MAC_TOOLBAR): New define.

(mac_window) [USE_MAC_TOOLBAR]: Set toolbar_win_gravity.
(x_set_tool_bar_lines) [USE_MAC_TOOLBAR]: Set FRAME_EXTERNAL_TOOL_BAR.

(struct frame) [MAC_OS]: New member external_tool_bar.
(FRAME_EXTERNAL_TOOL_BAR) [MAC_OS]: Use it.

Updated.

Check for all image libraries before exiting.

* emacs.1: Completely revised.
Fix many typographical glitches.
Updated to handle current state of options and resources.

Add image-refresh

(Image Cache): Document image-refresh.

* display.texi (Image Cache): Document image-refresh.

(search_image_cache): Remove unused variable.

* image.c (search_image_cache): Remove unused variable.

(erc-scroll-to-bottom): Remove redundant check.

(mac-dnd-drop-data): Remove redundant check.

(python-complete-symbol): Remove redundant check.

(edebug-pop-to-buffer, edebug-display): Remove redundant checks.

(x-dnd-maybe-call-test-function, x-dnd-save-state, x-dnd-drop-data):
Remove redundant checks.

(pcomplete-restore-windows): Remove redundant check.

(follow-all-followers, follow-generic-filter): Remove redundant checks.

(rcirc-format-response-string): Use rcirc-nick-syntax
around bright and dim regexps. Make sure bright and dim matches
use word anchors.  Send text through rcirc-markup functions.
(rcirc-url-regexp): Add single quote character.
(rcirc-connect): Write logs to disk on auto-save-hook.
Make server a non-optional argument.
(rcirc-log-alist): New variable.
(rcirc-log-directory): Make customizable.
(rcirc-log-flag): New customizable variable.
(rcirc-log): New function.
(rcirc-print): Use above function.
(rcirc-log-write): New function.
(rcirc-generate-new-buffer-name): Strip text properties.
(rcirc-switch-to-buffer-function): Remove variable.
(rcirc-last-non-irc-buffer): Remove variable.
(rcirc-non-irc-buffer): Add function.
(rcirc-next-active-buffer): Use above function.
(rcirc-keepalive): Send KEEPALIVE ctcp instead of a PING.
(rcirc-handler-ctcp-KEEPALIVE): Add handler.
(rcirc-handler-CTCP): Don't print KEEPALIVE responses.
(rcirc-omit-mode): Add minor-mode.
(rcirc-mode-map): Change C-c C-o binding.
(rcirc-mode): Clear mode-line-process. Use a custom
fill-paragraph-function.  Set up buffer-invisibility-spec.
(rcirc-response-formats): Remove timestamp code.
(rcirc-omit-responses): Add variable.
(rcirc-print): Don't put the overlay arrow on potentially omitted
lines.  Log line to disk.  Record activity for private messages
from /dim nicks.  Facify the fill-prefix with rcirc-timestamp face.
(rcirc-jump-to-first-unread-line): Print message if there is no
unread text.
(rcirc-clear-unread): New function.
(rcirc-markup-text-functions): Add variable.
(rcirc-markup-timestamp, rcirc-markup-fill): Add functions.
(rcirc-debug): Don't mess with window configuration.
(rcirc-send-message): Send message before printing locally.
Add SILENT argument, do not print message if non-nil.
(rcirc-visible-buffers): New function and variable.
(rcirc-window-configuration-change-1): Add function.
(rcirc-target-buffer): Make sure ACTIONs don't get sent to the
server buffer.
(rcirc-clean-up-buffer): Set rcirc-target to nil when finished.
(rcirc-fill-paragraph): Add function.
(rcirc-record-activity, rcirc-window-configuration-change-1):
Only update the activity string if it has actually changed.
(rcirc-update-activity-string): Remove padding characters from the
mode-line string.
(rcirc-disconnect-buffer): New function to be called when a
channel is parted or the user quits.
(rcirc-server-name): Warn when the server-name hasn't been set.
(rcirc-window-configuration-change): Postpone work until
post-command-hook.
(rcirc-window-configuration-change-1): Update mode-line and
overlay arrows here.
(rcirc-authenticate): Fix chanserv identification.
(rcirc-default-server): Remove variable.
(rcirc): Connect according to rcirc-connections.
(rcirc-connections): Add variable.
(rcirc-startup-channels-alist): Remove variable.
(rcirc-startup-channels): Remove function.

(diff-font-lock-keywords): Fix M. Kifer's last change.

Updated.

Exit with error if image libraries aren't found.

2007-06-13  Michael Kifer  <kifer@cs.stonybrook.edu>

* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
previous patch

* term/xterm.el (terminal-init-xterm): Escape parens in character
  constants.

* term/xterm.el (terminal-init-xterm): Escape parens in character
  constants.

Remove unneeded * from docstrings.  Use [:alpha:] & [:alnum:] where applicable.
(sh-quoted-subshell): Rewrite to handle nested mixes of `...` and $(...).
(sh-apply-quoted-subshell): Remove.
(sh-font-lock-syntactic-keywords): Adjust call to sh-quoted-subshell.

(vc-arch-command): Remove bzr.  It's a different program.

(explicitly numbered group): Precise the behavior.

** Fix compilation when Xaw3d libraries are present but libxaw is not.
Done.

* xfns.c, xmenu.c: Link to xaw3d if available.

Fix last fix.

Link to xaw3d if available.

* lwlib-Xaw.c, lwlib.c: Link to xaw3d if available.

Link to xaw3d if available.

Regenerate.

Merge xaw3d and libXaw checks.  Check xaw3d even when compiling
without scrollbars.

* configure.in: Merge xaw3d and libXaw checks.  Check xaw3d even
when compiling without scrollbars.

(lookup_image): Save frame foreground and background colors.
(search_image_cache): Check if saved and current frame colors match.

(struct image) [HAVE_WINDOW_SYSTEM]: New members
frame_foreground and frame_background.

There is no X(1) man page, only X(7).

Regenerate, with shell-functions patch.

Remove log entry for generated file.

Regenerate, rather than applying previous changes by hand.

update two-volume material for printing

update two-volume material for printing

Fix typo.

Add `user-emacs-directory'.

* os.texi (Init File): Document user-emacs-directory.

(Init File): Document user-emacs-directory.

url.el (url-configuration-directory): Use user-emacs-directory.

(url-configuration-directory): Use user-emacs-directory.

* subr.el (user-emacs-directory): New defconst.
* cmuscheme.el (scheme-start-file): Use user-emacs-directory.
* shell.el (shell): Use user-emacs-directory.
* completion.el (save-completions-file-name): Use
user-emacs-directory.
* custom.el (custom-theme-directory): Use user-emacs-directory.
* term/x-win.el (emacs-session-filename): Use
user-emacs-directory.
* filesets.el (filesets-menu-cache-file): Use
user-emacs-directory.
* thumbs.el (thumbs-thumbsdir): Use user-emacs-directory.
* server.el (server-auth-dir): Use user-emacs-directory.
* image-dired.el (image-dired-dir): Use user-emacs-directory.
(image-dired-db-file): Likewise.
(image-dired-temp-image-file): Likewise.
(image-dired-gallery-dir): Likewise.
(image-dired-temp-rotate-image-file): Likewise.
* play/gamegrid.el (gamegrid-user-score-file-directory): Use
user-emacs-directory.
* savehist.el (savehist-file): Use user-emacs-directory.
* tutorial.el (tutorial--saved-dir): Use user-emacs-directory.
* startup.el (auto-save-list-file-prefix): Use
user-emacs-directory.

(auto-save-list-file-prefix): Use user-emacs-directory.

(tutorial--saved-dir): Use user-emacs-directory.

(savehist-file): Use user-emacs-directory.

(gamegrid-user-score-file-directory): Use user-emacs-directory.