Merge changes from emacs-23 branch.

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 161de5e78ec63e89572cce6354bde880d79aa0e2..a43525f8245c4398684539685d77bd2541fcacde 100644 (file)
--- 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)