* menu-bar.el (cua-enable-cua-keys): Declare for the byte-compiler.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12d6d3a0faad1b1e1cd4920595a1c416bc203e00..93541e4f31ebb1b7f996029ed78dc39ac3dd77e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-23  Juanma Barranquero  <lekktu@gmail.com>
+
+       * menu-bar.el (cua-enable-cua-keys): Declare for the byte-compiler.
+
 2009-10-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * term/tty-colors.el (msdos-color-values): Remove declaration, unused.
@@ -44,7 +48,7 @@
        Add edebug declaration.
        (pcomplete-show-completions): Remove unused var `curbuf'.
        (pcomplete-do-complete, pcomplete-stub):
-       Don't assume `completions' is a list of strings any more.
+       Don't assume `completions' is a list of strings any more.
 
 2009-10-22  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -336,7 +340,7 @@
 
 2009-10-17  Ulrich Mueller  <ulm@gentoo.org>
 
-       * play/doctor.el (doctor-adverbp): Exclude some nouns.  (Bug#4565)
+       * play/doctor.el (doctor-adverbp): Exclude some nouns.  (Bug#4565)
 
 2009-10-16  Glenn Morris  <rgm@gnu.org>
 
@@ -1691,7 +1695,7 @@
 
 2009-09-27  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
-       * term/ns-win.el: Don't set the region face background. (Bug#4381)
+       * term/ns-win.el: Don't set the region face background.  (Bug#4381)
 
        * faces.el: Default light-background background for region face to
        ns_selection_color under NS.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index fda31c0f42a31580f95f42710875b43c82a41b7e..2dd7bb95a125adf7e2202b4116e52fec73eaef5b 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -61,6 +61,9 @@
 ;; This is referenced by some code below; it is defined in uniquify.el
 (defvar uniquify-buffer-name-style)
 
+;; From emulation/cua-base.el; used below
+(defvar cua-enable-cua-keys)
+
 \f
 ;; The "File" menu items
 (define-key menu-bar-file-menu [exit-emacs]