(fortune-in-buffer): Fix a bug which forced
usage of `fortune-file' even though a FILE argument was passed to
the function.

(command-line): Remove always true test.

* emacs.c (standard_args): Add --daemon.
(main): Disconnect from the terminal when --daemon is passed.
(is_daemon): New variable.
(Fdaemonp): New function.
(syms_of_emacs): Defsubr it.

* startup.el (command-line): Start the server when in daemon mode.

* cmdargs.texi (Initial Options): Document --daemon.

(frame-initialize): Remove spurious setting of
special-display-function with the default value.

*** empty log message ***

Retain dual license as agreed to by the FSF.
However, bump GPL to Version 3.
Use @include for license text.

Merge from gnus--devo--0

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

(Qdelete_by_moving_to_trash): New Lisp_Object.
(syms_of_fileio): Add Qdelete_by_moving_to_trash.

(calcFunc-venum): Properly handle intervals.

(lisp-indent-offset): Fix custom type.  (Bug#1011)

(get_next_display_element): Handle string display correctly when
checking for the end of a box run.

* xdisp.c (get_next_display_element): Handle string display correctly
when checking for the end of a box run.

(Frename_file): Avoid copying to trash if a rename involves a delete. (Bug#964).

David De La Harpe Golden  <david at harpegolden.net>

(move-file-to-trash): Avoid recursive trashing if rename-file calls delete-file.

*** empty log message ***

Remove leading `*' from defcustom docs.
(fortune-program-options): Doc fix.  Allow to be a string again.  Add :version.
(fortune-in-buffer): Handle fortune-program-options as a string.

Justin Bogner  <mail at justinbogner.com>  (tiny change)

(fortune-program-options): Change to a list.
(fortune-in-buffer): Use apply.

(Defining Faces): Recommend against face variables.

Comment.

(Numbered Backups): Mention that some modes set version-control.

Jim Blandy  <jimb at red-bean.com>

(Numbered Backups): Reference File Variables, as well.
Remove discussion of Rmail's implementation.

Ulrich Mueller  <ulm at kph.uni-mainz.de>

Change encoding of file to utf-8.
(authors-coding-system): Likewise.

*** empty log message ***

Comments.

Ami Fischman  <ami at fischman.org>

(savehist-save): Handle errors in writing as well as reading.

(Fset_quit_char, Fset_input_meta_mode, Fset_output_flow_control)
(Fcurrent_input_mode): Support MSDOS frames as well as termcap frames.
(handle_interrupt): Remove "#ifndef MSDOS" around the call to get_named_tty.

Update ChangeLog

tq.el: Disable undo in buffer.

(proced-grammar-alist, proced-custom-attributes)
(proced-format-alist, proced-format, proced-filter-alist)
(proced-filter, proced-sort): Use defcustom.
(proced-mode): Fix docstring.
(proced-process-attributes): Handle return value nil of functions
in proced-custom-attributes.

(procfs_system_process_attributes): Fix last change.

(procfs_system_process_attributes): Fix cmdline in case /proc/PID/cmdline
is empty.

(main): Fix a typo in a comment.

(main): Use stdout rather than stdin to obtain the terminal (bug#427).

* emacsclient.c (main): Use stdout rather than stdin to obtain the
terminal (bug#427).

(x_wm_set_size_hint): Use x_display_pixel_width and x_display_pixel_height.

* frame.c (x_fullscreen_adjust): Declare var as Display_Info.

* w32fns.c (Fx_display_pixel_width, Fx_display_pixel_height)
  (compute_tip_xy): Use x_display_pixel_width, x_display_pixel_height.

(sgml-tag-syntax-table): Remove prefix
flag from "'" entry in sgml-tag-syntax-table.

(struct it): Move line_wrap away from the middle of
bitfields.  Move voffset in struct iterator_stack_entry after the
bitfields.  Move tab_width near after another short.

Add an item for using EMACS_INT for buffer/string positions.

*** empty log message ***

(comint-output-filter): Make output field properties front-sticky

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

* frame.h (struct frame): Move alpha from the middle of bitfields.

* window.h (struct window): Move frozen_window_start_p after the
rest of the bitfields to reduce padding.

* xterm.h (x_display_info): Remove `height' and `width' members.

* nsterm.h (ns_display_info): Remove `height' and `width' members.

* w32term.h (w32_display_info): Remove `height', `width',
`height_in', and `width_in' members.

* xterm.c (x_display_pixel_height, x_display_pixel_width): New
functions.
(x_calc_absolute_position): Use them.
(x_term_init): Omit removed `height' and `width' members.

* w32term.c (x_display_pixel_height, x_display_pixel_width): New
functions.
(w32_read_socket, x_calc_absolute_position): Use them.
(w32_initialize_display_info, w32_term_init): Omit removed members
of w32_display_info.

* nsterm.m (x_display_pixel_height, x_display_pixel_width): New
functions.
(ns_initialize_display_info): Omit removed members of
ns_display_info.

* xterm.c (x_display_pixel_height, x_display_pixel_width): New
functions.
(x_calc_absolute_position): Use them.
(x_term_init): Omit removed `height' and `width' members.

* xfns.c (Fx_display_pixel_width, Fx_display_pixel_height)
(compute_tip_xy): Use x_display_pixel_height and
x_display_pixel_width.

* frame.c (x_fullscreen_adjust): Use x_display_pixel_height and
x_display_pixel_width.

* xmenu.c (menu_position_func): Use x_display_pixel_height and
x_display_pixel_width.

(x_display_pixel_height, x_display_pixel_width): New functions.
(ns_initialize_display_info): Omit removed members of ns_display_info.

(ns_display_info): Remove `height' and `width' members.

(x_display_pixel_height, x_display_pixel_width): New functions.
(w32_read_socket, x_calc_absolute_position): Use them.
(w32_initialize_display_info, w32_term_init): Omit removed members
of w32_display_info.

(w32_display_info): Remove `height', `width', `height_in', and
`width_in' members.

(x_fullscreen_adjust): Use x_display_pixel_height and
x_display_pixel_width.

(menu_position_func): Use x_display_pixel_height and
x_display_pixel_width.

(Fx_display_pixel_width, Fx_display_pixel_height)
(compute_tip_xy): Use x_display_pixel_height and x_display_pixel_width.

(x_display_pixel_height, x_display_pixel_width): New functions.
(x_calc_absolute_position): Use them.
(x_term_init): Omit removed `height' and `width' members.

(x_display_info): Remove `height' and `width' members.

* vc-bzr.el (vc-bzr-show-log-entry):
* vc-git.el (vc-git-show-log-entry): Deal with a nil argument,
C-x v l for a directory uses that.

(auto-mode-alist): Use sieve-mode for .sv, .siv, and
.sieve files.

(make-help-screen): Preserve key bindings
established in help-mode call when exiting this macro.

(fill_gstring_header): Don't check FROM and TO here.
(composition_compute_stop_pos): Fix handling of static composition.
(Fcomposition_get_gstring): Check FROM and TO at first.

(Fcomposition_get_gstring): Yet another int/Lisp_Oject mixup (YAILOM).

Minor fix to last change.

(Fvertical_motion): Use position reported by iterator
instead of PT for determining screen motion (bug#943).

* indent.c (Fvertical_motion): Use position reported by iterator
instead of PT for determining screen motion (bug#943).

(composition_adjust_point): Fix int/EMACS_INT mixup.

Fix setting of composition-function-table.

(ftfont_shape_by_flt): Downcase family name.

(Info-follow-nearest-node): Don't raise an error for
mouse-1 clicks.

*** empty log message ***

(calc-convert-temperature):  Use default units when appropriate.

(flyspell-math-tex-command-p): Always catch errors raised in
`texmathp'.
(flyspell-tex-math-initialized): Remove.

* textmodes/flyspell.el (flyspell-math-tex-command-p): Always
catch errors raised in `texmathp'.
(flyspell-tex-math-initialized): Remove.

(Fcomposition_get_gstring): Make bigger gstring_work if necessary.

(switch-to-buffer-other-frame): Don't raise frame since
pop-to-buffer already does it.
(display-buffer-other-frame): Fix doc-string.

(select-frame-set-input-focus): With non-nil
mouse-autoselect-window always move mouse cursor to frame's
selected window.  Otherwise restore pre 2008-09-13 behavior.
(select-frame-by-name): Use select-frame-set-input-focus.

Remove file.

(diff-find-source-location): Update declaration.

(makefile-match-function-end): Move point.  (Bug#983)

(epg-start-verify): Pass "--verify" to gpgsm.

*** empty log message ***

(make_conversion_work_buffer): Avoid calling
Fget_buffer_create if it is not necessary.

* display.texi (Echo Area Customization): Fix typo.

* vc-rcs.el (vc-rcs-steal-lock, vc-rcs-checkout): Fix docstring typos.
  (vc-rcs-fetch-master-state, vc-rcs-system-release): Doc fixes.

* vc-rcs.el (vc-rcs-rollback): Fix typos in docstring.

*** empty log message ***

The Rmail/mbox merge has been abandoned in favor of a restart using
the current rmail.el file.  A comprehensive list of changes will be
supplied when pmail.el is morphed back into rmail.el

The current status is that pmail.el supports basic Rmail navigation
(no summary support) and shows the current message in a special
buffer using buffer-swap-text.  No decoding is done yet.  That is the
next step.

Rmail/mbox merge abandoned. Remove stale files.

Rmail/mbox merge abandoned.  Remove stale files.

(file-truename): Don't raise args-out-of-range error
when filename has no separator on windows-nt.  (Bug#982)

(Fselect_window): Don't update window_select_count and
use_time when norecord is not nil.

Fix commenting convenition.

(diff-find-file-name): Rename `batch' to `noprompt' and
be more honest when we don't know.
(diff-tell-file-name): Don't prompt before the actual prompt.
(diff-mode): Don't prompt in add-log-buffer-file-name-function.
(diff-find-source-location): Add `noprompt' argument.
(diff-current-defun): Don't prompt.

(proced-mark-face, proced-marked-face)
(proced-sort-header-face): Removed.
(proced-font-lock-keywords): Simplified.
(proced-format): Use face proced-sort-header.
(proced-format-interactive, proced-sort-interactive)
(proced-filter-interactive): Only call proced-update if the scheme
has changed.
(proced-sort-header): Use posn-actual-col-row.

(change-log-find-window): New variable.
(change-log-goto-source-1, change-log-goto-source): Set
change-log-find-window to window displaying source.
(change-log-next-error): Select window specified by
change-log-find-window.

(Finsert_file_contents): Delete incorrect decrement of specpdl_ptr.

*** empty log message ***

(pop-to-buffer): Select window before calling
select-frame-set-input-focus.

(select-frame-set-input-focus): With focus follows
mouse move mouse cursor to right window.

(proced-sort-header): New face.
(proced-sort-header-face): New variable.
(proced-format): Allow format value nil.  Use
proced-sort-header-face for header of sort column.
(proced-format-args): New function.
(proced-grammar-alist, proced-timer-flag, proced-process-alist)
(proced-header-help-echo, proced-field-help-echo, proced-timer)
(proced-toggle-timer-flag, proced, proced-mode): Doc fix.
(proced-refine): Renamed from proced-filter-attribute.  Doc fix.
(proced-sort-header): Bind also to mouse-1.
(proced-move-to-goal-column): Return position of point.
(proced-filter-interactive): Always revert listing.
(proced-format-ttname): Simplify.
(proced-update): Do not keep undo information.  Put point at
beginning of buffer if we generate the first listing.

*** empty log message ***

(doc-view-scroll-up-or-next-page)
(doc-view-scroll-down-or-previous-page): Fix scrolling in case of
vertically split windows.

(scan_for_column): Don't handle automatic composition if the current
buffer is not associated with a window.

(find_automatic_composition): Fix previous change.

(compose-gstring-for-graphic): Fix previous change.

(composition_reseat_it): If the current buffer is
not associated with a window, ignore the automatic composition.
(find_automatic_composition): Likewise.