(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

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.

(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.

(server-auth-dir): Use user-emacs-directory.

(thumbs-thumbsdir): Use user-emacs-directory.

(filesets-menu-cache-file): Use user-emacs-directory.

(emacs-session-filename): Use user-emacs-directory.

(custom-theme-directory): Use user-emacs-directory.

(save-completions-file-name): Use user-emacs-directory.

(shell): Use user-emacs-directory.

(scheme-start-file): Use user-emacs-directory.

(user-emacs-directory): New defconst.

(scroll-lock-mode): Doc fix.

* scroll-lock.el (scroll-lock-mode): Doc fix.

*** empty log message ***

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

* ediff-ptch.el (ediff-context-diff-label-regexp): spurious
parenthesis.

* ediff-init.el: doc strings.

(byte-compile-current-group): New var.
(byte-compile-file): Bind it.
(byte-compile-nogroup-warn): Use it to avoid spurious warnings when the
group argument is provided implicitly.
(byte-compile-format-warn, byte-compile-from-buffer)
(byte-compile-insert-header): Don't hardcode point-min==1.
(byte-compile-file-form-require): Remove unused var old-load-list.
(byte-compile-eval): Remove unused vars old-autoloads and hist-nil-new.

*** empty log message ***

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

* viper-cmd.el (viper-prefix-arg-com,viper-prefix-arg-value): display
error messages
(viper-prev-destructive-command,viper-insert-prev-from-insertion-ring):
get rid of cl.el dependencies.

* viper-init.el (viper-suppress-input-method-change-message): new
variable.
(viper-activate-input-method-action,viper-inactivate-input-method-action):
use viper-suppress-input-method-change-message.

* viper-kem.el (viper-vi-basic-map): disable the bindings for C-s, C-r.

* viper-util.el (viper-set-cursor-color-according-to-state): use
viper-replace-overlay-cursor-color instead of
viper-replace-overlay-cursor-color.
(viper-sit-for-short): use sit-for with 3 arguments.

* viper.el (viper-insert-state-mode-list): add gud-mode.
(viper-major-mode-modifier-list): add viper-comint-mode-modifier-map to
gud-mode.

* ediff-mult.el
(ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message):
new variables.
(ediff-meta-buffer-message): variable deleted.
(ediff-verbose-help-enabled): new variable.
(ediff-toggle-verbose-help-meta-buffer): new function.
(ediff-redraw-directory-group-buffer): made aware of short/verbose
message options

* ediff-ptch.el (ediff-context-diff-label-regexp): better regexp.
(ediff-fixup-patch-map): improved heuristic.

(log-view-file-re, log-view-message-re): Use \(?1:...\).
(log-view-font-lock-keywords): Simplify.
(log-view-current-file, log-view-current-tag): Simplify.

(regex_compile): Remove the `regnum' counter.
Use bufp->re_nsub instead.  Add support for \(?N:RE\).

(url-cookie-name, url-cookie-value, url-cookie-expires, url-cookie-localpart)
(url-cookie-domain, url-cookie-secure, url-cookie-set-name)
(url-cookie-set-value, url-cookie-set-expires, url-cookie-set-localpart)
(url-cookie-set-domain, url-cookie-set-secure, url-cookie-retrieve-arg)
(url-cookie-create, url-cookie-p): Remove.
(url-cookie): New struct.
(url-cookie-store): Use setf instead of url-cookie-set-*.

(tab-always-indent): Docstring fix.

(vc-arch-command): Also try "baz" and "bzr".

(desktop-load-locked-desktop): New option.
(desktop-read): Use it.
(desktop-truncate, desktop-outvar, desktop-restore-file-buffer): Use `when'.

(desktop-save-mode-off): New function.
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it.  Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts.  Manage the lock.

Change bug address.  Add back +++/--- note.
Use present tense for X-toolkit entry.  Mention libgif.

Restore two items deleted by mistake.

(HAVE_GIF): Doc fix.
(LIBGIF): New (already used by Makefile.in).

(HAVE_GIF): If -lungif fails, try -lgif.

(tpu-emacs-map-key): Use new keymap names.

(tpu-gold-map): Rename from GOLD-map.
(tpu-lucid-emacs-p): Remove.  Use (featurep 'xemacs) instead.
(CSI-map, GOLD-CSI-map, GOLD-SS3-map, SS3-map): Delete vars.
(tpu-gold-map, tpu-global-map): Add all the SS3 and CSI bindings, using
keysyms rather than byte sequences.
(tpu-copy-keyfile): Don't force the user to use tpu-mapper.el.

(sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
(sh-font-lock-syntactic-keywords): Use them to distinguish the
different possible cases for \'.

(PC-bindings): Don't bind things already bound in the parent keymap.

Adjust copyright notice.

*** empty log message ***

New file.

Include intervals.h to declare Fget_text_property.

*** empty log message ***

(vc-svn-program): New var.
(vc-svn-command): Use it.

*** empty log message ***

Change wording about yes/gtk and lucid/athena being
synonyms.

Remove RCS keywords

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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 227-228)

   - Update from CVS

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

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Make it work.

   * lisp/gnus/gnus-start.el (gnus-1): Relax restrictions that prevent gnus-x-splash
   from being used.

   * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave): Correct the order
   of the arguments passed to pop-to-buffer.
   (gnus-article-read-summary-keys): Ditto.

2007-06-06  Andreas Seltenreich  <andreas@gate450.dyndns.org>

   * man/gnus.texi (Misc Group Stuff, Summary Buffer)
   (Server Commands, Article Keymap): Fix typo.  s/function/command/.

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

(server-switch-buffer): Remove redundant check.

(Fx_file_dialog): Take size from struct not pointer.

(byte-compile-find-cl-functions): Match
against file-name-nondirectory.
Fix text on user customization variables.

Regenerate, and apply by hand super-special-shell-function-message-patch.

(rmail-movemail-variant-in-use): Fix doc typo.

Merge from emacs--rel--22

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

*** empty log message ***

(desktop-minor-mode-table): Doc fix.

(css-navigation-syntax-table):
Use set-char-table-range so it also works in the unicode branch.

(Fdelete_and_extract_region): Use empty_unibyte_string.

(Fread_file_name): Use empty_unibyte_string.

(Fmapconcat): Use empty_unibyte_string.

(cmd_error_internal): Use empty_unibyte_string.

(Fkey_description): Use empty_unibyte_string.

(read_minibuf): Use empty_unibyte_string.

(wordify): Use empty_unibyte_string.

(sel_read): Use empty_unibyte_string.

(Fx_get_atom_name): Use empty_unibyte_string.

(x_term_init): Use empty_unibyte_string.

(Fformat_mode_line, syms_of_xdisp): Use empty_unibyte_string.

(x_default_scroll_bar_color_parameter):
Use empty_unibyte_string, not empty_string.

(menu_help_callback): Use empty_unibyte_string, not empty_string.

(init_strings): Initialize canonical empty strings.
(make_uninit_string, make_uninit_multibyte_string): Return appropriate
canonical empty string when the requested size is 0.

(empty_unibyte_string): Rename from empty_string.
(empty_multibyte_string): New canonical empty string.
(syms_of_emacs): Don't initialize empty_string.

(syms_of_lread, openp): Use empty_unibyte_string, not build_string.

(STRING_SET_UNIBYTE): Return the canonical empty unibyte string, if appropriate.
(empty_unibyte_string, empty_multibyte_string): New externs.
(empty_string): Remove extern.

(Optional Mode Line): Document the new form of line+column numbers,
"(561,2)".

*** empty log message ***

(help-xref-forward-stack)
(help-xref-stack-forward-item, help-forward-label): New variables.
(help-forward): New button type.
(help-setup-xref): Initialise help-xref-forward-stack.
(help-make-xrefs): Add forward button, if appropriate.
(help-xref-go-back): Push item on forward stack.
(help-xref-go-forward, help-go-forward): New functions.

*** empty log message ***

*** empty log message ***

Make gtk the default toolkit.

*** empty log message ***

Remove FIXME comment, implemented in previous change.

(Fcurrent_time_zone): Remove hack for Japanese Windows.

Don't define HAVE_TZNAME.

Tramp does not require cl anymore.

Tramp does not require cl anymore.

Sync with Tramp 2.0.56.

Identify Emacs 22.2 changes (so we don't lose them later).

(dired-recursive-deletes, dired-recursive-copies): Change default to
`top'.