Merged in changes from CVS trunk. (Long time no see!) :-)

author Karoly Lorentey <lorentey@elte.hu>

Thu, 3 Feb 2005 23:28:36 +0000 (23:28 +0000)

committer Karoly Lorentey <lorentey@elte.hu>

Thu, 3 Feb 2005 23:28:36 +0000 (23:28 +0000)
author Karoly Lorentey <lorentey@elte.hu>
Thu, 3 Feb 2005 23:28:36 +0000 (23:28 +0000)
committer Karoly Lorentey <lorentey@elte.hu>
Thu, 3 Feb 2005 23:28:36 +0000 (23:28 +0000)
diff --cc etc/TODO
Simple merge
diff --cc lisp/bindings.el
Simple merge
diff --cc lisp/cus-face.el

index 0bd3387,33c8c99..1a8cce0
--- 1/lisp/cus-face.el
--- 2/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@@ -45,14 -44,13 +45,15 @@@
           (make-empty-face face)
           ;; Create frame-local faces
           (dolist (frame (frame-list))
- -          (face-spec-set face value frame)))
- -      ;; When making a face after frames already exist
- -      (if (memq window-system '(x w32))
- -          (make-face-x-resource-internal face))))
+ +          (face-spec-set face value frame)
+ +          (when (memq (window-system frame) '(x w32))
+ +            (setq have-window-system t)))
+ +        ;; When making a face after frames already exist
+ +        (if have-window-system
+ +            (make-face-x-resource-internal face)))))
       ;; Don't record SPEC until we see it causes no errors.
       (put face 'face-defface-spec spec)
+     (push (cons 'defface face) current-load-list)
       (when (and doc (null (face-documentation face)))
         (set-face-documentation face (purecopy doc)))
       (custom-handle-all-keywords face args 'custom-face)
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/international/mule-cmds.el
Simple merge
diff --cc lisp/progmodes/gdb-ui.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/.gdbinit
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/coding.c
Simple merge
diff --cc src/config.in
Simple merge
diff --cc src/dispextern.h
Simple merge
diff --cc src/dispnew.c

index 6813cda,b58d81f..3fef2af
--- 1/src/dispnew.c
--- 2/src/dispnew.c
+++ b/src/dispnew.c
@@@ -4064,13 -4063,13 +4064,13 @@@ update_window (w, force_p
     int preempt_count = baud_rate / 2400 + 1;
     extern int input_pending;
     extern Lisp_Object do_mouse_tracking;
++  struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
   #if GLYPH_DEBUG
     struct frame *f = XFRAME (WINDOW_FRAME (w));
- #endif
-   struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
   
     /* Check that W's frame doesn't have glyph matrices.  */
     xassert (FRAME_WINDOW_P (f));
- -  xassert (updating_frame != NULL);
+ #endif
   
     /* Check pending input the first time so that we can quickly return.  */
     if (redisplay_dont_pause)
diff --cc src/emacs.c
Simple merge
diff --cc src/fileio.c
Simple merge
diff --cc src/fringe.c
Simple merge
diff --cc src/indent.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/keymap.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/macterm.h
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/term.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfaces.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xmenu.c
Simple merge
diff --cc src/xselect.c
Simple merge
diff --cc src/xterm.c
Simple merge
diff --cc src/xterm.h
Simple merge
author	Karoly Lorentey <lorentey@elte.hu>
	Thu, 3 Feb 2005 23:28:36 +0000 (23:28 +0000)
committer	Karoly Lorentey <lorentey@elte.hu>
	Thu, 3 Feb 2005 23:28:36 +0000 (23:28 +0000)
		1	2
etc/TODO	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/bindings.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/cus-face.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/international/mule-cmds.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/gdb-ui.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/.gdbinit	patch \|	diff1 \|	diff2 \|	blob \| history
src/alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/coding.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/config.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fringe.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/indent.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/keymap.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/macterm.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/macterm.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/process.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/term.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/w32term.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfaces.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xmenu.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xselect.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.h	patch \|	diff1 \|	diff2 \|	blob \| history