Merge from trunk

diff --cc lisp/ChangeLog
index 36fc19d87af9891400e910217773d71d2cbbc1ac,dce85ead9c763872c4e1739969f8121ebc41c496..e7d4b1ec1aa0ad4e755428854f87bd9f9940b98c
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,59 -1,205 +1,261 @@@
 +2010-11-10  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * help.el (with-help-window): In doc-string say how to set up
 +      temp-buffer-show-specifiers.
 +
 +      * isearch.el (isearch-help-for-help, isearch-describe-bindings)
 +      (isearch-describe-key, isearch-describe-mode): Replace bindings
 +      for same-window-buffer-names and same-window-regexps by binding
 +      temp-buffer-show-specifiers instead.
 +
 +      * international/mule-diag.el (mule-diag):
 +      * calc/calc-help.el (calc-describe-key, calc-full-help):
 +      * printing.el (pr-show-setup):
 +      * progmodes/python.el (python-describe-symbol):
 +      * textmodes/table.el (*table--cell-describe-mode)
 +      (*table--cell-describe-bindings):
 +      * tutorial.el (tutorial--describe-nonstandard-key)
 +      (tutorial--detailed-help):
 +      * progmodes/vhdl-mode.el (vhdl-doc-variable, vhdl-doc-mode):
 +      * play/yow.el (apropos-zippy): Use with-help-window.
 +
 +      * apropos.el (apropos-command): Remove the message calculation part.
 +      (apropos-print): Use with-help-window
 +
 +      * woman.el (woman-mini-help): Remove the message calculation part.
 +      (woman-display-extended-fonts): Use with-help-window.
 +
+ 2010-11-10  Glenn Morris  <rgm@gnu.org>
+ 
+       * progmodes/octave-mod.el (octave-mark-block): Update for smie change.
+ 
+       * emulation/edt.el (edt-with-position): New macro.
+       (edt-find-forward, edt-find-backward, edt-find-next-forward)
+       (edt-find-next-backward, edt-sentence-forward, edt-sentence-backward)
+       (edt-paragraph-forward, edt-paragraph-backward): Use it.
+ 
+       * emulation/tpu-extras.el (tpu-with-position): New macro.
+       (tpu-paragraph, tpu-page, tpu-search-internal): Use it.
+ 
+       * textmodes/texnfo-upd.el (texinfo-pointer-name): Fix typo.
+ 
+       * textmodes/texnfo-upd.el (texinfo-all-menus-update)
+       (texinfo-menu-copy-old-description, texinfo-start-menu-description)
+       (texinfo-master-menu, texinfo-insert-node-lines)
+       (texinfo-multiple-files-update):
+       * textmodes/texinfmt.el (texinfo-append-refill, texinfo-copying):
+       Use line-beginning-position.
+ 
+       * progmodes/cperl-mode.el (cperl-find-pods-heres, cperl-write-tags):
+       No recent Emacs supports system-type `emx'.
+ 
+       * 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.
+ 
+       * dirtrack.el (dirtrack-directory-function)
+       (dirtrack-canonicalize-function):
+       * filecache.el (file-cache-completion-ignore-case)
+       (file-cache-case-fold-search, file-cache-ignore-case):
+       * term.el (serial-port-is-file-p): Cosmetic change.
+ 
+       * emulation/viper-init.el (viper-ms-style-os-p): Doc fix.
+       Remove non-existent `windows-95' system-type.
+       * dired.el (dired-chown-program): Remove non-existent `linux'
+       system-type.
+ 
+       * net/net-utils.el (net-utils-remove-ctl-m): Use memq for system-types.
+       (ping-program-options): Remove non-existent `linux' system-type.
+ 
+       * startup.el (package-initialize): Update declaration.
+ 
+       * 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.
+ 
+       * textmodes/remember.el (remember-time-to-seconds): Remove.
+       (remember-store-in-mailbox): Use float-time.
+ 
+       * calendar/timeclock.el (timeclock-time-to-seconds): Make it an alias.
+ 
+       * 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.
+ 
+       * eshell/esh-util.el (eshell-time-less-p, eshell-time-to-seconds):
+       Remove.
+       (eshell-read-passwd, eshell-read-hosts): Use time-less-p.
+       * eshell/esh-test.el (eshell-test, eshell-show-usage-metrics):
+       * eshell/em-unix.el (eshell-show-elapsed-time, eshell/time):
+       * eshell/em-pred.el (eshell-pred-file-time): Use float-time.
+       * eshell/em-ls.el (eshell-ls-sort-entries): Use time-less-p.
+ 
+       * 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'.
+       * eshell/em-glob.el (eshell-extended-glob, eshell-glob-entries):
+       Prefix dynamic local variable `matches'.
+ 
+       * skeleton.el (skeleton-internal-list, skeleton-internal-1):
+       Prefix dynamic local variable `skeleton'.
+ 
+ 2010-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * 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.
+ 
+ 2010-11-09  Glenn Morris  <rgm@gnu.org>
+ 
+       * progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix.
+ 
+ 2010-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * minibuffer.el (minibuffer-completion-help): Specify the end of the
+       completion field (bug#7211).
+ 
+       * progmodes/python.el (python-font-lock-syntactic-keywords): (bug#7322)
+       Fix handling of backslash escapes.
+       (python-quote-syntax): Adjust accordingly.
+ 
+ 2010-11-09  Richard Levitte  <richard@levitte.org>  (tiny change)
+ 
+       * vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
+       (vc-mtn-workfile-branch): Adjust to new output format.
+ 
+ 2010-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * international/mule-cmds.el (princ-list): Mark as obsolete.
+ 
+ 2010-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/smie.el: New package.
+ 
+ 2010-11-09  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * files.el (backup-by-copying-when-mismatch):
+       Set `permanent-local' property.
+ 
+       * net/tramp.el (tramp-handle-insert-file-contents): Do not set
+       `permanent-local' property for `backup-by-copying-when-mismatch'.
+ 
+ 2010-11-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * ls-lisp.el (insert-directory): Doc fix.  (bug#7285)
+ 
+ 2010-11-09  Wilson Snyder  <wsnyder@wsnyder.org>
+ 
+       * 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.
+ 
+ 2010-11-09  Glenn Morris  <rgm@gnu.org>
+ 
+       * locate.el (locate, locate-mode): Doc fixes.
+ 
+ 2010-11-09  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * server.el (server-start): New arg INHIBIT-PROMPT prevents asking
+       user for confirmation.
+       (server-force-stop): Use it.
+       (server-start): Use server-force-stop for kill-emacs-hook, to
+       avoid user interaction while killing Emacs.
+ 
+ 2010-11-09  Glenn Morris  <rgm@gnu.org>
+ 
+       * progmodes/meta-mode.el: Remove leading `*' from defcustom docs.
+       (meta-indent-line): Simplify.
+ 
+       * vc/emerge.el (emerge-line-number-in-buf):
+       * textmodes/ispell.el (ispell-region):
+       * textmodes/fill.el (current-fill-column):
+       * progmodes/xscheme.el (xscheme-send-current-line):
+       * progmodes/vhdl-mode.el (vhdl-current-line, vhdl-line-copy):
+       * progmodes/tcl.el (tcl-hairy-scan-for-comment):
+       * progmodes/sh-script.el (sh-handle-prev-do):
+       * progmodes/meta-mode.el (meta-indent-line):
+       * progmodes/idlwave.el (idlwave-goto-comment, idlwave-fill-paragraph)
+       (idlwave-in-quote):
+       * progmodes/idlw-shell.el (idlwave-shell-current-frame)
+       (idlwave-shell-update-bp-overlays, idlwave-shell-sources-filter):
+       * progmodes/fortran.el (fortran-looking-at-if-then):
+       * progmodes/etags.el (find-tag-in-order, etags-snarf-tag):
+       * progmodes/cperl-mode.el (cperl-sniff-for-indent)
+       (cperl-find-pods-heres):
+       * progmodes/ada-mode.el (ada-get-current-indent, ada-narrow-to-defun):
+       * net/quickurl.el (quickurl-list-insert):
+       * net/ldap.el (ldap-search-internal):
+       * net/eudc.el (eudc-expand-inline):
+       * mail/sendmail.el (sendmail-send-it):
+       * mail/mspools.el (mspools-visit-spool, mspools-get-spool-name):
+       * emulation/viper-cmd.el (viper-paren-match, viper-backward-indent)
+       (viper-brac-function):
+       * calc/calc-yank.el (calc-do-grab-region):
+       * calc/calc-keypd.el (calc-keypad-press):
+       * term.el (term-move-columns, term-insert-spaces):
+       * speedbar.el (speedbar-highlight-one-tag-line):
+       * simple.el (current-word):
+       * mouse-drag.el (mouse-drag-should-do-col-scrolling):
+       * info.el (Info-find-node-in-buffer-1, Info-follow-reference)
+       (Info-scroll-down):
+       * hippie-exp.el (he-line-beg):
+       * epa.el (epa--marked-keys):
+       * dired-aux.el (dired-kill-line, dired-do-kill-lines)
+       (dired-update-file-line, dired-add-entry, dired-remove-entry)
+       (dired-relist-entry):
+       * buff-menu.el (Buffer-menu-buffer):
+       * array.el (current-line):
+       * allout.el (allout-resolve-xref)
+       (allout-latex-verbatim-quote-curr-line):
+       Replace yet more uses of end-of-line etc with line-end-position, etc.
+ 
+ 2010-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * 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.
+ 
+       * emacs-lisp/cl-macs.el (extent-data, extent-face, extent-priority)
+       (extent-end-position, extent-start-position): Remove setf method for
+       non-existing functions (bug#7319).
+ 
 +2010-11-07  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * ielm.el (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +      (ielm): Use pop-to-buffer-same-window.
 +
 +      * progmodes/inf-lisp.el (inferior-lisp): Use
 +      pop-to-buffer-same-window.
 +      (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +      (switch-to-lisp): Use pop-to-buffer with tailored specifiers.
 +
 +      * replace.el (occur-mode-goto-occurrence): Use
 +      pop-to-buffer-other-window.
 +      (occur-mode-display-occurrence): Use
 +      display-buffer-other-window.
 +
 +      * shell.el (shell): Use pop-to-buffer-same-window.
 +      (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +
 +      * net/rlogin.el: (top-level): Remove autoloaded add-hook for
 +      same-window-regexps.
 +      (rlogin): Use pop-to-buffer-same-window.
 +
 +      * net/telnet.el (top-level): Remove two autoloaded add-hooks for
 +      same-window-regexps.
 +      (telnet, rsh): Use pop-to-buffer-same-window.
 +
  2010-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * emacs-lisp/smie.el: Simplify the smie-rules-function return values.

diff --cc lisp/buff-menu.el
Simple merge

diff --cc lisp/dired.el
Simple merge

diff --cc lisp/emulation/tpu-edt.el
index bcd67d4aff7a327ee29b372e156dc035c5755d9a,bcd67d4aff7a327ee29b372e156dc035c5755d9a..f77cf23d81eefd43ec5a5261e143c79cabfa9675
--- 1/lisp/emulation/tpu-edt.el
--- 2/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@@ -2438,7 -2438,7 +2438,7 @@@ If FILE is nil, try to load a default f
  
  \f
  ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins
--;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "78abc50917c93d2b35596d307fc638c4")
++;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "fe5b7795d6b6720a98b805ee47a08bdf")
  ;;; Generated autoloads from tpu-extras.el
  
  (autoload 'tpu-cursor-free-mode "tpu-extras" "\

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/ChangeLog
Simple merge

diff --cc lisp/gnus/message.el
Simple merge

diff --cc lisp/info.el
Simple merge

diff --cc lisp/mail/sendmail.el
Simple merge

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc lisp/progmodes/vhdl-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/ChangeLog
index e8ddfe26876e4b9ef3fb5f4e45c2510d9c50f7c4,9804d57a9cfadf7b6b71dc72902f7728b3aa922d..f0fec85e73f791e78a4a6fd11398471d506e7639
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,49 +1,60 @@@
 +2010-11-10  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.c (syms_of_window): New variable
 +      temp-buffer-show-specifiers.
 +      (temp_output_buffer_show): Call display-buffer with second
 +      argument set to temp-buffer-show-specifiers and reset the latter
 +      after the call.
 +
 +      * print.c (Fwith_output_to_temp_buffer): In doc-string explain how
 +      to set up temp-buffer-show-specifiers.
 +
+ 2010-11-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * font.c (font_filter_properties): Add const to array elements of
+       properties args.
+ 
+       * font.h (font_filter_properties): Likewise.
+ 
+       * ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array
+       elements.
+ 
+       * w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
+ 
+ 2010-11-10  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
+       (XD_BASIC_DBUS_TYPE, xd_symbol_to_dbus_type, xd_signature)
+       (xd_append_arg, xd_retrieve_arg): Support DBUS_TYPE_UNIX_FD.
+       (Fdbus_call_method): Add DBUS_TYPE_UNIX_FD type mapping to doc string.
+       (syms_of_dbusbind): Initialize QCdbus_type_unix_fd).
+ 
+ 2010-11-10  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs.c (syms_of_emacs) <system-type>: Doc fix.
+ 
+ 2010-11-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xfns.c (x_real_positions): Fix declaration-after-statement problem.
+ 
+ 2010-11-09  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * 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).
+ 
+ 2010-11-09  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our
+       parent is the root window.  Check this after traversing window tree.
+ 
+       * xterm.c (x_term_init): Initialize Xatom_net_frame_extents.
+ 
+       * xterm.h (struct x_display_info): Xatom_net_frame_extents is new.
+ 
+       * xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first
+       before traversing window tree (Bug#5721).
+ 
  2010-11-07  Jan Djärv  <jan.h.d@swipnet.se>
  
        * xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.

diff --cc src/xfns.c
Simple merge