(extraclean): Don't delete *~.

(bootstrap, bootstrap-nmake, bootstrap-gmake): Depend on cmdproxy.
(cleanall): Don't delete *~.

(tex-verbatim-environments): Add safe-local-variable property.
(tex-font-lock-syntactic-keywords): Lookup tex-verbatim-environments
when starting font-lock rather than when loading tex-mode.el.

(bookmark-maybe-sort-alist): Don't modify bookmark-alist.
Instead, if not sorting, simply return it.
(bookmark-bmenu-list): Call bookmark-maybe-sort-alist
for its return value, not for its side effect.

(sh-font-lock-quoted-subshell): Skip over the
whole $( rather than just the $.  Rename from sh-quoted-subshell.
(sh-font-lock-syntactic-keywords): Adjust call accordingly.

(calculate-lisp-indent): In the case of alignment under a constant symbol,
find and consider the sexp actually at indentation to be the "last sexp".

(Fdisplay_buffer): Use NILP.
(Fset_window_scroll_bars): Likewise.

(mouse-yank-secondary): Better error message if no secondary selection.

(vc-handled-backends): Move BZR later in the list.

(xterm-turn-on-modify-other-keys)
(xterm-turn-off-modify-other-keys): New functions.
(terminal-init-xterm): Enable the modifyOtherKeys feature if the
terminal supports it.

(bookmark-show-all-annotations):
Make sure each inserted annotation ends with newline.

*** empty log message ***

*** empty log message ***

(cua-paste): Before a yank command,
check also whether last-command is one of mouse-save-then-kill,
mouse-secondary-save-then-kill, mouse-set-region, mouse-drag-region.

(delete-selection-pre-hook): Before a yank command,
check also whether last-command is one of mouse-save-then-kill,
mouse-secondary-save-then-kill, mouse-set-region, mouse-drag-region.

* recentf.el (recentf-keep-default-predicate): New defun.
(recentf-keep): Use it as initial value.

Jeff Miller  <jmiller at cablespeed.com>  (tiny change)

(calendar-goto-bahai-date): Autoload it.

Move autoload from previous change to calendar.el.

move Quitting Info node; update Back-Cover Text

(uint16_t): Define if C99 does not appear to be fully supported.

(window_min_size_2): New function.
(window_min_size_1, size_window, Fdisplay_buffer)
(Fsplit_window, adjust_window_trailing_edge): Use it to avoid
windows without mode- or header-lines when window-min-height is
too small.
(size_window): Reset nodelete_p after testing it, following an
earlier note by Kim F. Storm.
(display_buffer): Do not set split_height_threshold to twice the
value of window_min_height to avoid changing the value of a
customizable variable.  Rather explicitly check whether the
height of the window that shall be splitted is at least as large
as split_height_threshold.

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 55-58)

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

 * gnus--rel--5.10  (patch 235-236)

   - Update from CVS

2007-07-13  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/replace.el (match): Use yellow1 instead of yellow.

   * lisp/progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
   red.

   * lisp/pcvs-info.el (cvs-unknown): Likewise.

2007-07-10  Richard M. Stallman  <rms@gnu.org>

   * lisp/emacs-lisp/lisp-mode.el (eval-defun):
   Explain special handling of `defface'.

2007-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
   (gnus-server-closed-face, gnus-server-denied-face)
   (gnus-server-offline-face): Remove variable.
   (gnus-server-font-lock-keywords): Use faces that are not aliases.

   * lisp/gnus/mm-util.el (mm-decode-coding-string, mm-encode-coding-string)
   (mm-decode-coding-region, mm-encode-coding-region): Don't modify string
   if the coding-system argument is nil for XEmacs.

   * lisp/gnus/nnrss.el (nnrss-compatible-encoding-alist): Inherit the value of
   mm-charset-override-alist.

   * lisp/gnus/rfc2047.el: Don't require base64; require rfc2045 for the function
   rfc2045-encode-string.
   (rfc2047-encode-parameter): Use rfc2045-encode-string to quote or not
   to quote the parameter value.

2007-07-10  Richard M. Stallman  <rms@gnu.org>

   * lispref/display.texi (Defining Faces): Explain C-M-x feature for defface.

2007-07-11  Jason Rumney  <jasonr@gnu.org>

   * nt/gmake.defs (OLE32): New library to link.

   * nt/nmake.defs (OLE32): Likewise.

2007-07-11  Jason Rumney  <jasonr@gnu.org>

   * src/makefile.w32-in (LIBS): Include OLE32.

   * src/w32fns.c (w32_msg_pump) <WM_EMACS_CREATEWINDOW>: Initialize COM.
   (w32_msg_pump) <WM_DESTROY>: Uninitialize COM.

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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 235-236)

   - Update from CVS

2007-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
   (gnus-server-closed-face, gnus-server-denied-face)
   (gnus-server-offline-face): Remove variable.
   (gnus-server-font-lock-keywords): Use faces that are not aliases.

   * lisp/gnus/mm-util.el (mm-decode-coding-string, mm-encode-coding-string)
   (mm-decode-coding-region, mm-encode-coding-region): Don't modify string
   if the coding-system argument is nil for XEmacs.

   * lisp/gnus/nnrss.el (nnrss-compatible-encoding-alist): Inherit the value of
   mm-charset-override-alist.

   * lisp/gnus/rfc2047.el: Don't require base64; require rfc2045 for the function
   rfc2045-encode-string.
   (rfc2047-encode-parameter): Use rfc2045-encode-string to quote or not
   to quote the parameter value.

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

Revert recent bookmark keybinding changes, thus returning to using
three slots under C-x r.  See this message and its thread for details:
http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00705.html.

* lisp/bookmark.el: Revert 2007-07-13T18:16:17Z!kfogel@red-bean.com.

* etc/NEWS: Revert 2007-07-13T23:20:21Z!kfogel@red-bean.com, which
  documented bookmark keybinding changes that were later reverted.

* man/ChangeLog: Remove ChangeLog entry for accidentally uncommitted
  changes to regs.texi that would have documented the keybinding
  change reverted above.

Sync from trunk:

Werner Lemberg  <wl at gnu.org>

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

Jeff Miller  <jmiller at cablespeed.com>  (tiny change)

(calendar-goto-bahai-date): Add autoload cookie.

Jeff Miller  <jmiller at cablespeed.com>  (tiny change)

(calendar-goto-bahai-date): Add autoload cookie.

(comint-simple-send): Concat newline before sending.
(comint-password-prompt-regexp): Recognize plink's passphrase prompt.

(set-default-process-coding-system): Use dos line ends
for input to cmdproxy on all versions of Windows.
Use dos line ends for input to plink.

IPv6 support on MS-Windows

Don't undefine AF_INET6.

Include winsock2.h and ws2tcpip.h instead of winsock.h.

(generated-autoload-file): Autoload the safe-local-variable setting.

(maybe_call_debugger): New function.
(find_handler_clause): Use maybe_call_debugger.
Call it when the handler says `debug'.
Eliminate DEBUGGER_VALUE_PTR.
(Fsignal): Eliminate debugger_value.
(Qdebug): New variable.
(syms_of_eval): Initialize it.

(Handling Errors): Document `debug' in handler list.

*** empty log message ***

* lisp/ChangeLog: Put main author of change in the ChangeLog entry
  header; rewrite entry accordingly.

* regs.texi (Bookmarks): Adjust for recent keybinding changes in
  bookmark.el, namely 2007-07-13T18:16:17Z!kfogel@red-bean.com and
  2007-07-13T18:20:55Z!kfogel@red-bean.com.

(defadvice): Doc fix.

(when, unless): Doc fix.

*** empty log message ***

(Fsave_window_excursion): Doc fix.

(Fwith_output_to_temp_buffer): Doc fix.

(Ftrack_mouse): Doc fix.

(Fprogn): Doc fix.

(gnus-mime-delete-part): Don't go through article-edit
finishing actions if we did not edit the article.

(bugzilla): Mention gtk-engines-qt bug.

Mention gtk-engines-qt problem.

Whitespace change.

* NEWS: Update for recent bookmark keybinding changes.

(install-lisp-SH, install-lisp-CMD): New targets.
(install): Use them to copy all *.el files before *.elc.

Add @documentencoding directive.

($(infodir)/emacs-mime): Use --enable-encoding.

(../info/emacs-mime): Use --enable-encoding.

(install-lisp-SH, install-lisp-CMD): New targets.
(install): Use them to copy all *.el files before *.elc.

($(infodir)/emacs-mime): Use --enable-encoding.

(../info/emacs-mime): Use --enable-encoding.

Add @documentencoding directive.

* bookmark.el (bookmark-jump-other-window): New function.
  (bookmark-map): Bind it to "o".

Patch by Drew Adams <drew.adams{_AT_}oracle.com>.  See
http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html.

* bookmark.el: Shorten some comments to fit within 80 lines.

* bookmark.el: Don't define bookmark keys under the "C-xr" map;
  instead, make "C-xp" a prefix for bookmark-map.  Patch by Drew
  Adams <drew.adams{_AT_}oracle.com>, mildly tweaked by me.  See
  http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html.

Move to end of line if in headline without
tags.

*** empty log message ***

*** empty log message ***

Bug fixes.

*** empty log message ***

Remove spurious * in docstrings.
(vc-handled-backends): Add BZR.

(vc-find-file-hook): Use with-demoted-errors.

* replace.el (match): Use yellow1 instead of yellow.

* progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
red.

* pcvs-info.el (cvs-unknown): Likewise.

(init_eval_once): Bump max_lisp_eval_depth to 400.

(Starting GUD): Add xref to this anchor.

(Remote processes): Add an anchor to the subsection
"Running a debugger on a remote host".

*** empty log message ***

(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.

(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.

* tramp.texi (Remote processes): Don't call it "experimental" any
longer.  Add subsection about running a debugger on a remote host.

Remove dashes from front of first line.

(struct Lisp_Process): Turn slots infd, outfd, kill_without_query, pty_flag,
tick, update_tick, decoding_carryover, inherit_coding_system_flag,
filter_multibyte, adaptive_read_buffering, read_output_delay, and
read_output_skip from Lisp_Objects to ints.  Remove unused
encoding_carryover.

(which-func-modes): Add `python-mode'.

(python-which-func-length-limit): New var.
(python-which-func): New function.
(python-current-defun): Add optional `length-limit' and try to fit
computed function name to that length.
(python-mode): Hook `python-which-func' up.

(pcomplete-entries): Obey pcomplete-ignore-case.

(comint-dynamic-complete-as-filename,comint-dynamic-list-filename-completions):
Use read-file-name-completion-ignore-case.

Require CL.
(vc-cvs-revision-table, vc-cvs-revision-completion-table):
New functions to provide completion of revision names.

(vc-functions): Clear up the cache when reloading the file.
(vc-cvs-annotate-first-line-re): New const.
(vc-cvs-annotate-process-filter): New fun.
(vc-cvs-annotate-command): Use them and run the command asynchronously.

(eldoc-last-data): Revise documentation.
(eldoc-print-current-symbol-info): Adjust for changed helper
function signatures.
(eldoc-get-fnsym-args-string): Add `args' argument.  Use new
`eldoc-highlight-function-argument'.
(eldoc-highlight-function-argument): New function.
(eldoc-get-var-docstring): Format documentation with
`font-lock-variable-name-face'.
(eldoc-docstring-format-sym-doc): Add `face' argument and apply it
where suited.
(eldoc-fnsym-in-current-sexp): Return a list with argument index.
(eldoc-beginning-of-sexp): Return number of skipped sexps.

Include unistd.h only if HAVE_UNISTD_H.

* progmodes/compile.el (compilation-start): `start-process' must
still be redefined when calling `start-process-shell-command'.

* progmodes/gud.el (gud-file-name): When `default-directory' is a
remote file name, prepend its remote part to the filename.
(gud-common-init): When `default-directory' is a remote file name,
make the filename relative to it.
Based on a patch by Nick Roberts <nickrob@snap.net.nz>.

* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
mouse binding and a tooltip.
* menu-bar.el (vc-menu-map): New defalias.

* lisp.h (struct Lisp_Hash_Table): Turn next_weak into a bare pointer.
* fns.c (weak_hash_tables): Rename from Vweak_hash_tables and turned
from a Lisp_Object into a bare pointer.
(make_hash_table, copy_hash_table, sweep_weak_hash_tables, init_fns):
Adjust the code correspondingly.

(emacs_blocked_free): Remove unused var `bytes_used_now'.

Include unistd.h for ttyname, used in handle_one_term_event.
(term_show_mouse_face): Remove unused var `j'.
(handle_one_term_event): Remove unused vars `i' and `j'.
Don't cast return value of ttyname since it's not necessary.

(w32_msg_pump) <WM_EMACS_CREATEWINDOW>: Initialize COM.
(w32_msg_pump) <WM_DESTROY>: Uninitialize COM.

(LIBS): Include OLE32.

(OLE32): New library to link.

(mh-display-color-cells): Fix on XEmacs 21.5b28. Thanks to Henrique
Martins for the help (closes SF #1749774).

(auto-insert-alist): s/2/3/ in the generated comment.

(copyright-current-gpl-version): Set to 3.

*** empty log message ***

(copyright-current-gpl-version): Set to 3.

*** empty log message ***