* doc/misc/rcirc.texi (Configuration): Bug-fix: `rcirc-default-user-full-name' is now `rcirc-default-full-name'. Reported by Elias Pipping <pipping@exherbo.org>.

* eshell/em-ls.el: Display `ls -l' dates in ISO format (Bug#8440).
(eshell-ls-date-format): New defcustom.
(eshell-ls-file): Use it.

* lisp/help-fns.el (describe-variable): Fix message for terminal-local vars.

* lisp/net/ange-ftp.el: Allow loading .gz files (Bug#6923).
(ange-ftp-make-tmp-name): New arg.
(ange-ftp-file-local-copy): Use it.

Remove incorrect ChangeLog entry from last commit.

Coding system fix for tar-untar-buffer (Bug#8870).

* lisp/tar-mode.el (tar-untar-buffer): Set coding-system-for-write
to no-conversion.

Use window- prefix more consistently.  Fix two buffer display bugs.

* window.c (resize_window_check): Rename to window_resize_check.
(resize_window_apply): Rename to window_resize_apply.
(Fresize_window_apply): Rename to Fwindow_resize_apply.
(Fdelete_other_windows_internal, resize_frame_windows)
(Fsplit_window_internal, Fdelete_window_internal)
(grow_mini_window, shrink_mini_window)
(Fresize_mini_window_internal): Fix callers accordingly.

* window.el (resize-window-reset): Rename to window-resize-reset.
(resize-window-reset-1): Rename to window-resize-reset-1.
(resize-window): Rename to window-resize.
(window-min-height, window-min-width)
(resize-mini-window, resize-this-window, resize-root-window)
(resize-root-window-vertically, adjust-window-trailing-edge)
(enlarge-window, shrink-window, maximize-window)
(minimize-window, delete-window, quit-restore-window)
(split-window, balance-windows, balance-windows-area-adjust)
(balance-windows-area, window-state-put-2)
(display-buffer-even-window-sizes, display-buffer-set-height)
(display-buffer-set-width, set-window-text-height)
(fit-window-to-buffer): Rename all "resize-window" prefixed
calls to use the "window-resize" prefix convention.
(display-buffer-alist): Fix symbol for label specifier.
(display-buffer-reuse-window): Set reuse-dedicated to cdr of
corresponding specifier.
Reported by Juanma Barranquero <lekktu@gmail.com>.

src/makefile.w32-in: Redesign dependencies.

Use better names for window-next/-prev and window-vchild/-hchild.

* window.c (Fwindow_vchild): Rename to Fwindow_top_child.
(Fwindow_hchild): Rename to Fwindow_left_child.
(Fwindow_next): Rename to Fwindow_next_sibling.
(Fwindow_prev): Rename to Fwindow_prev_sibling.

* window.el (window-right, window-left, window-child)
(window-child-count, window-last-child)
(window-iso-combination-p, walk-window-tree-1)
(window-atom-check-1, window-tree-1, delete-window)
(window-state-get-1, display-buffer-even-window-sizes): Adapt to
new naming conventions - window-vchild, window-hchild,
window-next and window-prev are now called window-top-child,
window-left-child, window-next-sibling and window-prev-sibling
respectively.

Auto-commit of loaddefs files.

Have overlays with window property respect clone numbers.

* buffer.c (Qclone_number): Declare static and DEFSYM it.
(sort_overlays, overlay_strings): When an overlay's clone number
matches the window's clone number process the overlay even if
the overlay's window property doesn't match the current window.

(ses-destroy-cell-variable-range): Fix heading comment convention.
(ses-call-printer): Does not pass an empty string to formatter when the cell is empty to keep from barking printer Calc math-format-value.

Implement battery-mode-line-limit option.

rmailmm: Handle truncated messages.

flymake.el fix for bug#8866.

* lisp/progmodes/flymake.el (flymake-err-line-patterns):
Allow for column numbers in the ant/javac pattern.

Update default value of `vc-revert-show-diff'.

(ses-relocate-range): Keep rest of arguments for ses-range.
(ses--clean-!, ses--clean-_): New functions.
(ses-range): Add configurability of readout order, and conversion to Calc vector.

(ses-repair-cell-reference-all): New function.
(ses-cell-symbol): Set macro as safe, so that it can be used in
formulas.

Update cycle detection algorithm.
(ses-localvars): Add ses--Dijkstra-attempt-nb and
ses--Dijkstra-weight-bound, and initial values thereof when
applicable.
(ses-set-localvars): New function.
(ses-make-cell): Add property-list as a cell element.
(ses-cell-property-get-fun, ses-cell-property-get)
(ses-cell-property-delq-fun, ses-cell-property-set-fun)
(ses-cell-property-pop-fun, ses-cell-property-get-handle-fun): New
functions.
(ses-cell-property-set, ses-cell-property-pop)
(ses-cell-property-get-handle): New macro.
(ses-cell-property-handle-car, ses-cell-property-handle-setcar):
New aliases, used for code readability.
(ses-calculate-cell, ses-update-cells): Use Dijkstra algorithm for
cycle detection.
(ses-self-reference-early-detection): New defcustom.
(ses-formula-references): Robustify against self-refering cells.
(ses-mode): Use ses-set-localvars.
(ses-command-hook): Add call to ses-initialize-Dijkstra-attempt
before lauching the update processing.
(ses-initialize-Dijkstra-attempt): New function.
(ses-recalculate-cell): Update for cycle detection based on
Dijkstra algorithm.

Fix commenting and indenting convention.

* .bzrignore: Add lisp/mh-e/mh-autoloads.el and lisp/mh-e/mh-cus-load.el.

lwlib/Makefile.in (ALL_CFLAGS): Add -I../lib for generated header files in out-of-tree build.

* lisp/bs.el (bs-cycle-next): Complete last change.

Fix typos in lisp/ChangeLog.

lisp/faces.el (list-faces-display): Add help-mode-map to output.

Fixes: debbugs:8939

Fix stupid typo with gnutls-clii.
Don't re-get capabilities unless we're reconnecting.

Bind coding-system-for-* to binary to possibly avoid line encoding
issues on Windows (among other things).

Merge changes made in Gnus trunk.

gnus-art.el (gnus-article-stop-animations): New function to stop any animations going on at article exit time.
gnus-registry.el (gnus-registry-user-format-function-M): Reinstate, since removing it breaks people upgrading.
shr.el (shr-put-image): Use the new interface for animating images.
 (shr-put-image): Animate for 60 seconds.

If the SMTP server supports STARTTLS, but Emacs has no built-in or
external STARTTLS support, then report this in a sensible fashion to
the user.

Add global-hl-line-sticky-flag (Bug#8323).

* lisp/hl-line.el (hl-line-sticky-flag): Doc fix.
(global-hl-line-sticky-flag): New option.
(global-hl-line-highlight): Obey it.

* lisp/vc/vc.el (vc-revert-show-diff): Default to t.

Fix wm_size-hints race between KDE/KWin and Gtk+ 3.

* emacsgtkfixed.c: State that this is only used with Gtk+3.
(_EmacsFixedPrivate): Remove minwidth/height.
Add struct frame *f.
(emacs_fixed_init): Initialize priv->f.
(get_parent_class, emacs_fixed_set_min_size): Remove.
(emacs_fixed_new): Set priv->f to argument.
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height): Use min_width/height from
frames size_hint to set minimum and natural.
(XSetWMSizeHints, XSetWMNormalHints): Override these functions
and use min_width/height from frames size_hint to set
min_width/height (Bug#8919).

* emacsgtkfixed.h: State that this is only used with Gtk+3.
(emacs_fixed_set_min_size): Remove.
(emacs_fixed_new): Take frame as argument.

* gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
(x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix
indentation.

ChangeLog fix.

Avoid bidi-related crashes in Cperl Mode.

 src/bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling
 bidi_at_paragraph_end, since fast_looking_at doesn't like to be
 called at ZV.

* allout-widgets.el (allout-widgets-post-command-business): Stop decorating
intermediate isearch matches.  They're not being undecorated when an
isearch is continued past, and isearch automatically collapses them.  This
leads to "widget leaks", where decorated items accumulate in collapsed
areas.  Lines with lots of hidden widgets can slow down cursor travel,
substantially.  Too much complicated machinery would be needed to ensure
undecoration, so we're doing without this nicety.

(allout-widgets-tally-string): Don't try to do a hash-table-count of
allout-widgets-tally when it's nil.  This eliminates spurious "Error during
redisplay: (wrong-type-argument hash-table-p nil)" warnings in *Messages*
when allout-widgets-maintain-tally is t.

Fix some more display-buffer related bugs.

* window.el (display-buffer-normalize-argument): Rename to
display-buffer-normalize-arguments.  Handle special meaning of
LABEL argument.  Respect special-display-function when popping
up a new frame.  Fix code searching for a window showing the
buffer on another frame.
(display-buffer-normalize-specifiers): Call
display-buffer-normalize-arguments.
(display-buffer-in-window): Don't undedicate the window if its
buffer remains the same.
Reported by Drew Adams <drew.adams@oracle.com>.
(display-buffer-alist): Add choice for same-window macro
specfier.
(display-buffer): Mention special meaning of LABEL argument in
doc-string.  Fix quoting.  Don't pop up a new frame even as
fallback.

Merge changes made in Gnus trunk.

gnus.texi (Summary Mail Commands): Document `gnus-summary-reply-to-list-with-original'.
auth-source.el (with-auth-source-epa-overrides): Fix compilation error with `find-file-hooks' on Emacs 22.
 (with-auth-source-epa-overrides): Ugly hack to Wrap the `find-file-hook' things in `symbol-value' to avoid compilation warnings on all architectures.
spam.el (spam-stat): Require in a normal fashion without binding `spam-stat-install-hooks' to avoid compilation warnings.
spam-stat.el (spam-stat-install-hooks): Removed.
 (spam-stat-install-hooks): Don't run automatically.
gnus-msg.el (gnus-summary-reply-to-list-with-original): New command and keystroke.

lisp/bs.el (bs-cycle-next): Pass current buffer to `bury-buffer'.

Fixes: debbugs:8911

Auto-commit of generated files.

* lisp/emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
(Bug#8934)

Use built-in TLS support if `gnutls-available-p' is true.

Extend emacs register to accept value from registerv-make

A value object returned by `registerv-make' has slots to control
jump-to-register, describe-register-1 and insert-register.

New option for showing a diff in vc-revert (Bug#8927).

* vc/vc.el (vc-revert-show-diff): New defcustom.
(vc-diff-internal): New arg specifying diff buffer.
(vc-revert): Obey vc-revert-show-diff.  If we show a diff, don't
reuse an existing *vc-diff* buffer.

* lisp/progmodes/cperl-mode.el (cperl-mode): Derive from prog-mode.

Fix handling of pending signals in wait_reading_process_output (Bug#8869).

* process.c (wait_reading_process_output): Bypass select if
waiting for a cell while ignoring keyboard input, and input is
pending.  Suggested by Jan Djärv.

* lisp/progmodes/f90.el (f90-looking-at-critical): Doc fix.

* doc/emacs/fortran-xtra.texi (Fortran): F90 mode is also for F2008.

* etc/NEWS: Mention this.

Add support for block and critical blocks to f90.el.

* lisp/progmodes/f90.el (f90-critical-indent): New option.
(f90-font-lock-keywords-2, f90-blocks-re, f90-end-block-re)
(f90-start-block-re, f90-mode-abbrev-table): Add block, critical.
(f90-mode): Doc fix.
(f90-looking-at-critical, f90-looking-at-end-critical): New funcs.
(f90-no-block-limit, f90-calculate-indent, f90-end-of-block)
(f90-beginning-of-block, f90-next-block, f90-indent-region)
(f90-match-end): Handle block, critical.

Add some co-array stuff to f90.el.

* lisp/progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re):
(f90-procedures-re, f90-constants-re): Add some co-array stuff.

Add some more F2008 font-locking for f90.el.

* lisp/progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re):
Add some F2008 stuff.

* lisp/calendar/diary-lib.el: Comment fix.

Avoid some code duplication in diary-lib.el.

* lisp/calendar/diary-lib.el (diary-included-files): Doc fix.
(diary-include-files): New function, extracted from
diary-include-other-diary-files and diary-mark-included-diary-files.
(diary-include-other-diary-files, diary-mark-included-diary-files):
Just call diary-include-files.
(diary-mark-entries): Reset diary-included-files on first call.

When marking, visit included diary-files in temp buffers.

Ref: bug#8920, but not a bug.

* lisp/calendar/diary-lib.el (diary-mark-entries)
(diary-mark-included-diary-files):
Visit included diary-files in temp buffers.

* lisp/progmodes/f90.el (f90-procedures-re): Add F2008 "is_contiguous".

Add submodule support to f90.el.

* lisp/progmodes/f90.el (f90-keywords-re, f90-font-lock-keywords-1)
(f90-blocks-re, f90-program-block-re, f90-end-block-re)
(f90-start-block-re, f90-imenu-generic-expression)
(f90-looking-at-program-block-start, f90-no-block-limit):
Add support for submodules.

ChangeLog fix.

Add missing ChangeLog for previous commit.

Add some F2008 keywords to f90.el font-locking.

* lisp/progmodes/f90.el (f90-keywords-re, f90-procedures-re)
(f90-constants-re): Add some F2008 stuff.

* lib-src/emacsclient.c (print_help_and_exit): More fixing of previous.

* lib-src/emacsclient.c (print_help_and_exit): Fix previous change.

Merge from trunk.

Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

Minor additions for previous emacsclient change.

* lib-src/emacsclient.c (decode_options) <opt>: Add `F:'.
(print_help_and_exit): Mention --frame-parameters.

Simplify unloading functions after 2011-06-25T17:42:18Z!lekktu@gmail.com.

* allout.el (allout-unload-function): Pass -1 to `allout-mode'.

* proced.el (proced-unload-function):
* progmodes/cperl-mode.el (cperl-mode-unload-function): Remove.

* ses.el (ses-unload-function):
* emacs-lisp/re-builder.el (re-builder-unload-function): Simplify.

Allow emacsclient to set parameters of new graphical frames (bug#5864)

* lib-src/emacsclient.c (longopts, decode_options, main): Add frame-parameters.

* lisp/server.el (server-create-window-system-frame): Add parameters arg.
(server-process-filter): Doc fix.  Handle frame-parameters.

* doc/emacs/misc.texi (emacsclient Options): Mention --frame-parameters.
* doc/man/emacsclient.1: Mention --frame-parameters.

* etc/NEWS: Mention this.

emacs-buildstatus means reports of build failures are unlikely to be needed.

* loadhist.el (unload--set-major-mode): New function.
  (unload-feature): Use it.

* progmodes/python.el (python-after-info-look): Add autoload cookie.
  (python-unload-function): New function.

Fixes: debbugs:8781 debbugs:8730

* lisp/mail/rmail.el (rmail-show-message-1): Use restore-buffer-modified-p.

Add icecat to the firefox candidates list.

Use gnulib's dup2 module instead of rolling our own.

* Makefile.in (GNULIB_MODULES): Add dup2.
* configure.in: Do not check for dup2; gnulib does that now.
* lib/dup2.c, m4/dup2.m4: New files, from gnulib.
* src/sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.

Move DEFSYM to lisp.h and use everywhere.

lisp/progmodes/verilog-mode.el (verilog-mode): Fix test for bound variable.

* gnutls.c (syms_of_gnutls): Use the DEFSYM macro from character.h.

auth-source.el (auth-source-netrc-cache): Move forward.

Going to grep hit in Rmail buffer finds the message.

Work with changes in mail-bury.

* lisp/emacs-lisp/smie.el (smie-bnf->prec2): Give more understandable error
messages for adjacent non-terminals.

Marking message as "seen" should not mark buffer as changed.

Don't reuse previous Message-id when resending.

* net/tramp-sh.el (tramp-method-out-of-band-p): Check, whether
SIZE is a number.

Auto-commit of generated files.

Fix display-buffer related bugs reported by Thierry Volpiatto.

* window.el (get-lru-window, get-mru-window)
(get-largest-window): Never return a minibuffer window.
(display-buffer-pop-up-window): Fix a bug that could lead to
reusing the minibuffer window.
(display-buffer): Pass original specifier argument to
display-buffer-function instead of the normalized one.
Reported by Thierry Volpiatto <thierry.volpiatto@gmail.com>.

* lib/getopt.c, lib/stat.c, m4/gl-comp.m4: Merge from gnulib.

Merge from trunk.

* print.c (printchar, strout): Check for string overflow.

(PRINTPREPARE, printchar, strout):
Don't set size unless allocation succeeds.

* minibuf.c (read_minibuf_noninteractive): Use ptrdiff_t, not int,

for sizes.  Check for string overflow more accurately.
Simplify newline removal at end; this suppresses a GCC 4.6.0 warning.

* macros.c: Integer and buffer overflow fixes.

* keyboard.h (struct keyboard.kbd_macro_bufsize):
* macros.c (Fstart_kbd_macro, store_kbd_macro_char):
Use ptrdiff_t, not int, for sizes.
Don't increment bufsize until after realloc succeeds.
Check for size-calculation overflow.
(Fstart_kbd_macro): Use EMACS_INT, not int, for XINT result.

* lread.c (read1): Check for size overflow.

* lisp.h (DEFVAR_KBOARD): Use offsetof instead of char * finagling.

* lread.c (read_escape): Avoid int overflow.

(Fload, openp, read_buffer_size, read1)
(substitute_object_recurse, read_vector, read_list, map_obarray):
Use ptrdiff_t, not int, for sizes.
(read1): Use EMACS_INT, not int, for sizes.

Move completing-read-function and completing-read-default to elisp

* lread.c: Integer overflow fixes.

(read_integer): Radix is now EMACS_INT, not int,
to improve quality of diagnostics for out-of-range radices.
Calculate buffer size correctly for out-of-range radices.
(read1): Check for integer overflow in radices, and in
read-circle numbers.

* image.c (cache_image): Check for size arithmetic overflow.

Fix typo in last check-in.

Clean up the ssl/tls support to be able to use the built-in support, too.

nnimap.el (nnimap-open-connection-1): Fix indentation.

Make mail exit more nicely when Rmail is in use.

Fix bug: Rmail f copied the entire Rmail file into *mail*.

* lread.c (read_escape): Check for hex character overflow.

* lread.c: Integer overflow issues.

(saved_doc_string_size, saved_doc_string_length)
(prev_saved_doc_string_size, prev_saved_doc_string_length):
Now ptrdiff_t, not int.
(read1): Don't assume doc string length fits in int.  Check for
out-of-range doc string lengths.
(read_list): Don't assume file position fits in int.