From: Miles Bader Date: Thu, 24 May 2007 22:23:08 +0000 (+0000) Subject: Merge from emacs--unicode--0 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63ae848241357586e9cfb5050e86d8fb6a0c5901;p=emacs.git Merge from emacs--unicode--0 Patches applied: * emacs--devo--0 (patch 726-770) - Update from CVS - Merge from emacs--rel--22 - Merge from gnus--rel--5.10 - Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change. * emacs--rel--22 (patch 6-25) - Update from CVS - Update from CVS: src/xterm.c (XTread_socket): Revert last change. * emacs--unicode--0 (patch 203-209) - Update from CVS - Merge from emacs--devo--0 - Update from CVS: src/syntax.c (skip_syntaxes): Synch with the trunk. - Move NEWS entries for unicode branch into etc/NEWS.unicode * gnus--rel--5.10 (patch 218-223) - Merge from emacs--devo--0, emacs--rel--22 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-62 --- 63ae848241357586e9cfb5050e86d8fb6a0c5901 diff --cc admin/nt/README-ftp-server index 67d8e7919ce,15cc7db9d90..53a06c3d80a --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@@ -49,35 -51,14 +51,14 @@@ + Primary precompiled distribution, including lisp source: - emacs-21.3-fullbin-i386.tar.gz - - + Minimal precompiled distribution, which excludes lisp source: - - emacs-21.3-bin-i386.tar.gz - - You can download emacs-21.3-lisp.tar.gz to get the lisp source, if - you later decide you want it - it is useful for understanding how - packages work, and how they can best be setup or customized. - + emacs-22.1-bin-i386.zip - NB: If you just want to run Emacs, get the distribution above. + NB. If you just want to run Emacs, get one of the distributions above. + + Bare executables, useful if you want to get the complete source + release, but can't compile Emacs yourself: - + Bare executables, only useful if you want to get the complete source - release below, but can't compile Emacs yourself: - - emacs-21.3-barebin-i386.tar.gz (requires emacs-21.3-src.tar.gz) - - + Undumped executable, only needed for rebuilding Emacs after changing - certain core lisp files: - - emacs-21.3-undumped-i386.tar.gz - - + Optional package providing the Library of Emacs Input Methods for - typing non-ascii characters, notably Chinese, Japanese and Korean, - but also including European and other character sets: - - emacs-21.3-leim.tar.gz + emacs-22.1-barebin-i386.zip (requires ../emacs-22.1.tar.gz) + The complete official source for Emacs: @@@ -132,6 -108,16 +108,11 @@@ You may be prompted to rename or overwrite directories when using djtarnt: simply type return to continue (this is harmless). - The precompiled binaries can be unpacked using unzip.exe from info-zip.org - if you do not already have other tools to do this. - - % unzip some.zip - + The precompiled binaries can be unpacked using unzip.exe from info-zip.org + if you do not already have other tools to do this. + + % unzip some.zip + Once you have unpacked a precompiled distribution of Emacs, it should have the following subdirectories: diff --cc configure index 0033c11be06,bbc3a5a18b6..aaac6cf9b0c --- a/configure +++ b/configure @@@ -1350,8 -1349,9 +1349,9 @@@ Optional Packages --with-png use -lpng for displaying PNG images --with-freetype use -lfreetype for local fonts support --with-xft use -lXft for anti aliased fonts + --with-gpm use -lgpm for mouse support on a GNU/Linux console --with-gtk use GTK (same as --with-x-toolkit=gtk) - --with-pkg-config-prog Path to pkg-config to use for finding GTK + --with-pkg-config-prog Path to pkg-config to use for finding GTK and Xft --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars --without-xim don't use X11 XIM