comparison lisp/emulation/cua-base.el @ 83502:c1e013e3dc0e

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-173 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-174 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-175 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-176 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-177 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-178 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-179 Update from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-180 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-181 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-182 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-183 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-184 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-185 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-186 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-187 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/gnus--rel--5.10--patch-65 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-66 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-67 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-68 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-69 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-70 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-71 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-72 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-542
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 01 Apr 2006 13:24:42 +0000
parents b98066f4aa10 16f8a4a89f79
children 81f2d90dee68
comparison
equal deleted inserted replaced
83501:9490895469d4 83502:c1e013e3dc0e
366 present. The number specifies then number of characters before 366 present. The number specifies then number of characters before
367 and after the region marked by the rectangle to search." 367 and after the region marked by the rectangle to search."
368 :type '(choice (number :tag "Auto detect (limit)") 368 :type '(choice (number :tag "Auto detect (limit)")
369 (const :tag "Disabled" nil) 369 (const :tag "Disabled" nil)
370 (other :tag "Enabled" t)) 370 (other :tag "Enabled" t))
371 :group 'cua)
372
373 (defcustom cua-rectangle-mark-key [(control return)]
374 "Global key used to toggle the cua rectangle mark."
375 :set #'(lambda (symbol value)
376 (set symbol value)
377 (when (and (boundp 'cua--keymaps-initalized)
378 cua--keymaps-initalized)
379 (define-key cua-global-keymap value
380 'cua-set-rectangle-mark)
381 (when (boundp 'cua--rectangle-keymap)
382 (define-key cua--rectangle-keymap value
383 'cua-clear-rectangle-mark)
384 (define-key cua--region-keymap value
385 'cua-toggle-rectangle-mark))))
386 :type 'key-sequence
371 :group 'cua) 387 :group 'cua)
372 388
373 (defcustom cua-rectangle-modifier-key 'meta 389 (defcustom cua-rectangle-modifier-key 'meta
374 "*Modifier key used for rectangle commands bindings. 390 "*Modifier key used for rectangle commands bindings.
375 On non-window systems, always use the meta modifier. 391 On non-window systems, always use the meta modifier.
1273 (if (and cua-rectangle-modifier-key 1289 (if (and cua-rectangle-modifier-key
1274 (memq window-system '(x))) 1290 (memq window-system '(x)))
1275 cua-rectangle-modifier-key 1291 cua-rectangle-modifier-key
1276 'meta)) 1292 'meta))
1277 ;; C-return always toggles rectangle mark 1293 ;; C-return always toggles rectangle mark
1278 (define-key cua-global-keymap [(control return)] 'cua-set-rectangle-mark) 1294 (define-key cua-global-keymap cua-rectangle-mark-key 'cua-set-rectangle-mark)
1279 (unless (eq cua--rectangle-modifier-key 'meta) 1295 (unless (eq cua--rectangle-modifier-key 'meta)
1280 (cua--M/H-key cua-global-keymap ?\s 'cua-set-rectangle-mark) 1296 (cua--M/H-key cua-global-keymap ?\s 'cua-set-rectangle-mark)
1281 (define-key cua-global-keymap 1297 (define-key cua-global-keymap
1282 (vector (list cua--rectangle-modifier-key 'mouse-1)) 'cua-mouse-set-rectangle-mark)) 1298 (vector (list cua--rectangle-modifier-key 'mouse-1)) 'cua-mouse-set-rectangle-mark))
1283 1299
1399 Transient Mark mode while CUA mode is enabled does not work; if you 1415 Transient Mark mode while CUA mode is enabled does not work; if you
1400 only want to highlight the region when it is selected using a 1416 only want to highlight the region when it is selected using a
1401 shifted movement key, set `cua-highlight-region-shift-only'." 1417 shifted movement key, set `cua-highlight-region-shift-only'."
1402 :global t 1418 :global t
1403 :group 'cua 1419 :group 'cua
1404 :set-after '(cua-enable-modeline-indications cua-rectangle-modifier-key) 1420 :set-after '(cua-enable-modeline-indications
1421 cua-rectangle-mark-key cua-rectangle-modifier-key)
1405 :require 'cua-base 1422 :require 'cua-base
1406 :link '(emacs-commentary-link "cua-base.el") 1423 :link '(emacs-commentary-link "cua-base.el")
1407 (setq mark-even-if-inactive t) 1424 (setq mark-even-if-inactive t)
1408 (setq highlight-nonselected-windows nil) 1425 (setq highlight-nonselected-windows nil)
1409 1426