diff options
| author | Juanma Barranquero | 2009-10-23 08:20:11 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-10-23 08:20:11 +0000 |
| commit | 1becddbbb2c3430696d94f524dca3d966ff6a69b (patch) | |
| tree | dd23d511e07ac618b0a294db4a4c28300f0267f6 | |
| parent | e0fcce78c005ec5164f7165589159d6be52e81a7 (diff) | |
| download | emacs-1becddbbb2c3430696d94f524dca3d966ff6a69b.tar.gz emacs-1becddbbb2c3430696d94f524dca3d966ff6a69b.zip | |
* menu-bar.el (cua-enable-cua-keys): Declare for the byte-compiler.
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12d6d3a0faa..93541e4f31e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-10-23 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * menu-bar.el (cua-enable-cua-keys): Declare for the byte-compiler. | ||
| 4 | |||
| 1 | 2009-10-23 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2009-10-23 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * term/tty-colors.el (msdos-color-values): Remove declaration, unused. | 7 | * term/tty-colors.el (msdos-color-values): Remove declaration, unused. |
| @@ -44,7 +48,7 @@ | |||
| 44 | Add edebug declaration. | 48 | Add edebug declaration. |
| 45 | (pcomplete-show-completions): Remove unused var `curbuf'. | 49 | (pcomplete-show-completions): Remove unused var `curbuf'. |
| 46 | (pcomplete-do-complete, pcomplete-stub): | 50 | (pcomplete-do-complete, pcomplete-stub): |
| 47 | Don't assume `completions' is a list of strings any more. | 51 | Don't assume `completions' is a list of strings any more. |
| 48 | 52 | ||
| 49 | 2009-10-22 Juanma Barranquero <lekktu@gmail.com> | 53 | 2009-10-22 Juanma Barranquero <lekktu@gmail.com> |
| 50 | 54 | ||
| @@ -336,7 +340,7 @@ | |||
| 336 | 340 | ||
| 337 | 2009-10-17 Ulrich Mueller <ulm@gentoo.org> | 341 | 2009-10-17 Ulrich Mueller <ulm@gentoo.org> |
| 338 | 342 | ||
| 339 | * play/doctor.el (doctor-adverbp): Exclude some nouns. (Bug#4565) | 343 | * play/doctor.el (doctor-adverbp): Exclude some nouns. (Bug#4565) |
| 340 | 344 | ||
| 341 | 2009-10-16 Glenn Morris <rgm@gnu.org> | 345 | 2009-10-16 Glenn Morris <rgm@gnu.org> |
| 342 | 346 | ||
| @@ -1691,7 +1695,7 @@ | |||
| 1691 | 1695 | ||
| 1692 | 2009-09-27 Adrian Robert <Adrian.B.Robert@gmail.com> | 1696 | 2009-09-27 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 1693 | 1697 | ||
| 1694 | * term/ns-win.el: Don't set the region face background. (Bug#4381) | 1698 | * term/ns-win.el: Don't set the region face background. (Bug#4381) |
| 1695 | 1699 | ||
| 1696 | * faces.el: Default light-background background for region face to | 1700 | * faces.el: Default light-background background for region face to |
| 1697 | ns_selection_color under NS. | 1701 | ns_selection_color under NS. |
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index fda31c0f42a..2dd7bb95a12 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el | |||
| @@ -61,6 +61,9 @@ | |||
| 61 | ;; This is referenced by some code below; it is defined in uniquify.el | 61 | ;; This is referenced by some code below; it is defined in uniquify.el |
| 62 | (defvar uniquify-buffer-name-style) | 62 | (defvar uniquify-buffer-name-style) |
| 63 | 63 | ||
| 64 | ;; From emulation/cua-base.el; used below | ||
| 65 | (defvar cua-enable-cua-keys) | ||
| 66 | |||
| 64 | 67 | ||
| 65 | ;; The "File" menu items | 68 | ;; The "File" menu items |
| 66 | (define-key menu-bar-file-menu [exit-emacs] | 69 | (define-key menu-bar-file-menu [exit-emacs] |