aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-03-21 09:47:13 +0000
committerEli Zaretskii2009-03-21 09:47:13 +0000
commit77346ecd110293a29a2b4ca1136b5e01e78e6e29 (patch)
tree521dadf27bd701da5d0e34c0d35dfae0cbe9e583
parent58a5649865a27adee3e77e19dd2fa791793415e8 (diff)
downloademacs-77346ecd110293a29a2b4ca1136b5e01e78e6e29.tar.gz
emacs-77346ecd110293a29a2b4ca1136b5e01e78e6e29.zip
(all): Fix last change.
-rw-r--r--lisp/cus-start.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index e2ed7585c3f..8f444799ae7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -249,25 +249,25 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
249 ;; msdos.c 249 ;; msdos.c
250 (dos-unsupported-char-glyph display integer) 250 (dos-unsupported-char-glyph display integer)
251 ;; nsterm.m 251 ;; nsterm.m
252 (ns-control-modifier 252 (ns-control-modifier
253 nextstep 253 nextstep
254 (choice (const :tag "No modifier" nil) 254 (choice (const :tag "No modifier" nil)
255 (const control) (const meta) 255 (const control) (const meta)
256 (const alt) (const hyper) 256 (const alt) (const hyper)
257 (const super)) "23.1") 257 (const super)) "23.1")
258 (ns-command-modifier 258 (ns-command-modifier
259 nextstep 259 nextstep
260 (choice (const :tag "No modifier" nil) 260 (choice (const :tag "No modifier" nil)
261 (const control) (const meta) 261 (const control) (const meta)
262 (const alt) (const hyper) 262 (const alt) (const hyper)
263 (const super)) "23.1") 263 (const super)) "23.1")
264 (ns-alternate-modifier 264 (ns-alternate-modifier
265 nextstep 265 nextstep
266 (choice (const :tag "No modifier (work as alternate/option)" none) 266 (choice (const :tag "No modifier (work as alternate/option)" none)
267 (const control) (const meta) 267 (const control) (const meta)
268 (const alt) (const hyper) 268 (const alt) (const hyper)
269 (const super)) "23.1") 269 (const super)) "23.1")
270 (ns-function-modifier 270 (ns-function-modifier
271 nextstep 271 nextstep
272 (choice (const :tag "No modifier (work as function)" none) 272 (choice (const :tag "No modifier (work as function)" none)
273 (const control) (const meta) 273 (const control) (const meta)
@@ -381,6 +381,8 @@ since it could result in memory overflow and make Emacs crash."
381 (eq system-type 'ms-dos)) 381 (eq system-type 'ms-dos))
382 ((string-match "\\`w32-" (symbol-name symbol)) 382 ((string-match "\\`w32-" (symbol-name symbol))
383 (eq system-type 'windows-nt)) 383 (eq system-type 'windows-nt))
384 ((string-match "\\`ns-" (symbol-name symbol))
385 (featurep 'ns))
384 ((string-match "\\`x-.*gtk" (symbol-name symbol)) 386 ((string-match "\\`x-.*gtk" (symbol-name symbol))
385 (featurep 'gtk)) 387 (featurep 'gtk))
386 ((string-match "\\`x-" (symbol-name symbol)) 388 ((string-match "\\`x-" (symbol-name symbol))