diff options
| author | Glenn Morris | 2010-10-24 17:48:26 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-24 17:48:26 -0700 |
| commit | 6a5c21753e3918152ca4abc50291d6e628e89f6c (patch) | |
| tree | e334dec719c1dd3781835302e9aae2e5f728dc3e /src | |
| parent | 5793a7bc13ed1d92dd70f48d952ca651c48a0fd3 (diff) | |
| download | emacs-6a5c21753e3918152ca4abc50291d6e628e89f6c.tar.gz emacs-6a5c21753e3918152ca4abc50291d6e628e89f6c.zip | |
Move ns-win.el's rather wacky menu adjustments to menu-bar.el.
* lisp/term/ns-win.el: Do not require easymenu.
(menu-bar-edit-menu) <copy, paste, paste-from-menu, separator-undo>:
<spell>: Move adjustments to menu-bar.el.
* lisp/menu-bar.el (menu-bar-edit-menu) <copy, paste, paste-from-menu>:
<separator-undo, spell>: Move ns-win's adjustments here.
* lisp/loadup.el [ns]: Do not load easymenu.
* src/Makefile.in (SOME_MACHINE_LISP): Remove easymenu.elc.
* lib-src/makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a0aa4a21ff1..529677cb5f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-10-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (SOME_MACHINE_LISP): Remove easymenu.elc. | ||
| 4 | |||
| 1 | 2010-10-24 Glenn Morris <rgm@gnu.org> | 5 | 2010-10-24 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * w32fns.c (Fx_synchronize, Fx_change_window_property) | 7 | * w32fns.c (Fx_synchronize, Fx_change_window_property) |
diff --git a/src/Makefile.in b/src/Makefile.in index 87abc9ea734..4d45248b396 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -590,8 +590,7 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ | |||
| 590 | ../lisp/term/common-win.elc \ | 590 | ../lisp/term/common-win.elc \ |
| 591 | ../lisp/term/x-win.elc \ | 591 | ../lisp/term/x-win.elc \ |
| 592 | ../lisp/term/pc-win.elc ../lisp/term/internal.elc \ | 592 | ../lisp/term/pc-win.elc ../lisp/term/internal.elc \ |
| 593 | ../lisp/term/ns-win.elc ../lisp/term/w32-win.elc \ | 593 | ../lisp/term/ns-win.elc ../lisp/term/w32-win.elc |
| 594 | ../lisp/emacs-lisp/easymenu.elc | ||
| 595 | 594 | ||
| 596 | ## Construct full set of libraries to be linked. | 595 | ## Construct full set of libraries to be linked. |
| 597 | ## Note that SunOS needs -lm to come before -lc; otherwise, you get | 596 | ## Note that SunOS needs -lm to come before -lc; otherwise, you get |