Merge from trunk

diff --cc lisp/ChangeLog
index 21d9883ba3dc2bd9628c730dad5de5198e8c9987,05b5c1cebd1318ee11253b27ec30ff72df2a8a43..3c50fa82ac44efe27408b9b51f0255554d0c9fcf
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,36 -1,21 +1,54 @@@
 +2010-11-17  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-split-window-1): Fix sizing for
 +      internal windows which got broken by the last fix.
 +
 +      * progmodes/compile.el (compilation-minor-mode-map)
 +      (compilation-mode-map): Replace bindings for quit-window by
 +      bindings for quit-restore-window.
 +
 +2010-11-16  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-split-window-1)
 +      (display-buffer-split-window): Rewrite so that windows are
 +      always split evenly.
 +
+ 2010-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * progmodes/octave-mod.el: Rely on elecric-*-modes.
+       (octave-mode-map): Don't bind ;, SPC, and LF.
+       (octave-auto-indent, octave-auto-newline): Remove.
+       (electric-layout-rules): Declare.
+       (octave-mode): Set electric-layout-rules.
+       (octave-indent-new-comment-line): Use reindent-then-newline-and-indent.
+       (octave-reindent-then-newline-and-indent, octave-electric-semi)
+       (octave-electric-space): Remove.
+ 
+       * electric.el (electric-layout-mode): New minor mode.
+       (electric--after-char-pos): New function.
+       (electric-indent-post-self-insert-function): Use it.
+       (electric-layout-rules): New var.
+       (electric-layout-post-self-insert-function): New function.
+       (electric-indent-mode): Make them interact better.
+ 
 +2010-11-15  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * minibuffer.el (minibuffer-completion-help): Don't mark window
 +      as dedicated, the quit-restore parameter should take care of
 +      deleting the window.
 +      (minibuffer-hide-completions): Use quit-restore-window instead
 +      of bury-buffer.
 +
 +      * window.el (display-buffer-split-window-1): Remove max-size
 +      argument and corresponding code.
 +      (display-buffer-split-window): Remove handling of max-height and
 +      max-width specifiers.  Restore the pre Emacs 24 behavior where a
 +      single-window frame could be split ignoring the min-height
 +      specifier (then split-height-threshold value).  For the
 +      horizontal splitting, side equalling nil case call
 +      display-buffer-split-window-1 with side argument set to 'right
 +      instead of 'below, fixing a bug spotted by Štěpán Němec.
 +
  2010-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * emacs-lisp/checkdoc.el (checkdoc-syntax-table): Fix last change.

diff --cc lisp/electric.el
Simple merge

diff --cc lisp/gnus/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/window.h
index d569ad60f9c4b95cfcb6bf2f98c69428d49d903e,c1148836d79e72ab001c051a361b4cf2d37be225..1803accab38287b7e6e39c1ec61c53a70e002171
--- 1/src/window.h
--- 2/src/window.h
+++ b/src/window.h
@@@ -836,9 -786,9 +836,8 @@@ EXFUN (Fset_window_margins, 3)
  EXFUN (Fwindow_live_p, 1);
  EXFUN (Fset_window_point, 2);
  extern Lisp_Object make_window (void);
 -extern void delete_window (Lisp_Object);
  extern Lisp_Object window_from_coordinates (struct frame *, int, int,
-                                             enum window_part *,
-                                             int *, int*, int);
+                                             enum window_part *, int);
  EXFUN (Fwindow_dedicated_p, 1);
  extern int window_height (Lisp_Object);
  extern int window_width (Lisp_Object);
@@@ -847,9 -800,10 +846,10 @@@ extern void delete_all_subwindows (Lisp
  extern void freeze_window_starts (struct frame *, int);
  extern void foreach_window (struct frame *,
                              int (* fn) (struct window *, void *),
 -                            void *);
 +                          void *);
  extern void grow_mini_window (struct window *, int);
  extern void shrink_mini_window (struct window *);
+ extern int window_relative_x_coord (struct window *, enum window_part, int);
  
  void run_window_configuration_change_hook (struct frame *f);
  

diff --cc src/xdisp.c
Simple merge