* 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

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.

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.

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

* image.c: conform to C89 pointer rules

gnulib: adjust to upstream _HEADERS change

* xfns.c: conform to C89 pointer rules

* xterm.c (x_alloc_nearest_color_1): Avoid unportable int assumption.

Emacs assumes two's complement elsewhere, but the assumption is
easy to remove here, and this suppresses a warning with Sun C 5.8.

* xterm.c: conform to C89 pointer rules

* doc.c: conform to C89 pointer rules

(get_doc_string, Fsnarf_documentation, Fsubstitute_command_keys):
Change types between char * and unsigned char *, to satisfy C89
rules about pointer type compatibility.

don't ignore chdir failure

* sysdep.c (sys_subshell) [!defined DOS_NT]: Diagnose chdir
failure and exit.
(sys_subshell) [defined DOS_NT]: Mark with a FIXME the two
remaining unchecked chdir calls in this function; some DOS/NT
expert needs to fix them.
* emacs.c (main): Mark with a FIXME the unchecked chdir calls
in this function; some NextStep expert needs to fix them.

gnus-overrides.texi: Renamed from overrides.texi and all the relevant manuals use it now.
Makefile.in (nowebhack): Fixed to use -D flag instead of overrides.

bzrmerge.el trivia.

* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.

Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.

* lisp/emacs-lisp/cl-macs.el (return-from): Fix doc typo.

* lisp/net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process
(Bug#6386).

* lisp/progmodes/sh-script.el (sh-here-doc-open-re): Don't rely on the
font-lock-syntax-table remappings.
(sh-here-doc-markers, sh-here-doc-re): Remove.
(sh-font-lock-close-heredoc): Remove.
(sh-syntax-propertize-here-doc): New function.
(sh-font-lock-open-heredoc): Set the sh-here-doc-marker property
instead of the sh-here-doc-re.
(sh-font-lock-paren): Don't do anything in comments or strings.
Handle line continuations.  Accept a few more chars.
Don't rely on the font-lock-syntax-table remappings.
`esac' is not a valid pattern.
(sh-syntax-propertize-function): Handle here-docs differently, so we
don't bother syntax-propertizing the insides.

Fixes: debbugs:7947

* lisp/progmodes/sh-script.el (sh-font-lock-paren, sh-kw, sh-prev-thing):
Handle new bashisms ";&" and ";;&".

Fixes: debbugs:7947

overrides.texi: Remove.
sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.

Makefile.in (webhack, nowebhack): New targets that I forgot to merge from Gnus last.

Merge: xstrcasecmp: conform to C89 pointer rules

xstrcasecmp: conform to C89 pointer rules

* tramp.texi:
Replace "delimet" with "delimit" globally.
Replace "explicite" with "explicit" globally.
Replace "instead of" with "instead" where there was nothing after "of".
Audit use of comma before interrogative pronoun, "that", or "which".
Minor word order, spelling, wording changes.
(Frequently Asked Questions): Mention problems with WinSSHD.

* trampver.texi: Update release number.

* net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'.  Add
"NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".

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

* net/tramp.el (tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-domain-format)
(tramp-prefix-domain-regexp, tramp-postfix-user-format)
(tramp-postfix-user-regexp, tramp-prefix-port-format)
(tramp-prefix-port-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-handle-substitute-in-file-name):
Doc fix.

* charset.c: conform to C89 pointer rules

(define_charset_internal): Switch between char * and unsigned char *.

Replace "explicite" with "explicit" globally
Replace "instead of" with "instead" where there was nothing after "of"
Audit use of comma before interrogative pronoun, "that", or "which"

* xmenu.c: conform to C89 const rules

(xmenu_show, xdialog_show): Declare local var as char *, not
const char *, to stay compatible with C89 const rules.

* xdisp.c: conform to C89 pointer rules

(store_mode_line_noprop, display_string, reseat_to_string):
(c_string_pos, number_of_chars, message_dolog):
(message_log_check_duplicate, set_message_1, store_mode_line_noprop):
(display_mode_element, display_string):
Switch between char * and unsigned char * to stay compatible wth
C89 pointer rules.

* emacsclient.c: conform to C89 pointer rules