Merge from mainline.

Port to Sun C 5.11, which has __attribute__ ((__aligned (N))).

* md5.h (ATTRIBUTE_ALIGNED): New macro.
(struct md5_ctx): Use it.

Merge from mainline.

Port to Solaris 10, which doesn't support FC_HINT_STYLE.

lisp/gnus/mml2015.el (mml2015-signers): Minor doc fix.

Allow packages to be reinstalled.

* emacs-lisp/package.el (package--write-file-no-coding): Remove EXCL arg.
(package-unpack-single): Don't use it.

Adapt to Subversion change, with no .svn directory in each sub directory.

http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html

* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root.
(vc-svn-root): New function.  Make vc-svn-responsible-p an alias.
(vc-svn-repository-hostname): Use "svn info".

* lisp/simple.el (delete-trailing-whitespace): New optional buffer
bound parameters.

Save unmodified buffers when buffer-file-name doesn't exist.

* files.el (basic-save-buffer): save unmodified buffers when
the file pointed by buffer-file-name doesn't exist.

* xterm.c (x_set_frame_alpha): Access data before it is free:d.
Make sure we don't do x_catch_errors twice.

* lisp/net/rcirc.el (defun-rcirc-join): Accept multiple channels.

* lisp/emacs-lisp/cl-specs.el (multiple-value-bind): Fix debug spec.

* lib/getopt_.h: Fix typo in _GL_ARG_NONNULL license comment.

lwlib/Makefile.in misc cleanup.

* lwlib/Makefile.in (USE_X_TOOLKIT, RM, TOOLKIT_DEFINES): Remove.
(ALL_CFLAGS): Remove -I.
(config_h, lisp_h, src_h): New variables.
(globals_h): Rename from $globals.
($(globals_h)): Check cd exit status.
(lwlib.o): Remove special rule.
(lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o, xlwmenu.o):
Add lisp.h and config.h to prereqs.
(lwlib-utils.o): Add lwlib.h to prereqs.
(lwlib.o): Add lwlib-utils.h and lwlib-Xm.h to prereqs.
(lwlib-Xlw.o): Add xlwmenu.h to prereqs.
(xlwmenu.o): Add ../src/xterm.h to prereqs.
(mostlyclean): Forget about "core" files.

* lwlib/Makefile.in: Standardize on $(), not ${}.

Merge from mainline.

* net/rcirc.el (rcirc-send-ctcp): Remove spurious arg to `format'.

gnus-sum.el (gnus-summary-save-parts): Use read-directory-name.

* lisp/server.el (server-process-filter): Use pcase.

* lisp/emacs-lisp/smie.el (smie-blink-matching-open): Don't use `pos' in two
conflicting ways.
(smie-indent--parent): Extend to "parent of arg".
(smie-indent-inside-string): New function.
(smie-indent-functions): Use it.

* lisp/vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid
bzr locking race condition.

* lisp/gnus/message.el (message-bury): Don't pop up a new window when selected
window is dedicated.

* lisp/emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
still valid before using it.

* lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to
`message' -> `compilation-message' rename.

Fixes: debbugs:8004

Merge from mainline.

Move keymap initialization into declaration.
* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.

* lisp/net/rcirc.el: Add PRIVMSG and CTCP functions.
(rcirc-send-privmsg, rcirc-send-ctcp): New functions.
(rcirc-keepalive, rcirc-cmd-ctcp, rcirc-ctcp-sender-PING)
(rcirc-cmd-me, rcirc-authenticate): Use them.

[admin/ChangeLog]

Remove no-longer needed getloadavg symbols.
* CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
(LDAV_SYMBOL): Remove.
[src/ChangeLog]
Remove no-longer needed getloadavg symbols.
* m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
* s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
* s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
* s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
(LDAV_SYMBOL): Remove.
* s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
* s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.

Merge from mainline.

Merge from gnulib.

lwlib/ trivia.

* lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib-utils.c, lwlib.c, xlwmenu.c:
Standardize on <> for includes from the ../src directory.

Undo my previous commit, as per Stefan.

New file lib/ChangeLog, with entries moved from ChangeLog

* src/Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.

Otherwise, lwlib/ and src/ would try to run make-docfile at the same
time, and one of them would lose when its output file disappeared.

* arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.

* allout.el: Synopsis: Change allout user configuration so auto-activation
is controlled solely by customization `allout-auto-activation'.

Synopsis: Change allout user configuration so auto-activation is controlled
solely by customization `allout-auto-activation'.

(allout-auto-activation-helper) (allout-setup): New autoloads implement new
custom set procedure for allout-auto-activation.  Also, explicitly invoke
(allout-setup) after allout-auto-activation is custom-defined, to effect
the settings in emacs sessions besides the few where allout-auto-activation
customization is donea.
(allout-auto-activation): Use allout-auto-activation-helper to :set.
Revise the docstring.
(allout-init): Reduce functionality to just customizing
allout-auto-activation, and mark obsolete.
(allout-mode): Respect string values for allout-auto-activation.  Run
allout-after-copy-or-kill-hook without any args.
(allout-mode) (allout-layout) (allout-default-layout) (outlineify-sticky):
Adjust docstring for new scheme.
(allout-after-copy-or-kill-hook): No arguments - hook implementers should
concentrate on the kill ring.

Merge changes made in Gnus trunk.

nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async code for now, since it doesn't work for all users.
message.el (message-options): Make message-options really buffer local.
shr.el (shr-tag-body): Add support for text attribute in body markups.

Update the Windows build according to 2011-02-08T21:42:56Z!tromey@redhat.com and 2011-02-09T17:04:43Z!schwab@linux-m68k.org.

 src/makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): New
 macros.
 (globals.h, gl-stamp): New targets.
 (clean): Clean gl-stamp and globals.h.
 nt/makefile.w32-in (bootstrap-nmake, bootstrap-gmake): Make the
 "make-docfile" target in lib-src, before bootstrapping the src
 directory.  Needed since building in src needs to run make-docfile
 to produce globals.h.

* lisp/progmodes/sh-script.el (sh-font-lock-open-heredoc): Fix case
of here-doc that immediately follows a comment.
* .bzrignore: Ignore globals.h and related stamp.
* test/indent/shell.sh:
* test/indent/shell.rc: New files.

* src/Makefile.in (gl-stamp): Create globals.h here.
(globals.h): Don't do it here.
(mostlyclean): Clean globals.h and gl-stamp.

Fix tracking visibility in ERC.

* lisp/erc/erc-track.el (erc-window-configuration-change): New function.
This will allow to track buffer visibility when a command is
finished to executed.  Idea stolen from rcirc.
(track): Put erc-window-configuration-change in
window-configuration-change-hook.
(erc-modified-channels-update): Remove
erc-modified-channels-update from post-command-hook after update.

* admin/notes/bugtracker: Small updates.

Update lucid toolkit build for src/globals.h being a generated file.

* lwlib/Makefile.in (@SET_MAKE@): New, set by configure.
(globals): New variable and rule.
(lwlib-utils.o, lwlib.o, lwlib-Xlw.o, lwlib-Xaw.o, lwlib-Xm.o)
(xlwmenu.o): Add dependency on src/globals.h.

Sync texinfo.tex and sed-related fixes from gnulib.

* lisp/net/rcirc.el (rcirc-ctcp-sender-PING): Simplifying.

* src/Makefile.in ($(otherobj)): Depend on globals.h.

* make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT.

Remove unnecessary manual advice about eval-after-load (Bug#7986).

* loading.texi (Hooks for Loading): Remove unnecessary manual advice
about eval-after-load.

* lisp/net/rcirc.el (rcirc-cmd-ctcp): Use dedicated function when
available.
(rcirc-ctcp-sender-PING): New function.

Make globals.h a generated header
* configure: Rebuild.
* configure.in (NS_OBJC_OBJ): New subst.
lib-src
* make-docfile.c: Unconditionally include stdlib.h.
(generate_globals): New global.
(xrealloc): New function.
(main): Handle '-g'.  Call start_globals, write_globals.
(scan_file): Conditionally call put_filename.
(start_globals): New function.
(struct global): New.
(num_globals, globals): New globals.
(add_global, compare_globals, write_globals): New functions.
(scan_c_file): Update for "-g".
(scan_lisp_file): Fail if "-g".
(enum global_type): New.
src
* Makefile.in (NS_OBJC_OBJ): New variable.
(base_obj): Rename from 'obj'.
(obj): New variable.
(globals.h, gl-stamp, $(obj)): New targets.
(GLOBAL_SOURCES): New variable.
* globals.h: Remove.
* nsselect.m (Vselection_alist): Define.  Reverts part of
2011-01-19T22:11:33Z!jan.h.d@swipnet.se.
* buffer.c: Don't use "no_cell" for name of kill-buffer-hook's
variable.
* xselect.c (Vselection_alist): Define.  Reverts part of 2011-01-19T23:32:42Z!eggert@cs.ucla.edu.

* lisp/obsolete/pc-select.el: Rename from emulation/pc-select.el.
Remove the mark/nomark handling, and activate shift-select-mode instead.
* lisp/obsolete/pc-mode.el: Rename from emulation/pc-mode.el.

Fixes: debbugs:7940

message.el (message-options): Make message-options a local variable.

Import getloadavg module from gnulib.

font.c (Ffont_get): Do not cache :otf value.

update for autoloads

nnimap.el (nnimap-update-info): Simplify split history test.

calc/calc-units.el (math-logunits-quant): Add support for
non-logarithmic units.

allout.el (allout-after-copy-or-kill-hook): New hook for extension-specific
processing of killed text.
(allout-mode): Include new allout-after-copy-or-kill-hook among mentioned
hooks.
(allout-kill-line) (allout-kill-topic): Ensure that processing after kill
happens even if barf-if-buffer-read-only is raised.  Include new
allout-after-copy-or-kill-hook among that subsequent processing.
(allout-deannotate-hidden): Actually remove the annotation text properties.

Regenerate lib/getopt_.h.

* allout.el (allout-listify-exposed): Copy text sans text properties.

(allout-listify-exposed): Copy text sans text properties.

nnimap.el (nnimap-update-info): Refactor slightly.
 (nnimap-update-info): Tell Gnus whether there are any \Recent messages.
 (nnimap-update-info): Clean up slightly.
 (nnimap-quirk): Add quirk for Gmail IMAP which bugs out on NUL characters.
 (nnimap-process-quirk): Renamed function to avoid collision.
 (nnimap-update-info): Fix macrology bug-out.

* dbus.texi (Bus names): Adapt descriptions for
dbus-list-activatable-names and dbus-list-known-names.

* net/dbus.el (dbus-list-activatable-names): Add optional argument BUS.

* image.c: conform to C89 pointer rules

* xml.c: conform to C89 pointer rules

* ralloc.c: conform to C89 pointer rules

* xfont.c: conform to C89 pointer rules

* doprnt.c, indent.c, character.c: conform to C89 pointer rules

* callproc.c: conform to C89 pointer rules

* process.c: conform to C89 pointer rules

* lread.c: conform to C89 pointer rules

* fns.c: conform to C89 pointer rules

* callint.c: conform to C89 pointer rules

* editfns.c: conform to C89 pointer rules

* print.c: conform to C89 pointer rules

* data.c etc: conform to C89 pointer rules

Merge: * alloc.c: conform to C89 pointer rules

* alloc.c: conform to C89 pointer rules

Eliminate newline

calc.texi (Logarithmic Units): New section

* search.c: conform to C89 pointer rules

* casefiddle.c: conform to C89 pointer rules

* dired.c: conform to C89 pointer rules

Merge: gnulib: allow multiple gnulib generated replacements to coexist

gnulib: allow multiple gnulib generated replacements to coexist

This defines a few preprocessor symbols that should not affect Emacs.
* lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
via "make sync-from-gnulib".

calc/README:  Add mention of logarithmic units.
calc/calc-help.el (calc-logunits-add): Rename from `calc-logunits-plus'.
(calc-logunits-sub): Rename from `calc-logunits-minus'.
(calc-logunits-mul): Rename from `calc-logunits-times'.
(calcFunc-lupoweradd): Rename from `calcFunc-lupowerplus'.
(calcFunc-lupowersub): Rename from `calcFunc-lupowerminus'.
(calcFunc-lupowermul): Rename from `calcFunc-lupowertimes'.
calc/calc-ext.el (calc-init-extensions): Change names of logarithmic
unit functions in autoloads.

* lisp/net/rcirc.el (rcirc-handler-317): New function. (Bug#6507)

Update ChangeLog

calc/calc.el (calc-logunits-field-reference) Renamed from
`calc-default-field-reference-level'.
(calc-logunits-power-reference): Renamed from `calc-default-power-reference-level'

calc/calc-units.el (math-logunits-quant):  Renamed from `math-logunits-level'
(math-logunits-plus):  Renamed from math-logcombine.
(calcFunc-luplus, calcFunc-luminus calc-luplus, calc-luminus): Remove functions.
(calcFunc-lufieldplus, calcFunc-lupowerplus, calcFunc-lufieldminus)
(calcFunc-lufieldminus,calc-logunits-plus calc-logunits-minus): New functions.
(calcFunc-fieldquant): Renamed from `calcFunc-fieldlevel'.
(calcFunc-powerquant): Renamed from `calcFunc-powerlevel'.
(calc-logunits-quantity): Renamed from `calc-level'.
(calcFunc-dbfieldlevel, calcFunc-dbpowerlevel, calcFunc-npfieldlevel)
(calcFunc-nppowerlevel,calc-logunits-dblevel, calc-logunits-nplevel)
(math-logunits-times, calcFunc-lufieldtimes, calcFunc-lupowertimes)
(calc-logunits-times, math-logunits-divide, calcFunc-lufielddiv)
(calcFunc-lupowerdiv,calc-logunits-divide,math-logunits-level):
New functions.

calc-help.el (calc-u-prefix-help): Removed "L" reference.
(calc-ul-prefix-help): Remove.
(calc-l-prefix-help): New function.
(calc-full-help): Add reference to `calc-l-prefix-help'.

calc-ext.el (calc-init-extensions): Update autoloads.

nntp.el (nntp-finish-retrieve-group-infos): Protect against the first part not returning any data.
proto-stream.el (open-protocol-stream): Document the return value.

gnulib: undo previous change

* fileio.c: conform to C89 pointer rules

* minibuf.c: conform to C89 pointer rules

* keymap.c: conform to C89 pointer rules

* insdel.c: conform to C89 pointer rules

Remove the check for non-ASCII in report-emacs-bug-hook (Bug#7925).

* mail/emacsbug.el (report-emacs-bug-hook): Remove the check for
non-ASCII characters.

message.el (message-setup-1): Handle message-generate-headers-first set to t.

* keyboard.c: conform to C89 pointer rules