Mercurial > emacs
changeset 101427:1b7286db7263
* term/ns-win.el (menu-bar-select-frame): Drop this override.\n\t(menu-bar-update-frames): Update call to menu-bar-select-frame.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Sat, 24 Jan 2009 10:27:03 +0000 |
| parents | ad60c4496a16 |
| children | d7b1d5b3b2c1 |
| files | lisp/ChangeLog lisp/term/ns-win.el |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 24 03:35:50 2009 +0000 +++ b/lisp/ChangeLog Sat Jan 24 10:27:03 2009 +0000 @@ -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
--- a/lisp/term/ns-win.el Sat Jan 24 03:35:50 2009 +0000 +++ b/lisp/term/ns-win.el Sat Jan 24 10:27:03 2009 +0000 @@ -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)))