Remove ls-lisp time-related functions that duplicate standard functions.

* lisp/ls-lisp.el (ls-lisp-time-lessp, ls-lisp-time-to-seconds): Remove.
(ls-lisp-handle-switches): Use time-less-p.
(ls-lisp-format-time): Use float-time.

system-type related trivia.

* lisp/cedet/semantic/bovine/c.el: Test system-type with memq.

* lisp/progmodes/cperl-mode.el (cperl-find-pods-heres, cperl-write-tags):
No recent Emacs supports system-type `emx'.

* lisp/progmodes/ada-xref.el (is-windows): Rename to ada-on-ms-windows.
(ada-command-separator, ada-default-prj-properties)
(ada-find-any-references): Update for above name change.

* lisp/dirtrack.el (dirtrack-directory-function)
(dirtrack-canonicalize-function):
* lisp/filecache.el (file-cache-completion-ignore-case)
(file-cache-case-fold-search, file-cache-ignore-case):
* lisp/term.el (serial-port-is-file-p): Cosmetic change.

* lisp/emulation/viper-init.el (viper-ms-style-os-p): Doc fix.
Remove non-existent `windows-95' system-type.
* lisp/dired.el (dired-chown-program): Remove non-existent `linux'
system-type.

* lisp/locate.el: Comment.

net-utils system-type trivia.

* lisp/net/net-utils.el (net-utils-remove-ctl-m): Use memq for system-types.
(ping-program-options): Remove non-existent `linux' system-type.

* lisp/startup.el (package-initialize): Update declaration.

* lisp/gnus/smime.el (from): Remove unused declaration.

time-to-seconds related simplifications.

* lisp/gnus/gnus-util.el (with-no-warnings): Remove compat stub, now unused.
(gnus-float-time): On Emacs, always an alias.

* lisp/gnus/ecomplete.el (with-no-warnings): Remove compat stub, now unused.
(ecomplete-add-item): Use float-time on Emacs, else gnus-float-time.

* lisp/textmodes/remember.el (remember-time-to-seconds): Remove.
(remember-store-in-mailbox): Use float-time.

* lisp/calendar/timeclock.el (timeclock-time-to-seconds): Make it an alias.

* lisp/calendar/time-date.el (time-to-seconds): Always an alias on Emacs,
never a real function.
(with-no-warnings): Remove compat stub, now unused.
(time-less-p): Doc fix.
(time-to-number-of-days): Simplify.

Replace some eshell functions that duplicate standard functions.

* lisp/eshell/esh-util.el (eshell-time-less-p, eshell-time-to-seconds): Remove.
(eshell-read-passwd, eshell-read-hosts): Use time-less-p.
* lisp/eshell/esh-test.el (eshell-test, eshell-show-usage-metrics):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time, eshell/time):
* lisp/eshell/em-pred.el (eshell-pred-file-time): Use float-time.
* lisp/eshell/em-ls.el (eshell-ls-sort-entries): Use time-less-p.

Silence compilation of some shell files.

* lisp/eshell/em-unix.el (eshell-remove-entries, eshell/rm)
(eshell-shuffle-files, eshell-shorthand-tar-command)
(eshell-mvcpln-template, eshell/mv, eshell/cp, eshell/ln):
Prefix dynamic locals `interactive', `preview', `recursive', `verbose'.
* lisp/eshell/em-glob.el (eshell-extended-glob, eshell-glob-entries):
Prefix dynamic local variable `matches'.

* src/emacs.c (syms_of_emacs) <system-type>: Doc fix.

ChangeLog fix.

gnus-art.el (org-entities): Bind it.

net/browse-url.el (browse-url-mail): Insert body part of mailto url in mail buffer; make yank-action always a command that yanks original buffer.

Merge changes made in Gnus trunk.

message.el (message-mailto): New function.
message.el (message-mailto): Should accept other parameters.
message.el (message-mailto): Remove since it duplicates browse-url-mailto functionality.
shr.el (shr-browse-url): Call browse-url-mailto for mailto: links.
message.el (message-subject-trailing-was-ask-regexp): A ] in a [] regexp doesn't need quoting.
gnus-art.el (article-treat-non-ascii): New command and keystroke.
shr.el (browse-url-mailto): Autoload.
gnus.texi (Article Washing): Document gnus-article-treat-non-ascii.

Merge from emacs-23

xfns.c (x_real_positions): Fix declaration-after-statement problem.

message.el (message-subject-trailing-was-ask-regexp, message-subject-trailing-was-regexp): Match was: in addition to was.

* lisp/progmodes/meta-mode.el: (meta-indent-line): Simplify.

* lisp/progmodes/meta-mode.el: Remove leading `*' from defcustom docs.

* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix.

Replace still more end-of-line etc with line-end-position, etc.

* lisp/gnus/nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)
(nnbabyl-check-mbox): Use point-at-bol.

* lisp/cedet/semantic/lex.el (semantic-lex-ignore-comments, semantic-flex):
* lisp/cedet/semantic/grammar.el (semantic-grammar-epilogue):
* lisp/cedet/ede/speedbar.el (ede-find-nearest-file-line):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/ede/autoconf-edit.el (autoconf-delete-parameter):
Use point-at-bol and point-at-eol.

* lisp/vc/emerge.el (emerge-line-number-in-buf):
* lisp/textmodes/ispell.el (ispell-region):
* lisp/textmodes/fill.el (current-fill-column):
* lisp/progmodes/xscheme.el (xscheme-send-current-line):
* lisp/progmodes/vhdl-mode.el (vhdl-current-line, vhdl-line-copy):
* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment):
* lisp/progmodes/sh-script.el (sh-handle-prev-do):
* lisp/progmodes/meta-mode.el (meta-indent-line):
* lisp/progmodes/idlwave.el (idlwave-goto-comment, idlwave-fill-paragraph)
(idlwave-in-quote):
* lisp/progmodes/idlw-shell.el (idlwave-shell-current-frame)
(idlwave-shell-update-bp-overlays, idlwave-shell-sources-filter):
* lisp/progmodes/fortran.el (fortran-looking-at-if-then):
* lisp/progmodes/etags.el (find-tag-in-order, etags-snarf-tag):
* lisp/progmodes/cperl-mode.el (cperl-sniff-for-indent)
(cperl-find-pods-heres):
* lisp/progmodes/ada-mode.el (ada-get-current-indent, ada-narrow-to-defun):
* lisp/net/quickurl.el (quickurl-list-insert):
* lisp/net/ldap.el (ldap-search-internal):
* lisp/net/eudc.el (eudc-expand-inline):
* lisp/mail/sendmail.el (sendmail-send-it):
* lisp/mail/mspools.el (mspools-visit-spool, mspools-get-spool-name):
* lisp/emulation/viper-cmd.el (viper-paren-match, viper-backward-indent)
(viper-brac-function):
* lisp/calc/calc-yank.el (calc-do-grab-region):
* lisp/calc/calc-keypd.el (calc-keypad-press):
* lisp/term.el (term-move-columns, term-insert-spaces):
* lisp/speedbar.el (speedbar-highlight-one-tag-line):
* lisp/simple.el (current-word):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* lisp/info.el (Info-find-node-in-buffer-1, Info-follow-reference)
(Info-scroll-down):
* lisp/hippie-exp.el (he-line-beg):
* lisp/epa.el (epa--marked-keys):
* lisp/dired-aux.el (dired-kill-line, dired-do-kill-lines)
(dired-update-file-line, dired-add-entry, dired-remove-entry)
(dired-relist-entry):
* lisp/buff-menu.el (Buffer-menu-buffer):
* lisp/array.el (current-line):
* lisp/allout.el (allout-resolve-xref)
(allout-latex-verbatim-quote-curr-line):
Replace yet more uses of end-of-line etc with line-end-position.

ChangeLog fix.

Bump version to 23.2.90.
Regenerate AUTHORS, configure, and ldefs-boot.el.

message.el (message-subject-trailing-was-regexp): Fix default value.

* .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.

* lisp/minibuffer.el (minibuffer-completion-help): Specify the end of the
completion field.

Fixes: debbugs:7211

* lisp/emacs-lisp/checkdoc.el (checkdoc-display-status-buffer)
(checkdoc-interactive-loop, checkdoc-recursive-edit): Avoid princ-list.
(checkdoc-syntax-table): Initialize in the declaration.
(emacs-lisp-mode-hook): Use just checkdoc-minor-mode now that it turns
the mode on unconditionally.

* lisp/emacs-lisp/cl-macs.el (extent-data, extent-face, extent-priority)
(extent-end-position, extent-start-position): Remove setf method for
non-existing functions.

Fixes: debbugs:7319

* lisp/progmodes/python.el (python-font-lock-syntactic-keywords):
Fix handling of backslash escapes.
(python-quote-syntax): Adjust accordingly.

Fixes: debbugs:7322

* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
(vc-mtn-workfile-branch): Adjust to new output format.

* lisp/international/mule-cmds.el (princ-list): Mark as obsolete.

gnus-group.el (gnus-group-read-ephemeral-group, gnus-group-make-group): Remove superfluous ": " from the prompt.
gnus-start.el (gnus-get-unread-articles, gnus-read-active-file): Ignore totally non-existent methods.

* lisp/emacs-lisp/smie.el: New package.

* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
(smie-precs->prec2): Rename from smie-precs-precedence-table.
(smie-bnf->prec2): Rename from smie-bnf-precedence-table.
(smie-prec2->grammar): Rename from smie-prec2-levels.
(smie-grammar): Rename from smie-op-levels.
(smie-indent--hanging-p): Rename from smie-hanging-p.
(smie-rule-hanging-p): New alias.
(smie-indent--bolp): Rename from smie-bolp.
(smie-indent--hanging-p): New alias.
(smie--token): New dynamically bound variable.
(smie-indent--parent): New function.
(smie-rule-parent-p): Use it; rename from smie-parent-p.
(smie-rule-next-p): Rename from smie-next-p.
(smie-rule-prev-p): Rename from smie-prev-p.
(smie-rule-sibling-p, smie-rule-parent)
(smie-indent--separator-outdent, smie-rule-separator): New functions.
(smie-rule-separator-outdent): New var.
(smie-indent--rule): Merge with smie-indent--column.
(smie-indent-forward-token, smie-indent-backward-token):
Also recognize close parens.
(smie-indent-keyword): Don't use smie-indent--column any more.
(smie-indent-after-keyword): Ignore closers by default.
(smie-indent-line): Use with-demoted-errors.
* lisp/progmodes/octave-mod.el (octave-smie-grammar):
Rename from octave-smie-op-levels.
(octave-smie-rules): Adjust to new behavior.
* lisp/progmodes/prolog.el (prolog-smie-grammar):
Rename from prolog-smie-op-levels.

* 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 misleading Changelog entry.

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.

Fix typo.

* files.el (backup-by-copying-when-mismatch): Make it a buffer local
variable (permanent-local).

* net/tramp.el (tramp-handle-insert-file-contents): Do not set
`permanent-local' property for `(backup-by-copying-when-mismatch'.

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

Fix bug #7300.

 msdog.texi (Windows HOME): Add information regarding startup
 directory when invoking Emacs from a desktop shortcut.

Back-port from trunk the fix for bug #6294.

 ls-lisp.el (ls-lisp-classify-file): New function.
 (ls-lisp-insert-directory): Call it if switches include -F.
 (ls-lisp-classify): Call ls-lisp-classify-file.
 (insert-directory): Remove blanks from switches.

Fix bug #7285.

 ls-lisp.el (insert-directory): Doc fix.

* 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.

* progmodes/verilog-mode.el (verilog-insert-one-definition)
(verilog-read-decls, verilog-read-sub-decls-sig): Fix AUTOWIRE and
AUTOINOUT for SV style multidimensional arrays, bug294.  Reported
by Eric Mastromarchi.
(verilog-preprocess): Use with-current-buffer and
font-lock-fontify-buffer to cleanup style issues.

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.

* trampver.texi: Update release number.

This shall not be merged into the trunk.

* net/trampver.el: Update release number.

This shall not be merged into the trunk.

chapter, part, section are all DocBook elements

Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
* image.c (free_image): Don't garbage the frame here, since this
function can be called while redisplaying (Bug#7210).
(uncache_image): Garbage the frame here (Bug#6426).

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.

Regenerate configure.

Backport fix for Bug#5723 from trunk.

Backport 2010-03-27T00:45:32Z!cyd@stupidchicken.com from trunk

Backport 2010-03-25T08:56:15Z!mituharu@math.s.chiba-u.ac.jp from trunk

Backport 2010-03-25T08:48:52Z!mituharu@math.s.chiba-u.ac.jp from trunk

Backport 2010-05-27T04:24:30Z!handa@etlken from trunk

Backport fix for Bug#2423 from trunk.

* dispextern.h (TRY_WINDOW_CHECK_MARGINS)
(TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.

* xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
set in FLAGS.  Callers with non-zero CHECK_MARGINS changed to use
TRY_WINDOW_CHECK_MARGINS.

* xfns.c (Fx_show_tip): Undo last change.  Call try_window with
TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).

Backport 2010-04-10T10:52:30Z!mituharu@math.s.chiba-u.ac.jp from trunk

Backport 2010-04-10T10:39:16Z!mituharu@math.s.chiba-u.ac.jp from trunk

Backport from trunk.

Backport Bug#6765 fix from trunk.

* mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the
beginning of the string.  Use `string-match-p'.  (Bug#6765)

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>.