summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/AT386.el2
-rw-r--r--lisp/term/bobcat.el2
-rw-r--r--lisp/term/cygwin.el2
-rw-r--r--lisp/term/internal.el2
-rw-r--r--lisp/term/iris-ansi.el2
-rw-r--r--lisp/term/linux.el2
-rw-r--r--lisp/term/lk201.el2
-rw-r--r--lisp/term/news.el2
-rw-r--r--lisp/term/ns-win.el57
-rw-r--r--lisp/term/pc-win.el1
-rw-r--r--lisp/term/rxvt.el2
-rw-r--r--lisp/term/screen.el2
-rw-r--r--lisp/term/sun.el2
-rw-r--r--lisp/term/tty-colors.el2
-rw-r--r--lisp/term/tvi970.el2
-rw-r--r--lisp/term/vt100.el2
-rw-r--r--lisp/term/vt200.el2
-rw-r--r--lisp/term/w32-win.el1
-rw-r--r--lisp/term/w32console.el2
-rw-r--r--lisp/term/wyse50.el2
-rw-r--r--lisp/term/x-win.el1
-rw-r--r--lisp/term/xterm.el13
22 files changed, 55 insertions, 52 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 7f46f61c4fb..63469422f76 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -54,4 +54,6 @@
(define-key local-function-key-map [ALT] [27])
))
+(provide 'term/AT386)
+
;;; AT386.el ends here
diff --git a/lisp/term/bobcat.el b/lisp/term/bobcat.el
index f26dc6b9198..a32da6ae8f2 100644
--- a/lisp/term/bobcat.el
+++ b/lisp/term/bobcat.el
@@ -5,4 +5,6 @@
(keyboard-translate ?\177 ?\^h)
(keyboard-translate ?\^h ?\177))
+(provide 'term/bobcat)
+
;;; bobcat.el ends here
diff --git a/lisp/term/cygwin.el b/lisp/term/cygwin.el
index d69433a77c2..edc64b4404d 100644
--- a/lisp/term/cygwin.el
+++ b/lisp/term/cygwin.el
@@ -6,4 +6,6 @@
"Terminal initialization function for cygwin."
(tty-no-underline))
+(provide 'term/cygwin)
+
;;; cygwin.el ends here
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 6f4866b0795..0fd0f2237a5 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -606,4 +606,6 @@ list. You can (and should) also run it if and when the value of
(run-hooks 'dos-codepage-setup-hook)
))
+(provide 'term/internal)
+
;;; internal.el ends here
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index ee638643949..5217e42e319 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -327,4 +327,6 @@
(set-keymap-parent m (keymap-parent input-decode-map))
(set-keymap-parent input-decode-map m)))
+(provide 'term/iris-ansi)
+
;;; iris-ansi.el ends here
diff --git a/lisp/term/linux.el b/lisp/term/linux.el
index 00bcdfdf542..70730dc5844 100644
--- a/lisp/term/linux.el
+++ b/lisp/term/linux.el
@@ -19,4 +19,6 @@
;; The arg only matters in that it is not t or nil.
(set-input-meta-mode 'iso-latin-1))
+(provide 'term/linux)
+
;;; linux.el ends here
diff --git a/lisp/term/lk201.el b/lisp/term/lk201.el
index 6b9e1301003..aab4110b3ae 100644
--- a/lisp/term/lk201.el
+++ b/lisp/term/lk201.el
@@ -80,4 +80,6 @@
(set-keymap-parent m (keymap-parent input-decode-map))
(set-keymap-parent input-decode-map m)))
+(provide 'term/lk201)
+
;;; lk201.el ends here
diff --git a/lisp/term/news.el b/lisp/term/news.el
index b66e000e3b5..5738644259e 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -66,4 +66,6 @@
(define-key news-fkey-prefix "x" [kp-8])
))
+(provide 'term/news)
+
;;; news.el ends here
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index e737131d5bf..5080ed0a8f7 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -717,60 +717,12 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
;;;; Scrollbar handling.
-(global-set-key [vertical-scroll-bar down-mouse-1] 'ns-handle-scroll-bar-event)
+(global-set-key [vertical-scroll-bar down-mouse-1] 'scroll-bar-toolkit-scroll)
+(global-set-key [horizontal-scroll-bar down-mouse-1] 'scroll-bar-toolkit-horizontal-scroll)
(global-unset-key [vertical-scroll-bar mouse-1])
(global-unset-key [vertical-scroll-bar drag-mouse-1])
-
-(declare-function scroll-bar-scale "scroll-bar" (num-denom whole))
-
-(defun ns-scroll-bar-move (event)
- "Scroll the frame according to a Nextstep scroller event."
- (interactive "e")
- (let* ((pos (event-end event))
- (window (nth 0 pos))
- (scale (nth 2 pos)))
- (with-current-buffer (window-buffer window)
- (cond
- ((eq (car scale) (cdr scale))
- (goto-char (point-max)))
- ((= (car scale) 0)
- (goto-char (point-min)))
- (t
- (goto-char (+ (point-min) 1
- (scroll-bar-scale scale (- (point-max) (point-min)))))))
- (beginning-of-line)
- (set-window-start window (point))
- (vertical-motion (/ (window-height window) 2) window))))
-
-(defun ns-handle-scroll-bar-event (event)
- "Handle scroll bar EVENT to emulate Nextstep style scrolling."
- (interactive "e")
- (let* ((position (event-start event))
- (bar-part (nth 4 position))
- (window (nth 0 position))
- (old-window (selected-window)))
- (cond
- ((eq bar-part 'ratio)
- (ns-scroll-bar-move event))
- ((eq bar-part 'handle)
- (if (eq window (selected-window))
- (track-mouse (ns-scroll-bar-move event))
- ;; track-mouse faster for selected window, slower for unselected.
- (ns-scroll-bar-move event)))
- (t
- (select-window window)
- (cond
- ((eq bar-part 'up)
- (goto-char (window-start window))
- (scroll-down 1))
- ((eq bar-part 'above-handle)
- (scroll-down))
- ((eq bar-part 'below-handle)
- (scroll-up))
- ((eq bar-part 'down)
- (goto-char (window-start window))
- (scroll-up 1)))
- (select-window old-window)))))
+(global-unset-key [horizontal-scroll-bar mouse-1])
+(global-unset-key [horizontal-scroll-bar drag-mouse-1])
;;;; Color support.
@@ -936,5 +888,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
(ns-get-selection selection-symbol target-type))
(provide 'ns-win)
+(provide 'term/ns-win)
;;; ns-win.el ends here
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 8ca98c6ec91..031768cec2c 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -388,5 +388,6 @@ Errors out because it is not supposed to be called, ever."
;; ---------------------------------------------------------------------------
(provide 'pc-win)
+(provide 'term/pc-win)
;;; pc-win.el ends here
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index da26d30a682..97d38659115 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -195,4 +195,6 @@
(* (apply '+ (car (cddr (nth 15 rxvt-standard-colors)))) 0.6))
(set-terminal-parameter nil 'background-mode 'dark)))))
+(provide 'term/rxvt)
+
;;; rxvt.el ends here
diff --git a/lisp/term/screen.el b/lisp/term/screen.el
index 7f681154d6e..d7ee7705208 100644
--- a/lisp/term/screen.el
+++ b/lisp/term/screen.el
@@ -20,4 +20,6 @@ it runs, which can change when the screen session is moved to another tty."
(let ((xterm-extra-capabilities xterm-screen-extra-capabilities))
(tty-run-terminal-initialization (selected-frame) "xterm")))
+(provide 'term/screen)
+
;; screen.el ends here
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 7fb8e7ed984..ef40db16d18 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -158,4 +158,6 @@
(eval (car hooks))
(setq hooks (cdr hooks))))))
+(provide 'term/sun)
+
;;; sun.el ends here
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 3ea26b8c3ed..a88695062b8 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -1035,4 +1035,6 @@ A color is considered gray if the 3 components of its RGB value are equal."
(setq colors (cdr colors)))
count))
+(provide 'term/tty-colors)
+
;;; tty-colors.el ends here
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 1173f9f15dd..e25a3b616d5 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -115,4 +115,6 @@ which the keypad's keys act as ordinary digits."
(send-string-to-terminal
(if (terminal-parameter nil 'tvi970-keypad-numeric) "\e=" "\e>")))
+(provide 'term/tvi970)
+
;;; tvi970.el ends here
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index fb46c996491..16a1c271b9a 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -48,4 +48,6 @@ switch to 132-column mode if ARG is omitted or nil."
(send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l"))
(set-frame-width terminal-frame (if vt100-wide-mode 132 80)))
+(provide 'term/vt100)
+
;;; vt100.el ends here
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 550266816e0..dde2e229068 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -7,4 +7,6 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
+(provide 'term/vt200)
+
;;; vt200.el ends here
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 134e3106b7b..8f3eaa2c029 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -463,5 +463,6 @@ That includes all Windows systems except for 9X/Me."
(getenv "SystemRoot"))
(provide 'w32-win)
+(provide 'term/w32-win)
;;; w32-win.el ends here
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index b7e0a22bfb3..bf1550f7c33 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -93,4 +93,6 @@
(tty-set-up-initial-frame-faces)
(run-hooks 'terminal-init-w32-hook))
+(provide 'term/w32console)
+
;;; w32console.el ends here
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 3e1055a1873..d3ee7a0a6cb 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -155,4 +155,6 @@ M-r M-x move-to-window-line, Funct up-arrow or down-arrow are similar"
;; (nth 1 key-definition)))
(fset 'enable-arrow-keys nil))
+(provide 'term/wyse50)
+
;;; wyse50.el ends here
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 59df14da93a..c8e79e3f81a 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1487,5 +1487,6 @@ This uses `icon-map-list' to map icon file names to stock icon names."
(global-set-key [XF86WakeUp] 'ignore)
(provide 'x-win)
+(provide 'term/x-win)
;;; x-win.el ends here
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index e06423ccfdd..5a38ebe8e45 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -590,6 +590,19 @@ string bytes that can be copied is 3/4 of this value."
(define-key map [f59] [M-f11])
(define-key map [f60] [M-f12])
+ (define-key map [f61] [M-S-f1])
+ (define-key map [f62] [M-S-f2])
+ (define-key map [f63] [M-S-f3])
+ (define-key map [f64] [M-S-f4])
+ (define-key map [f65] [M-S-f5])
+ (define-key map [f66] [M-S-f6])
+ (define-key map [f67] [M-S-f7])
+ (define-key map [f68] [M-S-f8])
+ (define-key map [f69] [M-S-f9])
+ (define-key map [f70] [M-S-f10])
+ (define-key map [f71] [M-S-f11])
+ (define-key map [f72] [M-S-f12])
+
map)
"Keymap of possible alternative meanings for some keys.")