(fancy-startup-text): Renamed from fancy-splash-text.
Several items removed, simplified, or put on one line.
(fancy-about-text): Add substantial contents, part of startup text.
(fancy-splash-head): Make "GNU" or "GNU/Linux" a link.
(normal-splash-screen): Call normal-mouse-startup-screen,
normal-no-mouse-startup-screen, or normal-about-screen.
(normal-mouse-startup-screen): New fn, broken out, shortened.
(normal-no-mouse-startup-screen): New fn, broken out.
(normal-about-screen): New function, contents all new.

(rx): Fix typo in docstring.

(custom-buffer-create-internal): Check tool-bar-mode is bound.

Johan Bockg�  <bojohan at dd.chalmers.se>

(ad-make-advised-docstring): Highlight note in doc string.

(Safe File Variables): Clarify `!' and risky variables.

*** empty log message ***

(initialize_w32_display): Zero unused hooks.

* server.el (server-start, server-unload-hook): Undo previous
change.

* xt-mouse.el: Undo previous change.

* term.c (Vsuspend_tty_functions, Vresume_tty_functions)
(syms_of_term, Fsuspend_tty, Fresume_tty): Undo previous change.

(init_tty) [WINDOWSNT]: Add hooks that are not accessible
in w32console.c.  Set up input.  Remove XXX comments that have been
confirmed as correct.

(fancy-about-text): New variable.
(fancy-splash-delay, fancy-splash-max-time): Remove user options.
(fancy-current-text, fancy-splash-stop-time)
(fancy-splash-outer-buffer): Remove variables.
(fancy-splash-head, fancy-splash-tail): Add new optional argument
`startup' and use it to conditionally display different texts for
Startup and About screens.  Don't display Help commands on the About
screen.
(fancy-splash-screens-1): Remove function and move its content to
`fancy-splash-screens' to the part that dislpays the About screen.
(exit-splash-screen): Don't treat specially exiting from
alternating screens.
(fancy-splash-screens): Rename argument `static' to `startup'.
Fix docstring.  Remove code for displaying alternating screens.
Use arg `startup' in calls to `fancy-splash-head', `fancy-splash-tail'.
Remove let-bind for `fancy-splash-outer-buffer' and add let-bind
for `inhibit-read-only'.
(normal-splash-screen): Rename argument `static' to `startup'.
Fix docstring.  Use argument `startup' to conditionally display
different texts for Startup and About screens.  Don't display Help
commands on the About screen.  Remove `unwind-protect' `sit-for'
delay and `kill-buffer' after it.
(display-startup-echo-area-message): Remove call to
`use-fancy-splash-screens-p' because image.el is preloaded and
doesn't display "Loading image... done".
(display-splash-screen): Rename argument `static' to `startup'.
Fix docstring.

(MULTI_KBOARD): Define.

(init_tty) [WINDOWSNT]: Pass terminal to
initialize_w32_display.
(init_tty) [MULTI_KBOARD]: Include this code on WINDOWSNT too.

(one_and_only_w32cons): Remove.
(initialize_w32_display): Take terminal argument.

(enum event_kind) <HORIZ_WHEEL_EVENT>: New event.

(discard_mouse_events): Discard it.
(make_lispy_event): Translate it to a lisp event.
(lispy_wheel_names): Add wheel-left and right events.
(syms_of_keyboard): Enlarge wheel_syms.

Horizontal mouse wheel support:
(w32_wnd_proc) <WM_DROPFILES>: Merge with WM_MOUSEWHEEL.
<WM_MOUSEHWHEEL>: Pass new system message to lisp.

MULTI_KBOARD support:
(x_create_tip_frame) [MULTI_KBOARD]: Get keyboard from
terminal.

(WM_MOUSEHWHEEL): Define if system headers don't.

Support for horizontal scroll wheels on some mice:
(construct_mouse_wheel): Make HORIZ_WHEEL_EVENT
from WM_MOUSEHWHEEL.
(w32_read_socket) <WM_MOUSEHWHEEL>: Treat as WM_MOUSEWHEEL.

MULTI_KBOARD support:
(w32_create_terminal) [MULTI_KBOARD]: Create a new
keyboard for the terminal.

* server.el (server-start, server-unload-hook):
suspend-tty-functions has been renamed to suspend-tty-hook.

* xt-mouse.el: Likewise. resume-tty-functions has been renamed to
resume-tty-hook.

* term.c (Vsuspend_tty_hook): Rename from Vsuspend_tty_functions.
(Vresume_tty_hook): Rename from Vresume_tty_functions.
(syms_of_term): Rename suspend-tty-functions to suspend-tty-hook
and resume-tty-function to resume-tty-hook.
(Fsuspend_tty, Fresume_tty): Use new names.

Rewrite changelog entry.

*** empty log message ***

Remove entries for an incorrect bug report.

Diane Murray  <disumu at x3y2z1.net>

(url-http-parse-headers): Bind the current buffer rather than calling
`url-mark-buffer-as-dead' with `current-buffer', so that the correct
buffer is killed if `url-retrieve-synchronously' gets redirected to a
new URL.

* loadup.el: Fix merge problem, only load "button" once.

Installed a workaround for the vc-svn log problem.

Improve previous change.
(vc-svn-print-log): If there is only one file, use "Working file:" as
the prefix, for the sake of log-view-current-file.

*** empty log message ***

(vc-svn-print-log): Change the "Working file" prefix back to singular,
for the sake of log-view.

Remove CVS $Id$ header.  Comment.

*** empty log message ***

*** empty log message ***

Regenerate.

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.