Merge from trunk.

8 files changed, 61 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cf968505af..622831cb31f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2011-06-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * subr.el (process-live-p): Renamed from `process-alive-p' for
+        consistency with other `-live-p' functions.
+
+2011-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el (same-window-buffer-names, same-window-regexps)
+        (special-display-frame-alist, special-display-popup-frame)
+        (special-display-function, special-display-buffer-names)
+        (special-display-regexps, pop-up-frame-alist)
+        (pop-up-frame-function, pop-up-frames, display-buffer-reuse-frames)
+        (pop-up-windows, split-window-preferred-function)
+        (split-height-threshold, split-width-threshold, even-window-heights)
+        (display-buffer-mark-dedicated): Don't encourage the use of
+        display-buffer-alist from Elisp code.
+
+2011-06-15  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * progmodes/python.el (python-mode): Derive from prog-mode.
+        * progmodes/ps-mode.el (ps-mode):
+        * progmodes/mixal-mode.el (mixal-mode):
+        * progmodes/cfengine.el (cfengine-mode):
+        * progmodes/ld-script.el (ld-script-mode): Likewise.
+
+2011-06-15  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-alist): Trim default value to avoid
+        popping up a new frame (Bug#8857) or reusing an arbitrary window
+        on another frame.
+        (display-buffer): Do not fall back on popping up a new frame in
+        batch mode (Bug#8857).
+
 2011-06-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * cus-theme.el (describe-theme-1): Use custom-theme-p.
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index a475bbd5932..22ece17cb28 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -198,7 +198,7 @@ Intended as the value of `indent-line-function'."
       t))
 
 ;;;###autoload
-(define-derived-mode cfengine-mode fundamental-mode "Cfengine"
+(define-derived-mode cfengine-mode prog-mode "Cfengine"
   "Major mode for editing cfengine input.
 There are no special keybindings by default.
 
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 8bdac61d4ab..c682bfa0280 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -168,7 +168,7 @@
   "Default font-lock-keywords for `ld-script-mode'.")
 
 ;;;###autoload
-(define-derived-mode ld-script-mode nil "LD-Script"
+(define-derived-mode ld-script-mode prog-mode "LD-Script"
    "A major mode to edit GNU ld script files"
   (set (make-local-variable 'comment-start) "/* ")
   (set (make-local-variable 'comment-end)   " */")
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 0d8cdd9f9b1..103c7be7d3c 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1103,7 +1103,7 @@ Assumes that file has been compiled with debugging support."
     (error "mixvm.el needs to be loaded to run `mixvm'")))
 
 ;;;###autoload
-(define-derived-mode mixal-mode fundamental-mode "mixal"
+(define-derived-mode mixal-mode prog-mode "mixal"
   "Major mode for the mixal asm language."
   (set (make-local-variable 'comment-start) "*")
   (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*")
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index cade56a194c..d60e7513651 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -485,7 +485,7 @@ If nil, use `temporary-file-directory'."
 ;; PostScript mode.
 
 ;;;###autoload
-(define-derived-mode ps-mode fundamental-mode "PostScript"
+(define-derived-mode ps-mode prog-mode "PostScript"
   "Major mode for editing PostScript with GNU Emacs.
 
 Entry to this mode calls `ps-mode-hook'.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b99cad1d081..3d243f14f07 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2420,7 +2420,7 @@ without confirmation."
 (defvar python-mode-running)            ;Dynamically scoped var.
 
 ;;;###autoload
-(define-derived-mode python-mode fundamental-mode "Python"
+(define-derived-mode python-mode prog-mode "Python"
   "Major mode for editing Python files.
 Turns on Font Lock mode unconditionally since it is currently required
 for correct parsing of the source.
diff --git a/lisp/subr.el b/lisp/subr.el
index d0ef38c1140..b328b7e17b7 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1805,7 +1805,7 @@ Signal an error if the program returns with a non-zero exit status."
           (forward-line 1))
         (nreverse lines)))))
 
-(defun process-alive-p (process)
+(defun process-live-p (process)
   "Returns non-nil if PROCESS is alive.
 A process is considered alive if its status is `run', `open',
 `listen', `connect' or `stop'."
diff --git a/lisp/window.el b/lisp/window.el
index cad4e15507d..5493893d4c1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3505,9 +3505,7 @@ buffer display specifiers.")
      reuse-window (reuse-window nil same visible)
      pop-up-window
      (pop-up-window (largest . nil) (lru . nil))
-     pop-up-frame
-     (pop-up-frame)
-     reuse-window (reuse-window nil other visible)
+     reuse-window (reuse-window other other nil)
      (reuse-window-even-sizes . t)))
   "List associating buffer identifiers with display specifiers.
 The car of each element of this list is built from a set of cons
@@ -5303,12 +5301,12 @@ this list as arguments."
           ;; Try reusing a window not showing BUFFER on any visible or
           ;; iconified frame.
           (display-buffer-reuse-window buffer '(nil other 0))
-          ;; Try making a new frame.
-          (display-buffer-pop-up-frame buffer)
-          ;; Try using weakly dedicated windows.
+          ;; Try making a new frame (but not in batch mode).
+          (and (not noninteractive) (display-buffer-pop-up-frame buffer))
+          ;; Try using a weakly dedicated window.
           (display-buffer-reuse-window
            buffer '(nil nil t) '((reuse-window-dedicated . weak)))
-          ;; Try using strongly dedicated windows.
+          ;; Try using a strongly dedicated window.
           (display-buffer-reuse-window
            buffer '(nil nil t) '((reuse-window-dedicated . t)))))))
 
@@ -5583,7 +5581,7 @@ See also `same-window-regexps'."
  :group 'windows)
 (make-obsolete-variable
  'same-window-buffer-names
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom same-window-regexps nil
   "List of regexps saying which buffers should appear in the \"same\" window.
@@ -5601,7 +5599,7 @@ See also `same-window-buffer-names'."
   :group 'windows)
 (make-obsolete-variable
  'same-window-regexps
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun same-window-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
@@ -5647,7 +5645,7 @@ These supersede the values given in `default-frame-alist'."
   :group 'frames)
 (make-obsolete-variable
  'special-display-frame-alist
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-popup-frame (buffer &optional args)
   "Display BUFFER in a special frame and return the window chosen.
@@ -5695,7 +5693,7 @@ and (cdr ARGS) as second."
          (frame-selected-window frame))))))
 (make-obsolete
  'special-display-popup-frame
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-function 'special-display-popup-frame
   "Function to call for displaying special buffers.
@@ -5714,7 +5712,7 @@ A buffer is special when its name is either listed in
   :group 'frames)
 (make-obsolete-variable
  'special-display-function
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-buffer-names nil
   "List of names of buffers that should be displayed specially.
@@ -5781,7 +5779,7 @@ See also `special-display-regexps'."
   :group 'frames)
 (make-obsolete-variable
  'special-display-buffer-names
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 ;;;###autoload
 (put 'special-display-buffer-names 'risky-local-variable t)
@@ -5852,7 +5850,7 @@ See also `special-display-buffer-names'."
   :group 'frames)
 (make-obsolete-variable
  'special-display-regexps
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME gets a special frame.
@@ -5904,7 +5902,7 @@ affected by this variable."
   :group 'frames)
 (make-obsolete-variable
  'pop-up-frame-alist
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frame-function
   (lambda () (make-frame pop-up-frame-alist))
@@ -5916,7 +5914,7 @@ frame.  The default value calls `make-frame' with the argument
   :group 'frames)
 (make-obsolete-variable
  'pop-up-frame-function
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frames 'unset ; nil
   "Whether `display-buffer' should make a separate frame.
@@ -5936,7 +5934,7 @@ Any other non-nil value means always make a separate frame."
   :group 'frames)
 (make-obsolete-variable
  'pop-up-frames
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom display-buffer-reuse-frames 'unset ; nil
   "Set and non-nil means `display-buffer' should reuse frames.
@@ -5948,7 +5946,7 @@ that frame."
   :group 'frames)
 (make-obsolete-variable
  'display-buffer-reuse-frames
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-windows 'unset ; t
   "Set and non-nil means `display-buffer' should make a new window."
@@ -5957,7 +5955,7 @@ that frame."
   :group 'windows)
 (make-obsolete-variable
  'pop-up-windows
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-window-preferred-function 'split-window-sensibly
   "Function called by `display-buffer' to split a window.
@@ -5986,7 +5984,7 @@ not want to split the selected window."
   :group 'windows)
 (make-obsolete-variable
  'split-window-preferred-function
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-height-threshold 80
   "Minimum height for splitting a window to display a buffer.
@@ -6000,7 +5998,7 @@ split it vertically disregarding the value of this variable."
   :group 'windows)
 (make-obsolete-variable
  'split-height-threshold
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-width-threshold 160
   "Minimum width for splitting a window to display a buffer.
@@ -6012,7 +6010,7 @@ is nil, `display-buffer' cannot split windows horizontally."
   :group 'windows)
 (make-obsolete-variable
  'split-width-threshold
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom even-window-heights t
   "If non-nil `display-buffer' will try to even window heights.
@@ -6024,7 +6022,7 @@ window that appears above or below the selected window."
   :group 'windows)
 (make-obsolete-variable
  'even-window-heights
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defvar display-buffer-mark-dedicated 'unset ; nil
   "Set and non-nil means `display-buffer' marks the windows it creates as dedicated.
@@ -6032,7 +6030,7 @@ The actual non-nil value of this variable will be copied to the
 `window-dedicated-p' flag.")
 (make-obsolete-variable
  'display-buffer-mark-dedicated
- "use `display-buffer-alist' or 2nd arg of `display-buffer' instead." "24.1")
+ "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun window-splittable-p (window &optional horizontal)
   "Return non-nil if `split-window-sensibly' may split WINDOW.