diff options
| author | Juanma Barranquero <[email protected]> | 2010-10-12 01:57:49 +0200 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2010-10-12 01:57:49 +0200 |
| commit | 4c14013dbec3a2f130a38e61e885f1e8cc6c325b (patch) | |
| tree | b74121c8de587c217f0d146752e8893d0874aae7 /lisp/cus-start.el | |
| parent | f0b7f5a884806112b6a938b9c31607ea005431d3 (diff) | |
| parent | a2e35ef5d52031e0fa184d1863fe7cb7043ef637 (diff) | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 161de5e78e..a43525f824 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -272,6 +272,14 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const control) (const meta) (const alt) (const hyper) (const super)) "23.1") + (ns-right-alternate-modifier + ns + (choice (const :tag "No modifier (work as alternate/option)" none) + (const :tag "Use the value of ns-alternate-modifier" + left) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "23.3") (ns-function-modifier ns (choice (const :tag "No modifier (work as function)" none) |