* lisp/eshell/esh-proc.el (eshell-kill-process-function): Fix typo in previous.

* lisp/net/rcirc.el: Add QuakeNet authentication support.
(rcirc-authinfo, rcirc-check-auth-status)
(rcirc-authenticate): Support QuakeNet.

* lisp/net/rcirc.el: Add functionality to authenticate before autojoining channels.
(rcirc-authenticate-before-join): New option.
(rcirc-authenticated-hook): New variable.
(rcirc-connect): Make local variable rcirc-user-authenticated.
(rcirc-handler-001): Respect rcirc-authenticate-before-join.
(rcirc-check-auth-status, rcirc-join-channels-post-auth): New
functions.
(rcirc-handler-PRIVMSG, rcirc-handler-NOTICE): Call
rcirc-check-auth-status.

Merge changes made in Gnus trunk.

gnus-sum.el (gnus-update-read-articles): Fix typo.
gnus.el (gnus-valid-select-methods): Mark nnimap as a backend that really have server-side marks.
gnus-sum.el (gnus-propagate-marks): Change default back to nil again, since most backends do not usefully have server-side marks.
 (gnus-update-read-articles): Propagate marks to all backends that really have server-side marks.
message.el (message-cite-reply-position, message-cite-style): New variables.
 (message-yank-original): Use the new citation styles.

Add package name. Fix author email address.

* net/soap-client.el (soap-namespace-put-link): Check if the target
name is fully qualified -- use only the name part.
(soap-parse-complex-type, soap-parse-sequence): Recognize xsd:all
types, treated the same as xsd:sequence.  (Bug#8166)

Fix bug #8177 with re-visiting image files.

 files.el (find-file-noselect): Don't ask about re-visiting
 non-literally if the file is already visited in image-mode.

esh-util.el comment fix.

Default all eshell hooks to nil (bug#5375)

* eshell/esh-mode.el (eshell-kill-buffer-function): New function.
(eshell-mode): Use eshell-kill-buffer-function.
Run the -initialize functions independently of the -load-hooks.
* eshell/esh-proc.el (eshell-kill-process-function): New function.
(eshell-gather-process-output, eshell-sentinel)
(eshell-interrupt-process, eshell-kill-process, eshell-quit-process):
Use eshell-kill-process-function.
* eshell/em-alias.el (eshell-alias-load-hook):
* eshell/em-banner.el (eshell-banner-load-hook):
* eshell/em-cmpl.el (eshell-cmpl-load-hook):
* eshell/em-dirs.el (eshell-dirs-load-hook):
* eshell/em-glob.el (eshell-glob-load-hook):
* eshell/em-hist.el (eshell-hist-load-hook):
* eshell/em-pred.el (eshell-pred-load-hook):
* eshell/em-prompt.el (eshell-prompt-load-hook):
* eshell/em-rebind.el (eshell-rebind-load-hook):
* eshell/em-script.el (eshell-script-load-hook):
* eshell/em-smart.el (eshell-smart-load-hook):
* eshell/em-term.el (eshell-term-load-hook):
* eshell/em-unix.el (eshell-unix-load-hook):
* eshell/esh-arg.el (eshell-arg-load-hook):
* eshell/esh-cmd.el (eshell-cmd-load-hook):
* eshell/esh-ext.el (eshell-ext-load-hook):
* eshell/esh-io.el (eshell-io-load-hook):
* eshell/esh-mode.el (eshell-exit-hook):
* eshell/esh-proc.el (eshell-proc-load-hook, eshell-kill-hook):
* eshell/esh-var.el (eshell-var-load-hook):
Set default hook values to nil.  (Bug#5375)

esh-module doc fixes.

* lisp/eshell/esh-module.el (eshell-module-unload-hook)
(eshell-modules-list): Remove leading * from defcustom docs.

message.el (message-options): Don't mark it buffer-local when running under XEmacs.

Make eshell-for obsolete (replaced by dolist)

* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.

* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0.  (Bug#8170)

* progmodes/gud.el (gdb-script-mode): Derive from prog-mode.

message.el (message-options): Revert the change that's a workaround for XEmacs buffer-local issue.

outline.el fix for bug#7619.

It turns out the use of nil in the :type of outline regexp was for
very hysterical raisons.  Prior to 2001-09-12T20:42:08Z!rms@gnu.org, the
default value was nil, then it was initialized afterwards.
Everywhere in the code assumes it cannot be nil, so no need to allow
that any more.

* lisp/outline.el (outline-regexp): No longer allow nil.
(outline-heading-end-regexp): Add safety predicate.

browse-url fix for bug#6077.

* lisp/net/browse-url.el (browse-url): Handle deleted default-directory.

recentf.el fix for bug#5843.

* lisp/recentf.el (recentf-include-p): In case of a buggy predicate,
err on the side of including, not excluding.

* lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)

* calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
  variables as units.

Minor ewoc fix for bug#3261.

* lisp/emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error
if there is no node.

* lisp/erc/erc-track.el (erc-track-visibility): Fix :type.  (Bug#6369)

* lisp/time.el (display-time-world-list): Fix typo.

Fixes: debbugs:7571

ChangeLog fixes.

lisp/cus-edit.el (custom-buffer-create-internal): Fix bug#8136.
Split search string before passing it to `customize-apropos'.

lisp/image-dired.el (image-dired-cmd-read-exif-data-options): Fix typo.

Fixes: debbugs:8156

Fixing old typo.

* lisp/net/rcirc.el (rcirc-cmd-join): Accept comma-separated input.

Merge changes made in Gnus trunk.

nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with numbers too big to be `read'.
password-cache.el (password-in-cache-p): Add autoload.
message.el (message-options): Make buffer-local two ways to attempt to fix a XEmacs bug.

Merged an ERT fix and a speedup.

Added fast path to ERT explanation of `equal'.
* emacs-lisp/ert.el (ert--explain-equal): New function.
(ert--explain-equal-rec): Renamed from `ert--explain-not-equal'.
All callers changed.
(ert--explain-equal-including-properties): Renamed from
`ert--explain-not-equal-including-properties'.  All callers
changed.
* automated/ert-tests.el (ert-test-explain-not-equal-keymaps):
New test.

ediff-init.el fix for bug#1821. (tiny change)

Tiny change; note that author said he placed it in the public domain.
(If this wasn't a tiny change, we would still need paperwork.)

* lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
Move ediff-defvar-local calls after defcustoms.

Fix ERT bug related to quit handling.
* emacs-lisp/ert.el (ert--stats-set-test-and-result)
(ert-char-for-test-result, ert-string-for-test-result)
(ert-run-tests-batch, ert--print-test-for-ewoc):
Handle `ert-test-quit'.

Merge fix.

file-truename doc fix for bug#2341.

* lisp/files.el (file-truename): Doc fix.

* doc/lispref/files.texi (Truenames): Minor clarification.

Reduce some of the many, many variant spellings of NeXTstep.

http://lists.gnu.org/archive/html/emacs-devel/2010-10/msg00986.html

Info-gnustep.plist trivia.

* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
Refer to etc/NEXTSTEP rather than emacs-app.sf.net.

* lisp/vc/vc-rcs.el: Remove some ancient comments.

Anyone using rcs < 5.6.2 in 2011 probably has a functioning time
machine, so does not need hand-holding.

vc-dir fix for bug#7349.

* lisp/vc/vc-dir.el (vc-dir-mode-map):
Bind vc-dir-find-file to e, like in dired.

vc-svn fix for bug#7663 on MS Windows.  (tiny change)

* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
programs output backslashes.

* url.texi (Configuration): Update url-configuration-directory description.

url.texi doc fix for bug#6038.

* doc/misc/url.texi (Dealing with HTTP documents): Remove reference to
function url-decode-text-part; never seems to have existed in any version.

sendmail.el fix for bug#1776.

* lisp/mail/sendmail.el (mail-mode-map): Remove mail-sent-via.
(mail-mode): Remove mail-sent-via from the doc.
(mail-sent-via): Make it obsolete.

Fix typo in previous NEWS change.

* etc/NEWS: Mention emacsclient -q.

Add --quiet option for emacsclient (bug#663)  (tiny change)

* lib-src/emacsclient.c (longopts): Add quiet.
(decode_options): Handle q/quiet.
(print_help_and_exit): Add q/quiet.
(main): Suppress some messages if quiet option is used.

* doc/emacs/misc.texi (emacsclient Options): Add q/quiet.

grep.el fix for bug#8084.

* lisp/progmodes/grep.el (grep-highlight-matches): Doc fix.
(grep-process-setup): No highlighting without font-lock.

vc-bzr fix for bug#8025.

* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Handle dirstate entries with no parents.

* sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.

Comment fix.

Fix previous dired-x.el change.

gnus-art.el (gnus-with-article-buffer): Fix buffer live check.

Update autoloads

Doc fix for bug#8148.

* doc/emacs/mule.texi (Communication Coding) <x-select-request-type>:
Remove duplicate (essentially) paragraph.

Add some dired-x support for local filenames with Red Hat's man.

* lisp/man.el (Man-support-local-filenames): Also handle Red Hat's man.

* lisp/dired-x.el (Man-support-local-filenames): Autoload it.
(dired-guess-shell-alist-default): Also handle Red Hat's man.

Make dired-default-directory obsolete.

As far as I can tell, it was never used outside of dired-smart-shell-command.
It doesn't seem worth keeping around as a separate function.

* lisp/dired-x.el (dired-default-directory-alist, dired-default-directory):
Mark as obsolete.
(dired-smart-shell-command): Just call dired-current-directory.

* doc/misc/dired-x.texi (Multiple Dired Directories): Remove mentions
of dired-default-directory-alist and dired-default-directory.
Move dired-smart-shell-command here...
(Miscellaneous Commands): ... from here.

dired-x trivia.

* lisp/dired-x.el (dired-jump-other-window): Add autoload.
(dired-default-directory-alist, dired-default-directory): Doc fixes.
(dired-default-directory-alist): Mark as risky.

* texinfo.tex: Update to version 2011-02-24.09.

Merge: Work around some portability problems with symlinks.

Merge from mainline.

Make dired-omit-here-always obsolete, in favor of standard function.

* lisp/dired-x.el (dired-omit-here-always): Make it obsolete.

* doc/misc/dired-x.texi (Omitting Variables): Refer to add-dir-local-variable
instead of the obsoleted dired-omit-here-always.

Add a menu-bar entry for Artist mode.

* lisp/textmodes/artist.el (artist-curr-go): Default to pen-line.
(artist-select-op-pen-line): New function.
(artist-menu-map): New variable.
(artist-mode-map): Add a menu to the menu-bar.

* calc/calc-math.el (calcFunc-log10): Check for symbolic mode
  when evaluating.

* calc/calc-units.el (math-conditional-apply, math-conditional-pow):
  New function.
  (math-logunits-add, math-logunits-mul, math-logunits-divide):
  (math-logunits-quant, math-logunits-level): Use
  `math-conditional-apply' and `math-conditional-pow' to evaluate
  functions.
  (math-logunits-level): Extract units from ratio.

Merge from mainline.

Remove superfluous Tramp entries.

gnus-art.el (list-identifier): Add list-identifier as a parameter group.
 (article-hide-list-identifiers): Use list-identifier group parameter.

Merge changes made in Gnus trunk.

sieve.el (sieve-buffer-script-name): New local variable to store sieve script name.
 (sieve-edit-script): Store sieve script name.
 (sieve-upload): Use sieve script name when uploading.
 (sieve-upload): Use substitute-command-keys.
 (sieve-edit-script): Use substitute-command-keys.
 (sieve-refresh-scriptlist): Use substitute-command-keys.
 (sieve-manage-mode-map): Define keymap properly.
 (sieve-manage-mode): Do not set mode name manually, change mode-name to
 (sieve-refresh-scriptlist): Use substitute-command-keys."Sieve-manage".  Remove commented code about cvs.
 (sieve-manage-quit): New function.
 (sieve-manage-mode-map): Bind 'q' to sieve-manage-quit.
gnus-gravatar.el: Use gnus-with-article-buffer.
gnus-art.el (gnus-with-article-buffer): Check that the gnus-article-buffer is alive.

* lisp/files: Fix comment typo.

Remove some duplicated tramp ChangeLog entries.
I guess the same changes were applied to emacs-23 and trunk separately.
More duplicates remain.

* maintaining.texi (Format of ChangeLog): Add reference to add-log-full-name.
(Change Log Commands): Add documentation for combining multiple symbols in one change.

lisp/emacs-lisp/cl-macs.el (lexical-let*): Fix argument name in docstring.

* lisp/calendar/cal-hebrew.el (diary-ordinal-suffix): Declare.

* lisp/files.el: Comment.

* admin/notes/bzr: Tiny addition.

Rework previous cal-hebrew change.

* lisp/calendar/cal-hebrew.el (calendar-hebrew-birthday, diary-hebrew-date):
Rename and rework functions added in previous change.

* etc/NEWS: Mention diary-hebrew-birthday.

Add some new cal-hebrew functions.

* lisp/calendar/cal-hebrew.el (hebrew-calendar-birthday, diary-hebrew-birthday):
New functions.

Give dired-actual-switches a safe-local-variable property.  (Bug#3230)

* lisp/dired.el (dired-safe-switches-p): Beef it up.
(dired-actual-switches): Use it for the safe-local-variable property.

* lisp/dired.el (dired-safe-switches-p): New function.  (Bug#3230)

Add the ability to exclude dir-locals from subdirs.  (Bug#8100)

* lisp/files.el (dir-locals-collect-variables):
Add the ability to exclude subdirectories.

* doc/emacs/custom.texi (Directory Variables):
Give an example of excluding subdirectories.

* doc/lispref/variables.texi (Directory Local Variables):
Mention `(subdirs . nil)' alist element.

* etc/NEWS: Mention this addition.

* lisp/dired-x.el (dired-omit-here-always): Add `(subdirs . nil)' to locals.

* ido.el (ido-everywhere): Doc fix.
(ido-mode): Doc fix.

* lisp/dired-x.el (dired-guess-shell-alist-default): Use \\', not $.

* tramp.texi (Frequently Asked Questions): Add Emacs 24 to
supported systems.

* net/tramp-cmds.el (tramp-append-tramp-buffers): Dump load-path shadows.

* lisp/dired-x.el (dired-guess-shell-alist-default): Add rar and 7z.

lisp/emacs-lisp/pcase.el (pcase, pcase--u1, pcase--q1): Fix typos in docstrings.

Add ChangeLog bug ref.

dired-aux fix for bug#8131.

* lisp/dired-aux.el (dired-update-file-line): Fix 2010-11-09 change.

Mark tiny change.

Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

* lisp/facemenu.el (list-colors-display): Use with-help-window (Bug#8048).

Avoid recording dead buffers in buffer-list frame param (Bug#7898).

* src/frame.c (store_frame_param): Don't store value directly in
buffer_list and buried_buffer_list; copy the list and remove dead
buffers.

* minibuf.texi: Clarify history list discussion (Bug#8085).

* term/screen.el: New file (Bug#2650).

* INSTALL.BZR: Tweak previous change.

Implement stub emulation of `readlink' for MS-DOS.

 src/msdos.c (readlink) [DJGPP < 2.04]: New stub function.
 src/msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.

Implement stubs of `readlink' and `symlink' for MS-Windows.

 src/w32.c (symlink, readlink): New stub functions.
 nt/inc/unistd.h (readlink, symlink): Declare prototypes.

Emulate `readlink' for DJGPP versions before 2.04.

 src/msdos.c (readlink) [DJGPP < 2.04]: New stub function.
 src/msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.

* INSTALL.BZR: Mention autoreconf.

gnus-group.el (gnus-import-other-newsrc-file): New function.

Merge: Minor cleanups uncovered by gcc warnings

* scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG.

This avoids a gcc warning in some configurations.