Merged from emacs@sv.gnu.org

author Karoly Lorentey <lorentey@elte.hu>

Tue, 27 Jun 2006 15:06:36 +0000 (15:06 +0000)

committer Karoly Lorentey <lorentey@elte.hu>

Tue, 27 Jun 2006 15:06:36 +0000 (15:06 +0000)
author Karoly Lorentey <lorentey@elte.hu>
Tue, 27 Jun 2006 15:06:36 +0000 (15:06 +0000)
committer Karoly Lorentey <lorentey@elte.hu>
Tue, 27 Jun 2006 15:06:36 +0000 (15:06 +0000)
diff --cc lisp/bindings.el
Simple merge
diff --cc lisp/cus-start.el
Simple merge
diff --cc lisp/ediff-wind.el
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/term/mac-win.el
Simple merge
diff --cc lisp/term/xterm.el

index 9b3ebfe342013ee6cc45775eb0fd5106371c5305,0da804a56afa5b53ccf85bf51dac1b60962d3864..becf418e4e042796e109d114c5e208dedb240d30
--- 1/lisp/term/xterm.el
--- 2/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@@ -27,172 -27,6 +27,173 @@@
   
   ;;; Code:
   
- ;; These keys will be available xterm starting probably from
- ;; version 214.
+ +(defvar xterm-function-map (make-sparse-keymap)
+ +  "Function key map overrides for xterm.")
+ +
+ +;; xterm from X.org 6.8.2 uses these key definitions.
+ +(define-key xterm-function-map "\eOP" [f1])
+ +(define-key xterm-function-map "\eOQ" [f2])
+ +(define-key xterm-function-map "\eOR" [f3])
+ +(define-key xterm-function-map "\eOS" [f4])
+ +(define-key xterm-function-map "\e[15~" [f5])
+ +(define-key xterm-function-map "\e[17~" [f6])
+ +(define-key xterm-function-map "\e[18~" [f7])
+ +(define-key xterm-function-map "\e[19~" [f8])
+ +(define-key xterm-function-map "\e[20~" [f9])
+ +(define-key xterm-function-map "\e[21~" [f10])
+ +(define-key xterm-function-map "\e[23~" [f11])
+ +(define-key xterm-function-map "\e[24~" [f12])
+ +
+ +(define-key xterm-function-map "\eO2P" [S-f1])
+ +(define-key xterm-function-map "\eO2Q" [S-f2])
+ +(define-key xterm-function-map "\eO2R" [S-f3])
+ +(define-key xterm-function-map "\eO2S" [S-f4])
+ +(define-key xterm-function-map "\e[15;2~" [S-f5])
+ +(define-key xterm-function-map "\e[17;2~" [S-f6])
+ +(define-key xterm-function-map "\e[18;2~" [S-f7])
+ +(define-key xterm-function-map "\e[19;2~" [S-f8])
+ +(define-key xterm-function-map "\e[20;2~" [S-f9])
+ +(define-key xterm-function-map "\e[21;2~" [S-f10])
+ +(define-key xterm-function-map "\e[23;2~" [S-f11])
+ +(define-key xterm-function-map "\e[24;2~" [S-f12])
+ +
+ +(define-key xterm-function-map "\eO5P" [C-f1])
+ +(define-key xterm-function-map "\eO5Q" [C-f2])
+ +(define-key xterm-function-map "\eO5R" [C-f3])
+ +(define-key xterm-function-map "\eO5S" [C-f4])
+ +(define-key xterm-function-map "\e[15;5~" [C-f5])
+ +(define-key xterm-function-map "\e[17;5~" [C-f6])
+ +(define-key xterm-function-map "\e[18;5~" [C-f7])
+ +(define-key xterm-function-map "\e[19;5~" [C-f8])
+ +(define-key xterm-function-map "\e[20;5~" [C-f9])
+ +(define-key xterm-function-map "\e[21;5~" [C-f10])
+ +(define-key xterm-function-map "\e[23;5~" [C-f11])
+ +(define-key xterm-function-map "\e[24;5~" [C-f12])
+ +
+ +(define-key xterm-function-map "\eO6P" [C-S-f1])
+ +(define-key xterm-function-map "\eO6Q" [C-S-f2])
+ +(define-key xterm-function-map "\eO6R" [C-S-f3])
+ +(define-key xterm-function-map "\eO6S" [C-S-f4])
+ +(define-key xterm-function-map "\e[15;6~" [C-S-f5])
+ +(define-key xterm-function-map "\e[17;6~" [C-S-f6])
+ +(define-key xterm-function-map "\e[18;6~" [C-S-f7])
+ +(define-key xterm-function-map "\e[19;6~" [C-S-f8])
+ +(define-key xterm-function-map "\e[20;6~" [C-S-f9])
+ +(define-key xterm-function-map "\e[21;6~" [C-S-f10])
+ +(define-key xterm-function-map "\e[23;6~" [C-S-f11])
+ +(define-key xterm-function-map "\e[24;6~" [C-S-f12])
+ +
+ +(define-key xterm-function-map "\eO3P" [A-f1])
+ +(define-key xterm-function-map "\eO3Q" [A-f2])
+ +(define-key xterm-function-map "\eO3R" [A-f3])
+ +(define-key xterm-function-map "\eO3S" [A-f4])
+ +(define-key xterm-function-map "\e[15;3~" [A-f5])
+ +(define-key xterm-function-map "\e[17;3~" [A-f6])
+ +(define-key xterm-function-map "\e[18;3~" [A-f7])
+ +(define-key xterm-function-map "\e[19;3~" [A-f8])
+ +(define-key xterm-function-map "\e[20;3~" [A-f9])
+ +(define-key xterm-function-map "\e[21;3~" [A-f10])
+ +(define-key xterm-function-map "\e[23;3~" [A-f11])
+ +(define-key xterm-function-map "\e[24;3~" [A-f12])
+ +
+ +(define-key xterm-function-map "\eOA" [up])
+ +(define-key xterm-function-map "\eOB" [down])
+ +(define-key xterm-function-map "\eOC" [right])
+ +(define-key xterm-function-map "\eOD" [left])
+ +(define-key xterm-function-map "\eOF" [end])
+ +(define-key xterm-function-map "\eOH" [home])
+ +
+ +(define-key xterm-function-map "\e[1;2A" [S-up])
+ +(define-key xterm-function-map "\e[1;2B" [S-down])
+ +(define-key xterm-function-map "\e[1;2C" [S-right])
+ +(define-key xterm-function-map "\e[1;2D" [S-left])
+ +(define-key xterm-function-map "\e[1;2F" [S-end])
+ +(define-key xterm-function-map "\e[1;2H" [S-home])
+ +
+ +(define-key xterm-function-map "\e[1;5A" [C-up])
+ +(define-key xterm-function-map "\e[1;5B" [C-down])
+ +(define-key xterm-function-map "\e[1;5C" [C-right])
+ +(define-key xterm-function-map "\e[1;5D" [C-left])
+ +(define-key xterm-function-map "\e[1;5F" [C-end])
+ +(define-key xterm-function-map "\e[1;5H" [C-home])
+ +
+ +(define-key xterm-function-map "\e[1;6A" [C-S-up])
+ +(define-key xterm-function-map "\e[1;6B" [C-S-down])
+ +(define-key xterm-function-map "\e[1;6C" [C-S-right])
+ +(define-key xterm-function-map "\e[1;6D" [C-S-left])
+ +(define-key xterm-function-map "\e[1;6F" [C-S-end])
+ +(define-key xterm-function-map "\e[1;6H" [C-S-home])
+ +
+ +(define-key xterm-function-map "\e[1;3A" [A-up])
+ +(define-key xterm-function-map "\e[1;3B" [A-down])
+ +(define-key xterm-function-map "\e[1;3C" [A-right])
+ +(define-key xterm-function-map "\e[1;3D" [A-left])
+ +(define-key xterm-function-map "\e[1;3F" [A-end])
+ +(define-key xterm-function-map "\e[1;3H" [A-home])
+ +
+ +(define-key xterm-function-map "\e[2~" [insert])
+ +(define-key xterm-function-map "\e[3~" [delete])
+ +(define-key xterm-function-map "\e[5~" [prior])
+ +(define-key xterm-function-map "\e[6~" [next])
+ +
+ +(define-key xterm-function-map "\e[2;2~" [S-insert])
+ +(define-key xterm-function-map "\e[3;2~" [S-delete])
+ +(define-key xterm-function-map "\e[5;2~" [S-prior])
+ +(define-key xterm-function-map "\e[6;2~" [S-next])
+ +
+ +(define-key xterm-function-map "\e[2;5~" [C-insert])
+ +(define-key xterm-function-map "\e[3;5~" [C-delete])
+ +(define-key xterm-function-map "\e[5;5~" [C-prior])
+ +(define-key xterm-function-map "\e[6;5~" [C-next])
+ +
+ +(define-key xterm-function-map "\e[2;6~" [C-S-insert])
+ +(define-key xterm-function-map "\e[3;6~" [C-S-delete])
+ +(define-key xterm-function-map "\e[5;6~" [C-S-prior])
+ +(define-key xterm-function-map "\e[6;6~" [C-S-next])
+ +
+ +(define-key xterm-function-map "\e[2;3~" [A-insert])
+ +(define-key xterm-function-map "\e[3;3~" [A-delete])
+ +(define-key xterm-function-map "\e[5;3~" [A-prior])
+ +(define-key xterm-function-map "\e[6;3~" [A-next])
+ +
+ +(define-key xterm-function-map "\e[4~" [select])
+ +(define-key xterm-function-map "\e[29~" [print])
+ +
++;; These keys are available in xterm starting from version 214
++;; if the modifyOtherKeys resource is set.
+ +(define-key xterm-function-map "\e[27;5;9~"  [(control ?\t)])
++(define-key xterm-function-map "\e[27;5;13~" [C-return])
+ +(define-key xterm-function-map "\e[27;5;44~" [(control ?\,)])
+ +(define-key xterm-function-map "\e[27;5;46~" [(control ?\.)])
+ +(define-key xterm-function-map "\e[27;5;47~" [(control ?\/)])
+ +(define-key xterm-function-map "\e[27;5;92~" [(control ?\\)])
+ +
+ +;; Other versions of xterm might emit these.
+ +(define-key xterm-function-map "\e[A" [up])
+ +(define-key xterm-function-map "\e[B" [down])
+ +(define-key xterm-function-map "\e[C" [right])
+ +(define-key xterm-function-map "\e[D" [left])
+ +(define-key xterm-function-map "\e[1~" [home])
+ +
+ +(define-key xterm-function-map "\e[1;2A" [S-up])
+ +(define-key xterm-function-map "\e[1;2B" [S-down])
+ +(define-key xterm-function-map "\e[1;2C" [S-right])
+ +(define-key xterm-function-map "\e[1;2D" [S-left])
+ +(define-key xterm-function-map "\e[1;2F" [S-end])
+ +(define-key xterm-function-map "\e[1;2H" [S-home])
+ +
+ +(define-key xterm-function-map "\e[1;5A" [C-up])
+ +(define-key xterm-function-map "\e[1;5B" [C-down])
+ +(define-key xterm-function-map "\e[1;5C" [C-right])
+ +(define-key xterm-function-map "\e[1;5D" [C-left])
+ +(define-key xterm-function-map "\e[1;5F" [C-end])
+ +(define-key xterm-function-map "\e[1;5H" [C-home])
+ +
+ +(define-key xterm-function-map "\e[11~" [f1])
+ +(define-key xterm-function-map "\e[12~" [f2])
+ +(define-key xterm-function-map "\e[13~" [f3])
+ +(define-key xterm-function-map "\e[14~" [f4])
+ +
   (defun terminal-init-xterm ()
     "Terminal initialization function for xterm."
     ;; rxvt terminals sometimes set the TERM variable to "xterm", but
diff --cc man/emacs.texi
Simple merge
diff --cc src/.gdbinit
Simple merge
diff --cc src/callproc.c
Simple merge
diff --cc src/dispextern.h
Simple merge
diff --cc src/dispnew.c

index c346e94a103f495df27ac9b11060b820331fb7de,df92fc395d2ed402d7b8969d1394f600844904f9..4f63bfa8578bb585c8ceeba8d9cba461e1b18ce3
--- 1/src/dispnew.c
--- 2/src/dispnew.c
+++ b/src/dispnew.c
@@@ -4108,10 -4168,11 +4169,12 @@@ update_window (w, force_p
   {
     struct glyph_matrix *desired_matrix = w->desired_matrix;
     int paused_p;
+ #if !PERIODIC_PREEMPTION_CHECKING
     int preempt_count = baud_rate / 2400 + 1;
+ #endif
     extern int input_pending;
     extern Lisp_Object do_mouse_tracking;
+ +  struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
   #if GLYPH_DEBUG
     /* Check that W's frame doesn't have glyph matrices.  */
     xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
@@@ -5156,9 -5236,10 +5242,10 @@@ update_frame_1 (f, force_p, inhibit_id_
         pause = 1;
         goto do_pause;
       }
+ #endif
   
     /* If we cannot insert/delete lines, it's no use trying it.  */
- -  if (!line_ins_del_ok)
+ +  if (!FRAME_LINE_INS_DEL_OK (f))
       inhibit_id_p = 1;
   
     /* See if any of the desired lines are enabled; don't compute for
diff --cc src/fileio.c
Simple merge
diff --cc src/lread.c
Simple merge
diff --cc src/macfns.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xterm.c
Simple merge
diff --cc src/xterm.h
Simple merge
author	Karoly Lorentey <lorentey@elte.hu>
	Tue, 27 Jun 2006 15:06:36 +0000 (15:06 +0000)
committer	Karoly Lorentey <lorentey@elte.hu>
	Tue, 27 Jun 2006 15:06:36 +0000 (15:06 +0000)
		1	2
lisp/bindings.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/cus-start.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/ediff-wind.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/term/mac-win.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/term/xterm.el	patch \|	diff1 \|	diff2 \|	blob \| history
man/emacs.texi	patch \|	diff1 \|	diff2 \|	blob \| history
src/.gdbinit	patch \|	diff1 \|	diff2 \|	blob \| history
src/callproc.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lread.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/macfns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/macterm.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.h	patch \|	diff1 \|	diff2 \|	blob \| history