diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-01 17:18:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-01 17:18:22 -0700 |
| commit | 953e106ac84587e765244995687b088969b5f6e1 (patch) | |
| tree | a4d54b892e04b9123bc79ecffd69310f5807399e /lisp/cus-start.el | |
| parent | eed652d649d28e9dafdb01f9c7425d7d28899e0d (diff) | |
| parent | afca0e759015ebc753b0c343ac45ac476dd31e9d (diff) | |
| download | emacs-953e106ac84587e765244995687b088969b5f6e1.tar.gz | |
Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index ee09c433f33..b446a00bb8f 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -366,7 +366,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) @@ -380,7 +380,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) @@ -402,7 +402,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 |