[Emacs-diffs] Changes to emacs/lisp/frame.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/frame.el
diff -c emacs/lisp/frame.el:1.203.2.1 emacs/lisp/frame.el:1.203.2.2
*** emacs/lisp/frame.el:1.203.2.1       Fri Apr 16 12:49:50 2004
--- emacs/lisp/frame.el Mon Jun 28 07:28:40 2004
***************
*** 1,6 ****
  ;;; frame.el --- multi-frame management independent of window systems
  
! ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; frame.el --- multi-frame management independent of window systems
  
! ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003, 2004
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 113,119 ****
  Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args."
    (if (and args (symbolp (car args)))
        (apply (car args) buffer (cdr args))
!     (let ((window (get-buffer-window buffer t)))
        (or
         ;; If we have a window already, make it visible.
         (when window
--- 113,119 ----
  Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args."
    (if (and args (symbolp (car args)))
        (apply (car args) buffer (cdr args))
!     (let ((window (get-buffer-window buffer 0)))
        (or
         ;; If we have a window already, make it visible.
         (when window
***************
*** 131,136 ****
--- 131,137 ----
         (let* ((pop-up-frames nil) (pop-up-windows t)
                special-display-regexps special-display-buffer-names
                (window (display-buffer buffer)))
+          ;; Only do it if this is a new window:
           ;; (set-window-dedicated-p window t)
           window))
         ;; If no window yet, make one in a new frame.
***************
*** 552,558 ****
    (interactive)
    (select-window (next-window (selected-window)
                              (> (minibuffer-depth) 0)
!                             t))
    (select-frame-set-input-focus (selected-frame)))
  
  (defun previous-multiframe-window ()
--- 553,559 ----
    (interactive)
    (select-window (next-window (selected-window)
                              (> (minibuffer-depth) 0)
!                             0))
    (select-frame-set-input-focus (selected-frame)))
  
  (defun previous-multiframe-window ()
***************
*** 560,566 ****
    (interactive)
    (select-window (previous-window (selected-window)
                                  (> (minibuffer-depth) 0)
!                                 t))
    (select-frame-set-input-focus (selected-frame)))
  
  (defun make-frame-on-display (display &optional parameters)
--- 561,567 ----
    (interactive)
    (select-window (previous-window (selected-window)
                                  (> (minibuffer-depth) 0)
!                                 0))
    (select-frame-set-input-focus (selected-frame)))
  
  (defun make-frame-on-display (display &optional parameters)
***************
*** 1190,1198 ****
  (make-variable-buffer-local 'show-trailing-whitespace)
  
  (defcustom show-trailing-whitespace nil
!   "*Non-nil means highlight trailing whitespace in face `trailing-whitespace'.
! 
! Setting this variable makes it local to the current buffer."
    :tag "Highlight trailing whitespace."
    :type 'boolean
    :group 'font-lock)
--- 1191,1198 ----
  (make-variable-buffer-local 'show-trailing-whitespace)
  
  (defcustom show-trailing-whitespace nil
!   "*Non-nil means highlight trailing whitespace.
! This is done in the face `trailing-whitespace'."
    :tag "Highlight trailing whitespace."
    :type 'boolean
    :group 'font-lock)
***************
*** 1296,1301 ****
--- 1296,1302 ----
  command starts, by installing a pre-command hook."
    (when (null blink-cursor-timer)
      (add-hook 'pre-command-hook 'blink-cursor-end)
+     (internal-show-cursor nil nil)
      (setq blink-cursor-timer
          (run-with-timer blink-cursor-interval blink-cursor-interval
                          'blink-cursor-timer-function))))