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 /lib-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 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 9e43da96c5c..a4b0ff37d07 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-10-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc. | ||
| 4 | |||
| 1 | 2010-10-23 Glenn Morris <rgm@gnu.org> | 5 | 2010-10-23 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * digest-doc.c, sorted-doc.c: Remove files. | 7 | * digest-doc.c, sorted-doc.c: Remove files. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index dc6406d7025..5591f0edbed 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -189,7 +189,6 @@ OTHER_PLATFORM_SUPPORT = \ | |||
| 189 | $(lispsource)term/pc-win.elc \ | 189 | $(lispsource)term/pc-win.elc \ |
| 190 | $(lispsource)x-dnd.elc \ | 190 | $(lispsource)x-dnd.elc \ |
| 191 | $(lispsource)term/x-win.elc \ | 191 | $(lispsource)term/x-win.elc \ |
| 192 | $(lispsource)emacs-lisp/easymenu.elc \ | ||
| 193 | $(lispsource)term/ns-win.elc | 192 | $(lispsource)term/ns-win.elc |
| 194 | 193 | ||
| 195 | 194 | ||