Use AS_HELP_STRING throughout.

(xterm-modify-other-keys-terminal-list): New
variable.
(xterm-turn-on-modify-other-keys): Only turn on modify-other-keys
if the selected frames is in
xterm-modify-other-keys-terminal-list.
(xterm-turn-off-modify-other-keys): Add an optional frame
parameter. Only turn off modify-other-keys if FRAME is in
xterm-modify-other-keys-terminal-list.
(xterm-remove-modify-other-keys): New function.
(terminal-init-xterm): Use it. Deal with delete-frame hook. Add
the selected frame to xterm-modify-other-keys-terminal-list.

Rewrite esr's changelog entry.

Regenerated.

Require Gtk/Glib 2.6.

(x-gtk-stock-map): Map diropen to system-file-manager.
(icon-map-list): New variable.
(x-gtk-map-stock): Use icon-map-list.

(update_frame_tool_bar): Handle stock name as a named icon
if it starts with "n:".

Regenerate.

(EMACS_ARG_Y, EMACS_ARG_N): New AC_DEFUNs.
Use them throughout in place of AC_ARG_WITH calls.

(log-view-current-file): Balance parens.

*** empty log message ***

(log-view-current-file): Give a more explicit error if
log-view-file-re fails to find a match.

*** empty log message ***

(comint-mode): Don't set scroll-conservatively.

*** empty log message ***

(eshell/time): Stringify and flatten the non-command arguments.

*** empty log message ***

*** empty log message ***

(byte-recompile-directory): Fix bug:
Don't expand top-level file name more than once.

Put quotes around nested macro calls.

(Date Conversions): Clarify definition of Julian day.
(Date Forms): Clarify definition of Julian date; add some history.

(server-process-filter): Don't display the splash screen.
It's annoying enough on the initial screen and becomes positively
obnoxious here.

*** empty log message ***

*** empty log message ***

*** empty log message ***

Use defstruct rather than macros.
Change naming to use "avl-tree--" for internal functions.

Regenerate.

Fix typo.

* url-parse.el (url): Use defstruct rather than macros.  Update all callers.

(x-menu-bar-open): Delete duplicated function from
the merge.
(global-set-key): Delete f10 mapping, now done in menu-bar.el.
(provide): Move to the end of file.

(vc-svn-diff-tree): Pass a list to vc-svn-diff.

(flyspell-mark-duplications-exceptions): New variable.  List of
exceptions for the duplicated word rule.
(flyspell-mark-duplications-flag): Mention it.
(flyspell-word): Treat it.

(create-file-buffer): If the filename sans directory starts with spaces,
remove them.

(update_frame_tool_bar): Initialize wbutton to NULL.

(x-gtk-stock-map): Add etc/images to keys.
(x-gtk-map-stock): Use two directory elements when matching
file name.

James Wright  <james at chumsley.org>

(eshell/info): New function.

Remove term-environment-variable.

(frame-initialize, make-frame): Don't set
term-environment-variable since it's not used any more.

(server-process-filter): Don't set
term-environment-variable since it's not used any more.

(tty-set-up-initial-frame-faces): Don't set
term-environment-variable since it's not used any more.

(setenv): Don't treat $TERM specially.

(Qterm_environment_variable): Remove.
(syms_of_frame): Don't init and staticpro it.

(Qterm_environment_variable): Remove.

(getenv_internal): Remove special case for $TERM.

$TERM is now set to dumb.

(normal-top-level): Set $TERM to `dumb' so that unless
stated otherwise, subprocesses do not send back escape sequences
corresponding to the terminal from which Emacs was started.

(set_initial_environment): Set Vinitial_environment only when
Vprocess_environment is built, otherwise I get an unexplained infinite loop.
(child_setup): Remove unused vars term_var and display_var.

*** empty log message ***

Trivial spacing and comment.

(Vinitial_environment): New variable.
(set_initial_environment): Initialize it.
(syms_of_callproc): Declare it.
(child_setup): Don't mess with TERM via Qterm_environment_variable; the
TERM under which a process runs is never related to the TERM in which
Emacs is running.

Require cl for compilation.

(outline-font-lock-levels): Comment out unused var.
(outline-font-lock-face): Wrap around face list to handle any nesting depth gracefully.

* net/ange-ftp.el: Add ange-ftp property to 'set-file-modes and
'set-file-times.

*** empty log message ***

(org-set-regexps-and-options): Use `org-remove-keyword-keys'.
(org-remove-keyword-keys): New function.

*** empty log message ***

Lower-case for orgtbl-mode.

*** empty log message ***

Version 5.07

(org-export-visible): Fix drawers before export.
(org-do-sort): Allow sorting by priority.
(org-agenda-files): Ignore non-existing files.
(org-agenda-skip-unavailable-files): New variable.
(org-ellipsis): All a face as value.
(org-mode): Interprete the face value of `org-ellipsis'.
(org-archive-save-context-info): New option.
(org-archive-subtree): Store context info in archived entry.
(org-fast-tag-selection-can-set-todo-state): New variable.
(org-fast-tag-selection): Allow setting TODO states through this
interface.
(org-cycle): Docstring updated.
(org-todo-keyword-faces): New option.
(org-get-todo-face): New function.
(org-set-font-lock-defaults, org-agenda-highlight-todo): Use
`org-get-todo-face'.
(org-switch-to-buffer-other-window): New function.
(org-table-edit-field, org-table-show-reference)
(org-table-edit-formulas, org-add-log-note)
(org-fast-tag-selection, org-agenda, org-prepare-agenda)
(org-timeline): Use `org-switch-to-buffer-other-window' instead of
`switch-to-buffer-other-window' to make sure that the temporary
windows show up on the current frame.
(org-mhe-get-message-real-folder, org-batch-store-agenda-views)
(org-get-entries-from-diary, org-replace-region-by-html): Don't
allow pop-up frames.
(org-agenda-get-deadlines, org-agenda-get-scheduled): Fixed
problems with time-of-day.
(org-export-get-title-from-subtree): New function.
(org-agenda-get-scheduled, org-agenda-get-deadlines): Fix problems
with listing items that are DONE.
(org-change-tag-in-region): New command.
(org-agenda-skip-scheduled-if-done)
(org-agenda-skip-deadline-if-done): Docstring clarified.
(org-mode): Hide drawers on startup.
(org-get-todo-face): New function.
(org-todo-keyword-faces): New option.

*** empty log message ***

(grep-files-aliases): Add cc alias.
Sort items in alphabetical order. Fix parens.

(grep-find-ignored-directories): Add
monotone _MTN bookkeeping directory in workspaces.  Add
RCS control directory.  List items in alphabetical order.

Regenerate.

Move here from top-level README.multi-tty, with some edits for
information made out-of-date by merge to trunk.

Move to admin/notes/multi-tty, with some edits.

Add in entries from README.multi-tty.

(AH_BOTTOM): Copy some manual changes made to src/config.in here so
they are not lost when it regenerates.

Comment.

* config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here...
* s/darwin.h: ... do it here.

(set_initial_environment): Rename from set_global_environment.

(${etc}DOC): Re-add a ${EXEEXT} which seems to have been
removed by mistake on the multi-tty branch.

(make_terminal_frame): Yet Another Int/Lisp_Object Mixup.
(Fmodify_frame_parameters): Return a value.

(png_load): Comment-out var only used in commented-out code.

(mark_ttys): Don't bother checking top_frame (incorrectly)
before passing it to mark_object.

(internal_resolve_face_name): Return a value.
(internal_resolve_face_name, resolve_face_name_error): Comment out.

(check_x_display_info): Yet Another Int/Lisp_Object Mixup.
(x_icon): Comment-out var only used in commented-out code.

(vc-hg-extra-menu-map): New variable.
(vc-hg-extra-menu, vc-hg-outgoing, vc-hg-incoming, vc-hg-push)
(vc-hg-pull): New functions.
(vc-hg-outgoing-mode, vc-hg-incoming-mode): New derived modes.

Don't require url, only autoloaded url
functions are used in this file.

(Fset_input_mode): Don't call `Fset_quit_char' if QUIT hasn't been
provided.

(mac_initialize): Delete declaration.

Typo.

(shell): Return correct value from interactive spec.

*** empty log message ***

Life is too short...

(emacs-version): Increase to 23.0.50.

Increase version to 23.0.50.

Increase version to 23.0.50.

Increase version to 23.0.50.

Increase version to 23.0.50.

Increase version to 23.0.50.

(emacs-version): Set back to 22.1.50 following inadvertent bump in
multi-tty merge.

Set version back to 22.1.50 following inadvertent bump in multi-tty merge.

(VERSION): Set back to 22.1.50 following inadvertent bump in multi-tty
merge.

Update copyright years, update license to GPLv3 or later.

Update copyright years, update license to GPLv3 or later.

License should be GPLv3 or later.

New option: --without-xaw3d.

(BASE_PURESIZE): Increase base value to 1164000.

Say that Gtk+ build uses stock icons.