From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: [multi-tty] xterm.el doesn't compile Date: Mon, 18 Jun 2007 06:59:07 -0700 Message-ID: <200706181359.l5IDx7xW002210@oogie-boogie.ics.uci.edu> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1182175356 28960 80.91.229.12 (18 Jun 2007 14:02:36 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 18 Jun 2007 14:02:36 +0000 (UTC) Cc: emacs-devel To: csant Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 18 16:02:30 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1I0HoM-0003xL-Gk for ged-emacs-devel@m.gmane.org; Mon, 18 Jun 2007 16:02:30 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I0HoL-0002ck-Iu for ged-emacs-devel@m.gmane.org; Mon, 18 Jun 2007 10:02:29 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I0HoH-0002as-9H for emacs-devel@gnu.org; Mon, 18 Jun 2007 10:02:25 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I0HoF-0002ZC-Od for emacs-devel@gnu.org; Mon, 18 Jun 2007 10:02:24 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I0HoF-0002Z2-L6 for emacs-devel@gnu.org; Mon, 18 Jun 2007 10:02:23 -0400 Original-Received: from oogie-boogie.ics.uci.edu ([128.195.1.41]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1I0HoE-0003lN-Ui for emacs-devel@gnu.org; Mon, 18 Jun 2007 10:02:23 -0400 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id l5IDx7xW002210; Mon, 18 Jun 2007 06:59:07 -0700 (PDT) In-Reply-To: (csant@csant.info's message of "Sun\, 17 Jun 2007 10\:18\:16 +0200") Original-Lines: 20 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-0.027, required 5, autolearn=disabled, ALL_TRUSTED -1.44, INFO_TLD 0.81, J_CHICKENPOX_52 0.60) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: Solaris 9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:73235 Archived-At: csant writes: > term/xterm.el does not compile after latest cvs up. Here is a patch: > > --- lisp/term/xterm.el.~1.38.4.3.~ 2007-06-17 00:55:49.000000000 +0200 > +++ lisp/term/xterm.el 2007-06-17 01:09:00.000000000 +0200 > @@ -693,7 +693,7 @@ > > (xterm-register-default-colors) > ;; This recomputes all the default faces given the colors we've > just set up. > - (tty-set-up-initial-frame-faces)) > + (tty-set-up-initial-frame-faces))) > > ;; Set up colors, for those versions of xterm that support it. > (defvar xterm-standard-colors You are seeing the results of an incorrect merge from trunk, all the key definitions were duplicated. I will fix it later today.