Merge from trunk

diff --cc lisp/ChangeLog
index ce9d5b24af626f4d57bb8e715e01334433abbcc5,9dd1e61de47331e76d47ebf504a7173262e38f5c..96180df8dac757b019103daebeccf9bbbed29221
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,35 -1,78 +1,110 @@@
 +2010-11-12  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer): Write check for dedicatedness
 +      correctly in the same-window section.
 +
+ 2010-11-12  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs-lisp/bytecomp.el (byte-compile-log-buffer): New constant.
+       Use it to replace all instances of "*Compile-Log*"
+ 
+ 2010-11-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/pcase.el (pcase-let*, pcase-let): Add debug and
+       indentation specs.
+ 
+ 2010-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * progmodes/modula2.el: Use SMIE and skeleton.
+       (m2-mode-syntax-table): (*..*) can be nested.
+       Add //...\n.  Fix paren syntax.
+       (m2-mode-map): Remove LF and TAB bindings.
+       (m2-indent): Add safety property.
+       (m2-smie-grammar): New var.
+       (m2-smie-refine-colon, m2-smie-refine-of, m2-smie-backward-token)
+       (m2-smie-forward-token, m2-smie-refine-semi, m2-smie-rules): New funs.
+       (m2-mode): Use define-derived-mode.
+       (m2-newline, m2-tab): Remove.
+       (m2-begin, m2-case, m2-definition, m2-else, m2-for, m2-header)
+       (m2-if, m2-loop, m2-module, m2-or, m2-procedure, m2-with, m2-record)
+       (m2-stdio, m2-type, m2-until, m2-var, m2-while, m2-export)
+       (m2-import): Use define-skeleton.
+ 
+ 2010-11-11  Glenn Morris  <rgm@gnu.org>
+ 
+       * obsolete/lucid.el: Don't warn about any CL functions in this file.
+ 
+       * ls-lisp.el (ls-lisp-ignore-case, ls-lisp-dirs-first)
+       (ls-lisp-verbosity): Add custom :set-after property.
+       (ls-lisp-verbosity, ls-lisp-use-localized-time-format): Doc fixes.
+       (ls-lisp-format, ls-lisp-format-time): Don't take `now' as an argument.
+       (ls-lisp-insert-directory): Update caller.
+       (ls-lisp-set-options): New function.
+       (ls-lisp-emulation): Use ls-lisp-set-options for custom :set.
+       Doc fix.
+ 
+       * play/landmark.el (lm-prompt-for-move):
+       * play/gomoku.el (gomoku-prompt-for-move): Remove nonsensical code.
+ 
+       * progmodes/idlw-complete-structtag.el: Remove unused dec `name'.
+ 
+       * progmodes/idlwave.el (idlwave-routine-entry-compare-twins)
+       (idlwave-study-twins): Prefix dynamic local variable `name'.
+       (idlwave-routine-twin-compare): Update for above change.
+ 
+       * progmodes/idlw-help.el (idlwave-do-mouse-completion-help):
+       Prefix dynamic local variables `name', `kwd', and `link'.
+       * progmodes/idlw-shell.el (idlwave-shell-complete-execcomm-help):
+       * progmodes/idlw-complete-structtag.el
+       (idlwave-complete-structure-tag-help):
+       * progmodes/idlwave.el (idlwave-complete-sysvar-help)
+       (idlwave-complete-sysvar-tag-help)
+       (idlwave-complete-class-structure-tag-help):
+       Update for above name changes.
+ 
 +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  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * net/browse-url.el (browse-url-browser-function): Change the
+       default to use `browse-url-mail' on mailto: URLs.
+ 
+ 2010-11-10  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * emacs-lisp/package.el (package-read-all-archive-contents):
+       Reset package-archive-contents to nil before re-reading.
+ 
+ 2010-11-10  Brandon Craig Rhodes <brandon@rhodesmill.org>  (tiny change)
+ 
+       * textmodes/flyspell.el (flyspell-word): Do not re-check words
+       already found as misspellings by (flyspell-large-region), just
+       do highlighting (bug#7322).
+ 
  2010-11-10  Glenn Morris  <rgm@gnu.org>
  
        * progmodes/octave-mod.el (octave-mark-block): Update for smie change.

diff --cc lisp/gnus/ChangeLog
Simple merge

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

diff --cc src/ChangeLog
index 1a67485070893f585ce4bda6db93e8f773e086f8,902570f804f0513a8bb543b6d08f3b55bf159498..987459fb1957b5c80356790405aee94dad720a4d
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,21 -1,8 +1,26 @@@
 +2010-11-11  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.c (syms_of_window): Add Qsafe and intern it.
 +      (resize_frame_windows): Check whether the actual new size of the
 +      root window matches the requested size.  Also try one more round
 +      with safe minimum sizes.  Simplify code.
 +
+ 2010-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * cmds.c (Fself_insert_command): Don't call XFASTINT without checking
+       it's not negative.
+ 
 +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