diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 17:21:24 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 17:21:24 +0000 |
| commit | d221466a1d7c57c1b84b8e2568ba02b821d7c08a (patch) | |
| tree | 6b158a63fc1943ba85c8bae67f92a0d0f847ac15 /lisp/gnus | |
| parent | ff4865017b88dbf5a7c39ac36920dc13d2fa5797 (diff) | |
| download | emacs-d221466a1d7c57c1b84b8e2568ba02b821d7c08a.tar.gz | |
(ns-focus-frame): Remove declaration.
(gnus-select-frame-set-input-focus): Undo previous change. Treat ns
like x.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 3c6ca2f102c..2db00ad59c2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2008-07-21 Dan Nicolaescu <dann@ics.uci.edu> + + * gnus-util.el (ns-focus-frame): Remove declaration. + (gnus-select-frame-set-input-focus): Undo previous change. Treat ns + like x. + 2008-07-21 Thien-Thi Nguyen <ttn@gnuvola.org> * rfc2104.el (rfc2104-zero): Delete defconst. diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index f2fe10c2fc8..129e1e641de 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1593,7 +1593,6 @@ CHOICE is a list of the choice char and help message at IDX." (declare-function x-focus-frame "xfns.c" (frame)) (declare-function w32-focus-frame "../term/w32-win" (frame)) -(declare-function ns-focus-frame "nsfns.m" (frame)) (defun gnus-select-frame-set-input-focus (frame) "Select FRAME, raise it, and set input focus, if possible." @@ -1610,12 +1609,10 @@ CHOICE is a list of the choice char and help message at IDX." (t (raise-frame frame) (select-frame frame) - (cond ((memq window-system '(x mac)) + (cond ((memq window-system '(x ns mac)) (x-focus-frame frame)) ((eq window-system 'w32) - (w32-focus-frame frame)) - ((eq window-system 'ns) - (ns-focus-frame frame))) + (w32-focus-frame frame))) (when focus-follows-mouse (set-mouse-position frame (1- (frame-width frame)) 0))))) |