summaryrefslogtreecommitdiff
path: root/lisp/textmodes/two-column.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-11-03 03:11:24 +0000
committerKarl Heuer <kwzh@gnu.org>1995-11-03 03:11:24 +0000
commit30a7d33c2b33eb65ed5a571d1a4ba861153898bc (patch)
tree022d51bff67ea35fd1d4acfe669508af52ec1bcc /lisp/textmodes/two-column.el
parentb4b1e78a9a3d7c6d46030b9772c03ff8c73b9c90 (diff)
downloademacs-30a7d33c2b33eb65ed5a571d1a4ba861153898bc.tar.gz
(minor-mode-map-alist): Use substitute-key-definition
to find the appropriate bindings for window enlarge/shrink. (2C-shrink-window-horizontally, 2C-enlarge-window-horizontally): Renamed from shrink-window-horizontally, enlarge-window-horizontally to avoid redefining the standard functions.
Diffstat (limited to 'lisp/textmodes/two-column.el')
-rw-r--r--lisp/textmodes/two-column.el16
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 9b27b5ee37c..9452a4f9e54 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -150,8 +150,6 @@
(define-key map [f2] '2C-two-columns)
(define-key map "b" '2C-associate-buffer)
(define-key map "s" '2C-split)
- (define-key map "{" 'shrink-window-horizontally)
- (define-key map "}" 'enlarge-window-horizontally)
map)
"Keymap for commands for setting up two-column mode.")
@@ -178,6 +176,8 @@
(define-key map "o" '2C-associated-buffer)
(define-key map "\^m" '2C-newline)
(define-key map "|" '2C-toggle-autoscroll)
+ (define-key map "{" '2C-shrink-window-horizontally)
+ (define-key map "}" '2C-enlarge-window-horizontally)
map)
"Keymap for commands for use in two-column mode.")
@@ -187,6 +187,12 @@
(let ((map (make-sparse-keymap)))
(substitute-key-definition '2C-command 2C-minor-mode-map
map (current-global-map))
+ (substitute-key-definition 'enlarge-window-horizontally
+ '2C-enlarge-window-horizontally
+ map (current-global-map))
+ (substitute-key-definition 'shrink-window-horizontally
+ '2C-shrink-window-horizontally
+ map (current-global-map))
map))
minor-mode-map-alist))
@@ -597,7 +603,7 @@ When autoscrolling is turned on, this also realigns the two buffers."
-(defun enlarge-window-horizontally (arg)
+(defun 2C-enlarge-window-horizontally (arg)
"Make current window ARG columns wider."
(interactive "p")
(enlarge-window arg t)
@@ -606,10 +612,10 @@ When autoscrolling is turned on, this also realigns the two buffers."
(set-buffer (2C-other))
(setq 2C-window-width (- 2C-window-width arg))))
-(defun shrink-window-horizontally (arg)
+(defun 2C-shrink-window-horizontally (arg)
"Make current window ARG columns narrower."
(interactive "p")
- (enlarge-window-horizontally (- arg)))
+ (2C-enlarge-window-horizontally (- arg)))