*** empty log message ***

Add "this branch is obsolete" error message

Merge from emacs--unicode--0

Patches applied:

 * emacs--devo--0  (patch 814-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

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

 * emacs--unicode--0  (patch 232-235)

   - Merge from emacs--devo--0
   - Update from CVS

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-66

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 816-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

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

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 59-69)

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

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

2007-07-23  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the
   underlying file is uptodate.

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

   * lisp/vc.el: Add more info about the vc-registered function.

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

   * lisp/kmacro.el (kmacro-bind-to-key): Avoid comparisons on function keys.

   * lisp/tutorial.el (tutorial--find-changed-keys):
   Handle C-x specially like ESC.

2007-07-15  Aaron Hawley  <aaronh@garden.org>

   * lisp/tar-mode.el (tar-get-descriptor): No error for zero-length file.

2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
   string.

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

   * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.

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

   * lispref/display.texi (Defining Faces): Fix previous change.

2007-07-20  Eli Zaretskii  <eliz@gnu.org>

   * src/w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32):
   Define if not defined.

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

   * src/w32proc.c (w32_executable_type): Handle 64 bit executables.

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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
   string.

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

   * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.

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

(cvs-temp-buffer): Disable undo in temp buffers.

(current_lock_owner): Allow for @ sign in username.

(ses-cleanup): Prevent Emacs from spuriously checking if the
underlying file is uptodate.

(perform-replace): Use isearch-no-upper-case-p.

*** empty log message ***

(vc-mode-line-map): New const.
(vc-mode-line): Use it.

*** empty log message ***

(vc-git-unregister): New function.

*** empty log message ***

(vc-git-delete-file, vc-git-rename-file): New functions.
(vc-git-find-version): Use the result of ls-files as a parameter
for cat-file

* net/tramp.el (tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes)
(tramp-handle-file-attributes-with-stat)
(tramp-handle-directory-files-and-attributes-with-stat(
(tramp-convert-file-attributes): Handle huge file sizes.

(goto-history-element): New function created from
next-history-element.
(next-history-element): Most code moved to goto-history-element.
Call goto-history-element with (- minibuffer-history-position n).
(previous-history-element): Call goto-history-element with (+
minibuffer-history-position n).
(minibuffer-setup-hook): Add minibuffer-history-isearch-setup.
(minibuffer-history-isearch-message-overlay): New buffer-local variable.
(minibuffer-history-isearch-setup, minibuffer-history-isearch-end)
(minibuffer-history-isearch-search, minibuffer-history-isearch-message)
(minibuffer-history-isearch-wrap, minibuffer-history-isearch-push-state)
(minibuffer-history-isearch-pop-state): New functions.

(isearch-message-function): New variable.
(isearch-update, isearch-search): Use it.

(vc-stay-local-p): Fix bug: Avoid remove-if-not.
Also, if FILE is a list, return non-nil if any of its
elements should stay local.  Update docstring.

(copyright-update-year): Fix 2007-05-25 change.

(inferior-octave-prompt): Accept .exe.

(inferior-octave-prompt): Accept .exe.

*** empty log message ***

(vc-git-checkin): Delete unused parameter and the code
handling it. Use vc-git-command.
(vc-git-find-version, vc-git-diff-tree): New functions.
(vc-git-revert): Use vc-git-command.
(vc-git--run-command): Delete.

(vc-git-workfile-unchanged-p): Update comment.

(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 \'.
(sh-font-lock-paren): Mark the relevant text with font-lock-multiline.

*** empty log message ***

Add arch tagline

*** empty log message ***

(abbrev_check_chars): Use CHAR_TABLE_REF, not
SYNTAX_ENTRY_FOLLOW_PARENT.

(vc-find-root): Walk up the tree to find an existing
`file' from which to start the search and fix case where `file' is the
current directory and the root as well.

(cvs-mode-add-change-log-entry-other-window): Use a directory
name for buffer-file-name if it refers to a directory.

(vc-directory-exclusion-list): Use eval-after-load.

*** empty log message ***

Update status.

(decode_mode_spec): Add case 'R' for to test for
remote default-directory.

(mode-line-format): Describe above case in doc string.

Mark mode-line-remote as risky.

(mode-line-remote): New variable.
(help-echo): Add to default values of mode-line-format.

*** empty log message ***

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

(isearch-edit-string): Save old point and
isearch-other-end to old-point and old-other-end before reading
the search string from minibuffer.  After exiting minibuffer set
point to old-other-end if point and the search direction is the
same as before reading the search string.
(isearch-del-char): Don't set isearch-yank-flag to t.  Put point
to isearch-other-end.  Instead of isearch-search-and-update call
three functions isearch-search, isearch-push-state and isearch-update.

(isearch-edit-string): Save old point and
isearch-other-end to old-point and old-other-end before reading
the search string from minibuffer.  After exiting minibuffer set
point to old-other-end if point and the search direction is the
same as before reading the search string.
(isearch-del-char): Don't set isearch-yank-flag to t.  Put point
to isearch-other-end.  Instead of isearch-search-and-update call
three functions isearch-search, isearch-push-state and isearch-update.

(vc-git-register, vc-git-checkin): Use vc-git-command,
deal with multiple file arguments.
(vc-git-print-log): Deal with multiple file arguments.

(diff-refine-ignore-spaces-hunk): Rename from
diff-refine-hunk.  Adjust users.
(diff-unified-hunk-p, diff-splittable-p): New functions.
(diff-mode-menu): Use it to disable Split when it doesn't work.

*** empty log message ***

(diff-unified->context): Use the new `apply' undo entry kind
if applicable, so as to save undo-log space.

(diff-find-file-name): Add arg `batch'.

(diff-beginning-of-file-and-junk): New function.
(diff-file-kill): Use it.
(diff-beginning-of-hunk): Add arg `try-harder' using it.
(diff-restrict-view, diff-find-source-location, diff-refine-hunk):
Use it so they find the hunk even when we're in the file header.

(vc-git-revision-granularity,vc-git-root),
(vc-git-command,vc-git-dir-state,vc-git-dired-state-info),
(vc-git-create-repo): New functions.
(vc-git-registered): New autoloaded function definition.
(vc-git-registered): Use vc-git-root.
(vc-git-responsible-p): New defalias.
(vc-git-annotate-extract-revision-at-line): Uncomment.
(vc-git-print-log): Add the file name to the log.
(vc-git-log-view-mode): New derived mode.
(vc-git-diff,vc-git-annotate-command): Use vc-git-command.

* progmodes/grep.el (grep-compute-defaults): Keep default values.

*** empty log message ***

vc-git.el: New file.

(tex-font-script-display): Change default to 0.2.

* vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
for branches and new files.

* vc-hooks.el (vc-default-mode-line-string): Move mouse-face and
local-map handling ...
(vc-mode-line): ... here. Improve handling of help-echo.

* vc.el (mode-line-string): Document help-echo usage.

(reftex-access-parse-file): Do not risk destroying an existing buffer.

Sync with Tramp 2.1.10.

*** empty log message ***

Sync with Tramp 2.1.10.

(command-line-x-option-alist): Use x-handle-no-bitmap-icon.

(x-handle-no-bitmap-icon): New function.

(x-handle-no-bitmap-icon): New function.

(command-line-x-option-alist): Use x-handle-no-bitmap-icon,

(reftex-access-parse-file): Create parse file in a way that does not interfere
with recentf.

(change-log-fill-parenthesized-list): New function.
(change-log-indent): Call change-log-fill-parenthesized-list.
(change-log-fill-paragraph): Bind fill-indent-according-to-mode to
t.  Have lines with leading asterisk start a paragraph.

(math-emacs-precision, math-largest-emacs-expt)
(math-smallest-emacs-expt): New variables.
(math-use-emacs-fn): New function.
(math-exp-raw): Evaluate with `math-use-emacs-fn', when appropriate.

(image-dired-sane-db-file): New func.
(image-dired-write-tags, image-dired-remove-tag)
(image-dired-list-tags, image-dired-write-comments)
(image-dired-get-comment, image-dired-mark-tagged-files)
(image-dired-create-gallery-lists): Call new func.

(image-dired-sane-db-file): New func.
(image-dired-write-tags, image-dired-remove-tag)
(image-dired-list-tags, image-dired-write-comments)
(image-dired-get-comment, image-dired-mark-tagged-files)
(image-dired-create-gallery-lists): Call new func.

(vc-hg-diff): Use vc-hg-command.
(vc-hg-dir-state): Fix loop.
(vc-hg-print-log): Fix expected return value for vc-hg-command.
(vc-hg-next-version, vc-hg-delete-file, vc-hg-rename-file)
(vc-hg-register, vc-hg-create-repo, vc-hg-checkin)
(vc-hg-revert): Likewise.
(vc-hg-revision-table, vc-hg-revision-completion-table): New
functions.

(vc-hg-dir-state): Fix loop.
(vc-hg-print-log): Fix expected return value for vc-hg-command.
(vc-hg-next-version, vc-hg-delete-file, vc-hg-rename-file)
(vc-hg-register, vc-hg-create-repo, vc-hg-checkin)
(vc-hg-revert): Likewise.
(vc-hg-revision-table, vc-hg-revision-completion-table): New
functions.

(Customizing VC) <vc-handled-backends>: Update the default value.

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

(Why Version Control?): Improve previous change.

(change-log-resolve-conflict): Don't lose data if the merge fails.

(add-change-log-entry, add-log-current-defun, change-log-merge):
Use derived-mode-p rather than checking major-mode directly.

(compilation-auto-jump-to-first-error): Add
group and version.

(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
to after we've switched to the ChangeLog buffer so we get the right value.

(add-log-file-name): Use file-relative-name.

(cvs-mode-add-change-log-entry-other-window): Use a directory
name for buffer-file-name if it refers to a directory.

(vc-arch-diff): Fix last change.

(extraclean): Don't delete *~.

(clean): Don't delete *~.

(clean): Don't delete *~.

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

(install-lisp-SH, install-lisp-CMD): New targets.
(install): Use them to copy all *.el files before *.elc.
(clean): Don't delete *~.

(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
if not defined.

(compilation-start): Remember the original directory in a buffer-local
compilation-directory.
(compile): Set the global value of compilation-directory.
(recompile): Use compilation-directory even if run from the compilation buffer.

(vc-hg-diff): Use vc-hg-command.

Fix foreground/background color

Fix foreground/background color

(install-lisp-CMD, install-lisp-SH): Don't create subdirectories
in $(INSTALL_DIR)/lisp/ if they already exist.

(vc-hg-workfile-unchanged-p): New function.

(vera-mode-map): Move initialization into declaration.

(vera-re-search-forward, vera-re-search-backward):
Remove use of store-match-data.

(flymake-buildfile-dirs): Remove.
(flymake-find-buildfile): Use locate-dominating-file.

(locate-dominating-file): Add comment.

(vc-delistify): Use mapconcat.
(vc-do-command): Minor simplification.
(vc-expand-dirs): Use push.

Add todo item.