[Emacs-diffs] emacs/lisp ChangeLog term/ns-win.el

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/24 10:27:05

Modified files:
        lisp           : ChangeLog 
        lisp/term      : ns-win.el 

Log message:
        * term/ns-win.el (menu-bar-select-frame): Drop this 
override.\n\t(menu-bar-update-frames): Update call to menu-bar-select-frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15164&r2=1.15165
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15164
retrieving revision 1.15165
diff -u -b -r1.15164 -r1.15165
--- ChangeLog   24 Jan 2009 03:35:50 -0000      1.15164
+++ ChangeLog   24 Jan 2009 10:27:03 -0000      1.15165
@@ -1,3 +1,8 @@
+2009-01-24  Adrian Robert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/rmail.el (rmail-insert-inbox-text): Revert replacement of

Index: term/ns-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- term/ns-win.el      23 Jan 2009 13:00:21 -0000      1.32
+++ term/ns-win.el      24 Jan 2009 10:27:05 -0000      1.33
@@ -622,14 +622,6 @@
 (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 @@
       (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 @@
         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)))