summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/AT386.el6
-rw-r--r--lisp/term/iris-ansi.el2
-rw-r--r--lisp/term/mac-win.el38
-rw-r--r--lisp/term/news.el2
-rw-r--r--lisp/term/sun-mouse.el2
-rw-r--r--lisp/term/sup-mouse.el2
-rw-r--r--lisp/term/tvi970.el6
-rw-r--r--lisp/term/vt100.el2
-rw-r--r--lisp/term/w32-win.el2
-rw-r--r--lisp/term/wyse50.el2
-rw-r--r--lisp/term/x-win.el4
-rw-r--r--lisp/term/xterm.el2
12 files changed, 41 insertions, 29 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 2f98e7bf6fa..702a4b614e2 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -1,11 +1,11 @@
;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*-
+;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
+
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Keywords: terminals
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
-;; 2006 Free Software Foundation, Inc.
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index 0f1d426d23c..56a387b1848 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -1,6 +1,6 @@
;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 43454a5ca77..f35bf080bbb 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,6 +1,6 @@
;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Andrew Choi <akochoi@mac.com>
@@ -82,7 +82,6 @@
(defvar mac-service-selection)
(defvar mac-system-script-code)
(defvar mac-apple-event-map)
-(defvar mac-atsu-font-table)
(defvar mac-font-panel-mode)
(defvar mac-ts-active-input-overlay)
(defvar x-invocation-args)
@@ -1791,7 +1790,8 @@ With numeric ARG, display the font panel if and only if ARG is positive."
(let* ((ae (mac-event-ae event))
(fm-font-size (mac-ae-number ae "fmsz"))
(atsu-font-id (mac-ae-number ae "auid"))
- (attribute-values (gethash atsu-font-id mac-atsu-font-table)))
+ (attribute-values (and atsu-font-id
+ (mac-atsu-font-face-attributes atsu-font-id))))
(if fm-font-size
(setq attribute-values
`(:height ,(* 10 fm-font-size) ,@attribute-values)))
@@ -1964,6 +1964,22 @@ the echo area or in a buffer where the cursor is not displayed."
(mac-split-string-by-property-change string)
""))
+(defun mac-keyboard-translate-char (ch)
+ (if (and (char-valid-p ch)
+ (or (char-table-p keyboard-translate-table)
+ (and (or (stringp keyboard-translate-table)
+ (vectorp keyboard-translate-table))
+ (> (length keyboard-translate-table) ch))))
+ (or (aref keyboard-translate-table ch) ch)
+ ch))
+
+(defun mac-unread-string (string)
+ ;; Unread characters and insert them in a keyboard macro being
+ ;; defined.
+ (apply 'isearch-unread
+ (mapcar 'mac-keyboard-translate-char
+ (mac-replace-untranslated-utf-8-chars string))))
+
(defun mac-ts-update-active-input-area (event)
"Update Mac TSM active input area according to EVENT.
The confirmed text is converted to Emacs input events and pushed
@@ -2042,11 +2058,7 @@ either in the current buffer or in the echo area."
(point) (point) (current-buffer))
(overlay-put mac-ts-active-input-overlay 'before-string
active-input-string))
- ;; Unread confirmed characters and insert them in a keyboard
- ;; macro being defined.
- (apply 'isearch-unread
- (append (mac-replace-untranslated-utf-8-chars
- (funcall decode-fun confirmed coding)) '())))
+ (mac-unread-string (funcall decode-fun confirmed coding)))
;; The event is successfully processed. Sync the sequence number.
(setq mac-ts-update-active-input-area-seqno (1+ seqno))))
@@ -2059,11 +2071,7 @@ either in the current buffer or in the echo area."
(coding (or (cdr (assq (car script-language)
mac-script-code-coding-systems))
'mac-roman)))
- ;; Unread characters and insert them in a keyboard macro being
- ;; defined.
- (apply 'isearch-unread
- (append (mac-replace-untranslated-utf-8-chars
- (mac-utxt-to-string text coding)) '()))))
+ (mac-unread-string (mac-utxt-to-string text coding))))
;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea
(define-key mac-apple-event-map [text-input update-active-input-area]
@@ -2459,7 +2467,7 @@ It returns a name of the created fontset."
;; Setup the default fontset.
(setup-default-fontset)
-(cond ((x-list-fonts "*-iso10646-1")
+(cond ((x-list-fonts "*-iso10646-1" nil nil 1)
;; Use ATSUI (if available) for the following charsets.
(dolist
(charset '(latin-iso8859-1
@@ -2471,7 +2479,7 @@ It returns a name of the created fontset."
vietnamese-viscii-lower vietnamese-viscii-upper
lao ethiopic tibetan))
(set-fontset-font nil charset '(nil . "iso10646-1"))))
- ((null (x-list-fonts "*-iso8859-1"))
+ ((null (x-list-fonts "*-iso8859-1" nil nil 1))
;; Add Mac-encoding fonts unless ETL fonts are installed.
(fontset-add-mac-fonts "fontset-default")))
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 6fd39d24210..d39c79838f6 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,6 +1,6 @@
;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
-;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
+;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index 329e88e23e6..76b2ef6d3d9 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -1,6 +1,6 @@
;;; sun-mouse.el --- mouse handling for Sun windows
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: Jeff Peck
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index ebc406d8206..a038fbd3d9d 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -1,6 +1,6 @@
;;; sup-mouse.el --- supdup mouse support for lisp machines
-;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
+;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Wolfgang Rupprecht
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index bcdf886638f..083c99f6241 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -1,11 +1,11 @@
;;; tvi970.el --- terminal support for the Televideo 970
+;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
+
;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
;; Keywords: terminals
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
-;; 2006 Free Software Foundation, Inc.
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index be1d8ee1a49..38509a471cd 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -1,6 +1,6 @@
;;; vt100.el --- define VT100 function key sequences in function-key-map
-;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
+;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 7aaa59d40ec..5ba5b270327 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,6 +1,6 @@
;;; w32-win.el --- parse switches controlling interface with W32 window system
-;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Gallo
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 07de09914d1..6723ee8a07c 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,6 +1,6 @@
;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
-;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004,
+;; Copyright (C) 1989, 1993, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index afb749f625e..32959f38e34 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2470,6 +2470,10 @@ order until succeed.")
;; generated from FONT.
(create-fontset-from-ascii-font font resolved-name "startup"))))
+ ;; Set scroll bar mode to right if set by X resources. Default is left.
+ (if (equal (x-get-resource "verticalScrollBars" "ScrollBars") "right")
+ (customize-set-variable 'scroll-bar-mode 'right))
+
;; Apply a geometry resource to the initial frame. Put it at the end
;; of the alist, so that anything specified on the command line takes
;; precedence.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index fd21c77bbf9..f72c4d205d1 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,6 @@
;;; xterm.el --- define function key sequences and standard colors for xterm
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: FSF
View Lorry Controller Status