diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 51ce071ba74..7cdd43bd195 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,12 @@ +2014-05-28 Glenn Morris + + * cus-start.el: Fix some :version numbers. + 2014-05-27 Stefan Monnier - * simple.el (deactivate-mark): Set mark-active to nil even if deactivation - is done via setting transient-mark-mode to nil, since one is - buffer-local and the other is global. + * simple.el (deactivate-mark): Set mark-active to nil even if + deactivation is done via setting transient-mark-mode to nil, + since one is buffer-local and the other is global. * emacs-lisp/byte-opt.el (byte-optimize-binary-predicate): Don't assume there can't be more than 2 arguments (bug#17584). diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 5a35cb01911..2da67112bd3 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -364,7 +364,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of left) (const control) (const meta) (const alt) (const hyper) - (const super)) "24.0") + (const super)) "24.1") (ns-command-modifier ns (choice (const :tag "No modifier" nil) @@ -378,7 +378,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of left) (const control) (const meta) (const alt) (const hyper) - (const super)) "24.0") + (const super)) "24.1") (ns-alternate-modifier ns (choice (const :tag "No modifier (work as alternate/option)" none) @@ -400,7 +400,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const alt) (const hyper) (const super)) "23.1") (ns-antialias-text ns boolean "23.1") - (ns-auto-hide-menu-bar ns boolean "24.0") + (ns-auto-hide-menu-bar ns boolean "24.1") (ns-use-native-fullscreen ns boolean "24.4") (ns-use-srgb-colorspace ns boolean "24.4") ;; process.c