Re: 23.0.0; Nonsense in lisp/frame.el after cvs-update

[martin rudalics]

> The correct form surely is
>
>     (cond ((memq (window-system frame) '(x mac w32 ns))

There are some more inconsistencies here.  Does the attached patch DTRT?

*** frame.el.~1.257.~   Wed Oct 10 22:44:34 2007
--- frame.el    Sat Oct 13 14:12:26 2007
***************
*** 820,829 ****
      (select-frame frame)
      (raise-frame frame)
      ;; Ensure, if possible, that frame gets input focus.
!     (cond ((memq (window-system frame) '(x max w32))
!          (x-focus-frame frame)))
!     (cond (focus-follows-mouse
!          (set-mouse-position (selected-frame) (1- (frame-width)) 0))))
  
  (defun other-frame (arg)
    "Select the ARGth different visible frame on current display, and raise it.
--- 820,829 ----
      (select-frame frame)
      (raise-frame frame)
      ;; Ensure, if possible, that frame gets input focus.
!     (when (memq (window-system frame) '(x mac w32 ns))
!       (x-focus-frame frame))
!     (when focus-follows-mouse
!       (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
  
  (defun other-frame (arg)
    "Select the ARGth different visible frame on current display, and raise it.
***************
*** 905,912 ****
      (raise-frame frame)
      (select-frame frame)
      ;; Ensure, if possible, that frame gets input focus.
!     (cond ((memq (window-system frame) '(x w32))
!          (x-focus-frame frame)))
      (when focus-follows-mouse
        (set-mouse-position frame (1- (frame-width frame)) 0))))
  
--- 905,912 ----
      (raise-frame frame)
      (select-frame frame)
      ;; Ensure, if possible, that frame gets input focus.
!     (when (memq (window-system frame) '(x mac w32 ns))
!       (x-focus-frame frame))
      (when focus-follows-mouse
        (set-mouse-position frame (1- (frame-width frame)) 0))))
  
***************
*** 1455,1461 ****
    :init-value (not (or noninteractive
                       no-blinking-cursor
                       (eq system-type 'ms-dos)
!                      (not (memq window-system '(x w32 mac)))))
    :initialize 'custom-initialize-safe-default
    :group 'cursor
    :global t
--- 1455,1461 ----
    :init-value (not (or noninteractive
                       no-blinking-cursor
                       (eq system-type 'ms-dos)
!                      (not (memq window-system '(x w32 mac ns)))))
    :initialize 'custom-initialize-safe-default
    :group 'cursor
    :global t