* src/xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.

* src/xdisp.c (note_mode_line_or_margin_highlight): Initialize
Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.

Fix typo in previos flymake change.

Minor esh-util changes.
* lisp/eshell/esh-util.el (subst-char-in-string)
(directory-files-and-attributes): These compatibility definitions are
not needed on any version of Emacs since at least 21.4.

Replace unneeded compatibility definitions with point-at-bol, point-at-eol.

* lisp/progmodes/verilog-mode.el (verilog-get-beg-of-line)
(verilog-get-end-of-line): Remove.
(verilog-within-string, verilog-re-search-forward-substr)
(verilog-re-search-backward-substr, verilog-set-auto-endcomments)
(verilog-surelint-off, verilog-getopt-file, verilog-highlight-region):
Use point-at-bol, point-at-eol.
* lisp/progmodes/pascal.el (pascal-get-beg-of-line, pascal-get-end-of-line):
Remove.
(pascal-declaration-end, pascal-declaration-beg, pascal-within-string)
(electric-pascal-terminate-line, pascal-set-auto-comments)
(pascal-indent-paramlist, pascal-indent-declaration)
(pascal-get-lineup-indent, pascal-func-completion)
(pascal-get-completion-decl, pascal-var-completion, pascal-completion):
Use point-at-bol, point-at-eol.
* lisp/progmodes/flymake.el (flymake-line-beginning-position)
(flymake-line-end-position): Remove.
(flymake-highlight-line): Use point-at-bol, point-at-eol.
* lisp/eshell/esh-util.el (line-end-position, line-beginning-position):
Remove compat definitions.

* net/tramp/tramp-compat.el: Comment.

Minor checkdoc simplifications.
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
Use end-of-line N.
(checkdoc-this-string-valid-engine, checkdoc-file-comments-engine):
Use line-end-position.

Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.

* lisp/mh-e/mh-seq.el (mh-read-msg-list): Use point-at-eol.

* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
(gnus-bookmark-kill-line): Use point-at-eol.

* lisp/cedet/ede/proj-elisp.el (ede-proj-flush-autoconf): Use point-at-bol.

* lisp/emacs-lisp/chart.el (chart-zap-chars):
* lisp/play/decipher.el (decipher-set-map):
* lisp/progmodes/ada-mode.el (ada-get-current-indent)
(ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
* lisp/progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library)
(ada-get-all-references):
* lisp/progmodes/cperl-mode.el (cperl-electric-paren)
(cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
(cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
(cperl-word-at-point-hard):
* lisp/progmodes/idlw-shell.el (idlwave-shell-move-or-history)
(idlwave-shell-filename-string, idlwave-shell-batch-command)
(idlwave-shell-display-line):
* lisp/progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
(idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
* lisp/progmodes/js.el (js--re-search-forward-inner)
(js--re-search-backward-inner):
* lisp/progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
(vhdl-fix-clause, vhdl-compose-configuration-architecture):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
* lisp/textmodes/flyspell.el (flyspell-process-localwords):
* lisp/textmodes/ispell.el (ispell-buffer-local-parsing)
(ispell-buffer-local-dict, ispell-buffer-local-words):
Use point-at-bol and point-at-eol.

gnus-gravatar.el (gnus-gravatar-transform-address): No need to skip asterisks in From header.

Replace more speedbar uses of end-of-line etc with line-end-position.
* lisp/speedbar.el (speedbar-generic-item-info)
(speedbar-item-info-tag-helper, speedbar-change-expand-button-char)
(speedbar-add-indicator, speedbar-check-vc-this-line)
(speedbar-check-obj-this-line, speedbar-extract-one-symbol)
(speedbar-buffers-line-directory, speedbar-buffer-revert-buffer):
Replace more uses of end-of-line etc with line-end-position.

gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
message.el (message-send-mail): Don't insert courtesy messages if the message already has List-Post and List-ID messages.
gnus-ems.el (gnus-put-image): Use a blank text as the insertion string to avoid making the From headers syntactically invalid.

Use line-end-position rather than end-of-line, etc.

* textmodes/texnfo-upd.el (texinfo-start-menu-description)
(texinfo-update-menu-region-beginning, texinfo-menu-first-node)
(texinfo-delete-existing-pointers, texinfo-find-pointer)
(texinfo-clean-up-node-line, texinfo-insert-node-lines)
(texinfo-multiple-files-update):
* textmodes/table.el (table--probe-cell-left-up)
(table--probe-cell-right-bottom):
* textmodes/picture.el (picture-tab-search):
* textmodes/page-ext.el (pages-copy-header-and-position)
(pages-directory-for-addresses):
* progmodes/vera-mode.el (vera-get-offset):
* progmodes/simula.el (simula-calculate-indent):
* progmodes/python.el (python-pdbtrack-overlay-arrow):
* progmodes/prolog.el (end-of-prolog-clause):
* progmodes/perl-mode.el (perl-calculate-indent, perl-indent-exp):
* progmodes/icon.el (indent-icon-exp):
* progmodes/etags.el (tag-re-match-p):
* progmodes/ebrowse.el (ebrowse-show-file-name-at-point):
* progmodes/ebnf2ps.el (ebnf-begin-file):
* progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-save-local-variable):
* play/life.el (life-setup):
* play/gametree.el (gametree-looking-at-ply):
* nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* mail/sendmail.el (mail-mode-auto-fill):
* emacs-lisp/lisp-mode.el (calculate-lisp-indent):
* emacs-lisp/edebug.el (edebug-overlay-arrow):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid):
* woman.el (woman-parse-numeric-value, woman2-TH, woman2-SH)
(woman-tab-to-tab-stop, WoMan-warn-ignored):
* type-break.el (type-break-file-keystroke-count):
* term.el (term-replace-by-expanded-history-before-point)
(term-skip-prompt, term-extract-string):
* speedbar.el (speedbar-edit-line, speedbar-expand-line)
(speedbar-contract-line, speedbar-toggle-line-expansion)
(speedbar-parse-c-or-c++tag, speedbar-parse-tex-string)
(speedbar-buffer-revert-buffer, speedbar-highlight-one-tag-line):
* sort.el (sort-skip-fields):
* skeleton.el (skeleton-internal-list):
* simple.el (line-move-finish, line-move-to-column):
* shell.el (shell-forward-command):
* misc.el (copy-from-above-command):
* makesum.el (double-column):
* ebuff-menu.el (electric-buffer-update-highlight):
* dired.el (dired-move-to-end-of-filename):
* dframe.el (dframe-popup-kludge):
* bookmark.el (bookmark-kill-line, bookmark-bmenu-show-filenames):
* arc-mode.el (archive-get-lineno):
Use line-end-position and line-beginning-position.

* net/ange-ftp.el, progmodes/hideif.el, reposition.el:
Same, but only in comments.

Minor idlwave change.
* lisp/progmodes/idlwave.el (idlwave-routine-entry-compare-twins):
(idlwave-study-twins): Prefix dynamic local `class'.
(idlwave-routine-twin-compare): Update for above name change.

Minor eieio-comp changes.
* lisp/emacs-lisp/eieio-comp.el (byte-compile-file-form-defmethod):
Use boundp tests to silence compiler.  Update for changed name of
bytecomp-filename variable.

Silence viper-cmd compilation.
* lisp/emulation/viper-cmd.el (viper-read-string-with-history):
Prefix dynamic local `initial'.
(viper-minibuffer-standard-hook): Update for above name change.

Silence elint compilation.
* lisp/emacs-lisp/elint.el (elint-init-env): Prefix dynamic local `env'.
(elint-init-form): Update for above name change.

Silence gnus-art compilation.
* lisp/gnus/gnus-art.el (gnus-treat-article): Give dynamic local variables
`condition', `type', `length' a prefix.
(gnus-treat-predicate): Update for above name changes.

Silence mail-extr compilation.
* lisp/mail/mail-extr.el (mail-extract-address-components): Give dynamic
local variables `cbeg' and `cend' a prefix.
(mail-extr-voodoo): Update for above name change.

Silence reftex compilation.

* lisp/textmodes/reftex-toc.el (reftex-toc-do-promote)
(reftex-toc-promote-prepare): Pass `delta' as an explicit argument.
(reftex-toc-promote-action): Doc fix.

* lisp/textmodes/reftex-sel.el (reftex-select-item): Give local variables
`prompt', `data' a prefix.
(reftex-select-post-command-hook, reftex-select-callback)
(reftex-select-mouse-accept, reftex-select-read-cite):
Update for above name changes.

* lisp/textmodes/reftex-ref.el (reftex-reference): Rename local variable
`refstyle' to reftex-refstyle.
(reftex-offer-label-menu): Update for above name change.
* lisp/textmodes/reftex-sel.el (reftex-select-toggle-varioref): Update for
`refstyle' name change.

Minor emerge changes.
* lisp/vc/emerge.el (emerge-eval-in-buffer): Remove, and replace all uses
with with-current-buffer.
(diff, template): Give dynamic local variables a prefix.
(emerge-line-numbers): Rename local `diff' to emerge-line-diff.
(emerge-line-number-in-buf): Update for above name change.
(emerge-combine-versions-internal): Rename local `template' to
emerge-combine-template.
(emerge-combine-versions-edit): Update for above name change.

xdisp.c: Add commentary about character compositions in bidirectional text.

RefTeX: Improve matching of bib entries.

src/ChangeLog: Fix log entry for 2010-11-06T09:33:22Z!jan.h.d@swipnet.se.

Support R2L lines in tool-tip text.

 xfns.c (Fx_show_tip): If any of the tool-tip text lines is R2L,
 adjust width of tool-tip frame to the width of text, excluding the
 stretch glyph at the beginning of R2L glyph rows.
 w32fns.c (Fx_show_tip): Likewise.

* shell.el (shell-process-popd): Made aware of comint-file-name-prefix.

configure.in: Fix indentation

* src/nsfont.m: Include termchar for new mouse-highlight.

Unify mouse-highlight code for all GUI and TTY sessions.

 term.c: Remove static mouse_face_* variables.  All users
 changed.
 (term_show_mouse_face, term_clear_mouse_face)
 (fast_find_position, term_mouse_highlight): Functions deleted.
 (tty_draw_row_with_mouse_face): New function.
 (term_mouse_movement): Call note_mouse_highlight instead of
 term_mouse_highlight.
 nsterm.m (ns_update_window_begin, ns_update_window_end)
 (ns_update_end, x_destroy_window, ns_frame_up_to_date)
 (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
 (ns_dumpglyphs_image, ns_dumpglyphs_stretch)
 (ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
 Replace Display_Info with Mouse_HLInfo everywhere where
 mouse_face_* members were accessed for mouse highlight purposes.
 xterm.c (x_update_window_begin, x_update_window_end)
 (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
 (handle_one_xevent, x_free_frame_resources, x_term_init): Replace
 Display_Info with Mouse_HLInfo everywhere where mouse_face_*
 members were accessed for mouse highlight purposes.
 w32term.c (x_update_window_begin, x_update_window_end)
 (x_update_end, w32_read_socket, x_free_frame_resources)
 (w32_initialize_display_info): Replace Display_Info with
 Mouse_HLInfo everywhere where mouse_face_* members were accessed
 for mouse highlight purposes.
 xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
 (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
 unless the frame is on a window-system.
 (get_tool_bar_item, handle_tool_bar_click)
 (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor)
 (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
 (note_mode_line_or_margin_highlight, note_mouse_highlight)
 (x_clear_window_mouse_face, cancel_mouse_face, expose_frame):
 Replace Display_Info with Mouse_HLInfo everywhere where
 mouse_face_* members were accessed for mouse highlight purposes.
 (coords_in_mouse_face_p): Move prototype out of the
 HAVE_WINDOW_SYSTEM conditional.
 (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the
 HAVE_WINDOW_SYSTEM block.
 (try_window_id) [HAVE_GPM || MSDOS]: Call
 x_clear_window_mouse_face.
 (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM
 systems.  Call tty_draw_row_with_mouse_face for TTY systems.
 (show_mouse_face): Call draw_row_with_mouse_face, instead of
 calling draw_glyphs directly.
 (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
 (cursor_in_mouse_face_p, rows_from_pos_range)
 (mouse_face_from_buffer_pos, mouse_face_from_string_pos)
 (note_mode_line_or_margin_highlight, note_mouse_highlight)
 (x_clear_window_mouse_face, cancel_mouse_face): Move out of the
 HAVE_WINDOW_SYSTEM block.  Ifdef away window-system specific
 fragments.
 (note_mouse_highlight): Call popup_activated for MSDOS as well.
 Clear mouse highlight if pointer is over glyphs whose OBJECT is an
 integer.
 (mouse_face_from_buffer_pos): Add parentheses around && within ||.
 (x_consider_frame_title, tool_bar_lines_needed): Move
 prototypes to HAVE_WINDOW_SYSTEM-only part.
 (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
 part.  Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
 (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only
 part.
 dispnew.c (mirror_make_current): Set Y coordinate of the
 mode-line and header-line rows.
 (init_display): Setup initial frame's output_data for text
 terminal frames.
 xmenu.c (popup_activated): Don't define on MSDOS, which now has
 its own definition on msdos.c.
 msdos.c (show_mouse_face, clear_mouse_face)
 (fast_find_position, IT_note_mode_line_highlight)
 (IT_note_mouse_highlight): Functions deleted.
 (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight
 instead of IT_note_mouse_highlight.
 (draw_row_with_mouse_face, popup_activated): New functions.
 (dos_set_window_size, draw_row_with_mouse_face, IT_update_begin)
 (IT_update_end, IT_frame_up_to_date, internal_terminal_init)
 (dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere
 where mouse_face_* members were accessed for mouse highlight
 purposes.
 msdos.h (initialize_msdos_display): Add prototype.
 frame.h (MOUSE_HL_INFO): New macro.
 lisp.h (Mouse_HLInfo): New data type.
 xterm.h (struct x_display_info):
 w32term.h (struct w32_display_info):
 nsterm.h (struct ns_display_info):
 termchar.h (struct tty_display_info): Use it instead of
 mouse_face_* members.
 dispextern.h (show_mouse_face, clear_mouse_face): Update type of
 1st argument.
 (frame_to_window_pixel_xy, note_mouse_highlight)
 (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face)
 (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of
 HAVE_WINDOW_SYSTEM conditional.
 (draw_row_with_mouse_face): Declare prototype.
 (tty_draw_row_with_mouse_face): Declare prototype.

Cleanup -Wall warnings.

 xdisp.c (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
 part.  Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
 (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only part.

chapter, part, section are all DocBook elements

Fix unified mouse highlight after compiling on Unix.

 xdisp.c (x_consider_frame_title, tool_bar_lines_needed): Move
 prototypes to HAVE_WINDOW_SYSTEM-only part.
 frame.h (MOUSE_HL_INFO): Fix definition to work both for
 TTY-only and GUI builds.

term.c (append_glyphless_glyph, produce_glyphless_glyph): Remove unused variables.

Decode utf-8 strings in mixed environments by default.
Done via the new `erc-coding-system-precedence' variable.

Fix mouse redesigned mouse highlight on MSDOS.

 dispnew.c (init_display): Setup initial frame's output_data for
 text terminal frames.
 frame.h (MOUSE_HL_INFO): Fix TTY definition.
 msdos.h (initialize_msdos_display): Add prototype.

* mouse.el (mouse-yank-primary): Update comment (Bug#6802).

* nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic pointed out by Eli Zaretskii.

Cleanup fallout from redesigning mouse highlight.

 dispextern.h (tty_draw_row_with_mouse_face): Add prototype.
 xdisp.c (draw_row_with_mouse_face): Don't #ifdef away on MSDOS.
 Call tty_draw_row_with_mouse_face on MSDOS as well.
 msdos.c (tty_draw_row_with_mouse_face): Renamed from
 draw_row_with_mouse_face.  Make the argument list identical to the
 GPM implementation.
 msdos.h (Display_Info): Restore typedef.

Quiet, woman.  (Sorry...).
* lisp/woman.el (woman0-roff-buffer, woman1-roff-buffer)
(woman2-roff-buffer): Give local variable `request' a prefix.
(woman0-macro): Rename argument `request' in the same way.
(woman-request): New name for `request' dynamic variable.
(woman-unquote, woman-forward-arg): Update for above name change.
(woman1-roff-buffer): Give local variable `unquote' a prefix.
(woman1-unquote): New name for `unquote' dynamic variable.
(woman1-B-or-I, woman1-alt-fonts): Update for above name change.
(woman-translations): Rename from `translations'.  No longer global.
(woman2-tr, woman-translate): Update for above name change.
(woman-translate): Check for bound variable.
(woman2-roff-buffer): Give local variable `translations' a prefix.

Silence doctor.el compilation.
* lisp/play/doctor.el: Give all local variables a prefix.  Update callers.
(doc$, doctor-put-meaning): Use backquote.

Silence cl-macs.el compilation.
* lisp/emacs-lisp/cl-macs.el (loop): Give local variable args a prefix.
(cl-parse-loop-clause, cl-loop-handle-accum): Update for above change.

Silence byte-opt.el compilation.
* lisp/emacs-lisp/byte-opt.el (byte-decompile-bytecode-1): Give local
variables bytes, ptr, op a prefix.
(disassemble-offset): Update for above change.

ChangeLog fix.

Refer to set-coding-system-priority instead of the obsolete
set-coding-priority in the doc string.

Merge changes made in Gnus trunk.

mm-decode.el (mm-save-part): Put the entire path in the `M-n' slot.
nnimap.el (nnimap-find-article-by-message-id): Don't EXAMINE a group if it's already selected.
gnus.texi (Customizing the IMAP Connection): Document `nnimap-expunge' and remove `nnimap-expunge-inbox' from example.
gnus.texi (Customizing the IMAP Connection): Remove nnir mention, since that works by default.
gnus-sum.el (gnus-summary-show-article): Take `t' as the arg to mean "raw".
gnus-html.el (gnus-html-browse-url): Implement mailto: URLs.
shr.el (shr-browse-url): Implement mailto: URLs.
nnir.el, gnus-sum.el: Improve thread-referral.
message.el (message-send-mail): Use the value of message-courtesy-message from the message buffer.

ChangeLog fix.

Ref: http://lists.gnu.org/archive/html/emacs-devel/2010-11/msg00133.html

identify "refentry" as DocBook

* nsfont.m (nsfont_draw)  * nsimage.m (EmacsImage-setXBMColor:)  * nsterm.m (EmacsView-performDragOperation:): Correct empty return statements.  Based on a patch by Ismail Donmez <ismail@namtrac.org>.

Notes about elpa.gnu.org for maintainers.

* tramp.texi (Remote shell setup): New item "Interactive shell
prompt".  Reported by Christian Millour <cm@abtela.com>.
(Remote shell setup, Remote processes): Use @code{} for
environment variables.

shr.el (shr-tag-img): Use string-width and truncate-string-to-width to measure the length and truncate alt text.

* emacs-lisp/package.el (package-unpack): Remove no-op.
(package--builtins, package--dir): Doc fix.
(package-activate-1, package-activate, package-install)
(package-compute-transaction): Fix error message.
(package-delete): Use delete-directory.  Omit system packages.
(package-initialize): Set package-alist to nil first.
(package-menu-mark-delete, package-menu-mark-install): Don't add
symbols that are inconsistent with the package state.
(package-menu-execute): Perform deletions and installations as
single batch operations.

Support for gif transparency.
* image.c (gif_load): Add support for transparency and specified
:background.

etc/NEWS: Move --with-crit-dir option to emacs-23.

reftex-toc trivia.
* lisp/textmodes/reftex-toc.el (reftex-toc-do-promote): Remove unused
local `mpos'.
(reftex-toc-restore-region): Make `mpos' local to this function.

idlwave trivia.
* lisp/progmodes/idlwave.el (idlwave-pset): Only used on XEmacs.
(props): Remove unnecessary declaration.

Silence ispell.el compilation.
* lisp/textmodes/ispell.el (ispell-init-process): On Emacs, always use
set-process-query-on-exit-flag.

* lisp/textmodes/reftex-toc.el (name1, dummy, dummy2): Remove unused decs.

* doc/misc/gnus.texi (Configuring nnmairix): Spelling fix.

Don't be so lax with spelling.

* lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix.

* doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.

Mere anarchy is loosed upon the world.
* doc/misc/gnus.texi (Agent Variables): Spelling fix.

landmark: you lose.
* lisp/play/landmark.el (lm-losing-threshold): Correct spelling.
(lm-human-plays): Use new name.

Fix the most annoying typo in the world.
* lisp/play/gomoku.el (gomoku-loosing-threshold): Correct spelling.
(gomoku-human-plays): Use new name.

Silence compilation of gomoku.el.
* lisp/play/gomoku.el (nil-score, Xscore, XXscore, XXXscore, XXXXscore)
(Oscore, OOscore, OOOscore, OOOOscore): Rename with gomoku- prefix.
(gomoku-score-trans-table, gomoku-winning-threshold)
(gomoku-loosing-threshold, gomoku-init-score-table): Use new names.

Silence compilation of mh-mime.el.
* lisp/mh-e/mh-mime.el (dots, type, ov): Avoid unnecessary declaration.

Separate built-in packages from elpa packages, for efficiency.

* emacs-lisp/package.el: Don't put built-in packages in
package-alist, to avoid loading inefficiencies.
(package-built-in-p): Make VERSION optional, and treat it as a
minimum acceptable version.
(package-activate): Search separately for built-in packages.  Emit
a warning if a dependency fails.
(define-package): Handle most common case, where there is no
obsolete package, first.
(package-compute-transaction): Print required version in error.
(package--initialized): New variable.
(list-packages): Use it.
(package-initialize): Optional arg NO-ACTIVATE.  Don't put
built-in packages in packages-alist; keep it separate.  Set
package--initialized.
(describe-package): Avoid activating packages as a side-effect.
Search separately for built-in packages.
(describe-package-1): Handle the case where an elpa package is
simultaneously built-in and available/installed.
(package-installed-p, package--generate-package-list): Search
separately for built-in packages.
(package-load-descriptor): Doc fix.

Silence compilation of nndiary.el.
* lisp/gnus/nndiary.el (nndiary-generate-nov-databases-1)
(nndiary-generate-active-info): Rename dynamic variable `files' to
something less generic.

* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function):
Handle __DATA__ and __END__.

nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.

gnus-cite.el (gnus-article-natural-long-line-p): Removed.

(byte-recompile-file): If bytecomp-arg is nil, do not ask to recompile files that are not already compiled, and do not recompile them.

Reflect mouse-highlight redesign in term.c

 term.c: Remove static mouse_face_* variables.  All users changed.
 (term_show_mouse_face, term_clear_mouse_face)
 (fast_find_position, term_mouse_highlight): Functions deleted.
 (tty_draw_row_with_mouse_face): New function.
 (term_mouse_movement): Call note_mouse_highlight instead of
 term_mouse_highlight.

nnir: remove wais support

* lisp/gnus/gnus-html.el: Reorder requirements to quieten compiler.

* lisp/gnus/gnus-util.el: Comment.

Fix last change to package.el.

gnus-cite.el (gnus-article-fill-cited-article): Make fill work properly for XEmacs as well.
gnus-cite.el (gnus-article-fill-cited-article, gnus-article-foldable-buffer, gnus-article-natural-long-line-p): Use window-width rather than frame-width.

Two fixes for elpa packages overriding built-in ones.

* emacs-lisp/package.el (package-initialize): Ensure that
obsoleted built-in packages are not in package-activated-list
during activation.
(describe-package-1): Make the "installed" status override
"built-in".

Adjust doc.

nnir.el: Fix various bugs.

gnus-sum.el (gnus-print-buffer): Rewrite to use with-temp-buffer.
gnus-sum.el (gnus-print-buffer): Just print the buffer as is.
gnus-cite.el (gnus-article-foldable-buffer): Protect against degenerate articles.

Merge changes made in Gnus trunk.

nnimap.el (nnimap-parse-line): Don't bug out oddly formed replies (bug #7311).
gnus-cite.el (gnus-article-fill-cited-article): Minimize the long-lines case by only filling the long lines.
gnus-start.el (gnus-ask-server-for-new-groups): Return the new groups.
gnus-group.el (gnus-group-find-new-groups): Display all the new groups.
gnus-start.el (gnus-find-new-newsgroups): Return the list of new groups.
nnimap.el (nnimap-request-group): Store the new updated info.
nnimap.el (nnimap-request-group): Select the group when we don't know whether it exists or not.

REALLY finish coding portable mouse highlight.

 msdos.c (dos_set_window_size, draw_row_with_mouse_face)
 (IT_update_begin, IT_update_end, IT_frame_up_to_date)
 (internal_terminal_init, dos_rawgetc): Replace Display_Info with
 Mouse_HLInfo everywhere where mouse_face_* members were accessed
 for mouse highlight purposes.

Finish coding mouse highlight redesigned for portability.
Not compiled yet.

 nsterm.m (ns_update_window_begin, ns_update_window_end)
 (ns_update_end, x_destroy_window, ns_frame_up_to_date)
 (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
 (ns_dumpglyphs_image, ns_dumpglyphs_stretch)
 (ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
 Replace Display_Info with Mouse_HLInfo everywhere where
 mouse_face_* members were accessed for mouse highlight purposes.
 xterm.c (x_update_window_begin, x_update_window_end)
 (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
 (handle_one_xevent, x_free_frame_resources, x_term_init): Replace
 Display_Info with Mouse_HLInfo everywhere where mouse_face_*
 members were accessed for mouse highlight purposes.
 w32term.c (x_update_window_begin, x_update_window_end)
 (x_update_end, w32_read_socket, x_free_frame_resources)
 (w32_initialize_display_info): Replace Display_Info with
 Mouse_HLInfo everywhere where mouse_face_* members were accessed
 for mouse highlight purposes.
 xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
 (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
 unless the frame is on a window-system.

Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.

Fix dates in ChangeLog entries.

merge trunk

merge trunk

Reposition some aliases in holidays.el.
* lisp/calendar/holidays.el (general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays, christian-holidays)
(islamic-holidays, bahai-holidays, solar-holidays): Move aliases before
the definitions of their targets.

(The position doesn't actually matter so long as the aliases are autoloaded).

w32term.c (x_draw_glyphless_glyph_string_foreground): Fix the arg with_background for font->driver->draw.

* cedet/semantic/bovine/c.el (semantic-analyze-split-name): Move before use.

* lisp/emacs-lisp/smie.el (smie): New custom group.
(smie-blink-matching-inners, smie-indent-basic): Add :group.

Silence compilation of mm-util.el.
* lisp/gnus/mm-util.el (gnus-completing-read): Autoload.
(mm-read-coding-system): Simplify Emacs definition.

* lisp/gnus/nnmail.el (gnus-activate-group): Update declaration.

Fix some declarations in cedet.

* lisp/cedet/semantic/symref/cscope.el (ede-toplevel):
* lisp/cedet/semantic/symref.el (ede-toplevel):
* lisp/cedet/semantic/tag-file.el (ede-toplevel):
* lisp/cedet/ede.el (ede-toplevel): Fix declarations.

shr.el: No need to declare `declare-function' since shr.el is for only Emacsen that provide `libxml-parse-html-region'.

Fix some declarations.

* lisp/gnus/nnimap.el (gnutls-negotiate):
* lisp/gnus/nntp.el (netrc-parse): Fix declarations.

* lisp/faces.el (xw-defined-colors, x-setup-function-keys):
* lisp/mouse-sel.el (x-select-text):
* lisp/term/w32console.el (x-setup-function-keys): Update declarations.

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare.

* lisp/textmodes/ispell.el (comment-add): Declare.

* net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): Declare.

* lisp/info.el (finder-keywords-hash, package-alist): Declare.

Handle glyphless characters on tty.