* term/ns-win.el (menu-bar-select-frame): Drop this override.\n\t(menu-bar-update...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 301ee053d0fb437e170abe88ce8a315a7c34cd14..a8f7c56e3ddba44f7049072ae1012847d1cdbf91 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-24  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+       * term/ns-win.el (menu-bar-select-frame): Drop this override.
+       (menu-bar-update-frames): Update call to menu-bar-select-frame.
+
 2009-01-24  Glenn Morris  <rgm@gnu.org>
 
        * mail/rmail.el (rmail-insert-inbox-text): Revert replacement of

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index c4ed8bc8737a5237835cc15412e52120dafbd5b8..6fa0a09dfab012a02d9d75253dd50dc433024233 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -622,14 +622,6 @@ this defaults to \"printenv\"."
 (define-key-after menu-bar-edit-menu [separator-undo] '("--") 'undo)
 (define-key-after menu-bar-edit-menu [spell] '("Spell" . ispell-menu-map) 'fill)
 
-
-;;;; Windows menu
-(defun menu-bar-select-frame (&optional frame)
-  (interactive)
-  (make-frame-visible last-command-event)
-  (raise-frame last-command-event)
-  (select-frame last-command-event))
-
 (defun menu-bar-update-frames ()
   ;; If user discards the Windows item, play along.
   (when (lookup-key (current-global-map) [menu-bar windows])
@@ -638,9 +630,11 @@ this defaults to \"printenv\"."
       (setcdr frames-menu
               (nconc
                (mapcar (lambda (frame)
-                         (list* frame
-                                (cdr (assq 'name (frame-parameters frame)))
-                                'menu-bar-select-frame))
+                        (list*
+                         (frame-parameter frame 'window-id)
+                         (frame-parameter frame 'name)
+                         `(lambda ()
+                            (interactive) (menu-bar-select-frame ,frame))))
                        frames)
                (cdr frames-menu)))
       (define-key frames-menu [separator-frames] '("--"))
@@ -846,7 +840,8 @@ See ns-insert-working-text."
         message-log-max)
     (setq ns-working-overlay-len (length ns-working-text))
     (setq msg (concat msg ns-working-text))
-    (put-text-property msglen (+ msglen ns-working-overlay-len) 'face 'ns-working-text-face msg)
+    (put-text-property msglen (+ msglen ns-working-overlay-len)
+                      'face 'ns-working-text-face msg)
     (message "%s" msg)
     (setq ns-working-overlay t)))