mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Merge.

Browse source
This commit is contained in:
Alan Mackenzie 2011-10-28 15:18:00 +00:00
commit e376ea4f73
8 changed files with 65 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-28 Eli Zaretskii <eliz@gnu.org>
* nt/README-ftp-server: Mention UNICOWS.DLL as prerequisite for
running Emacs on Windows 9X.
2011-09-26 Chong Yidong <cyd@stupidchicken.com>
* admin.el (set-version): Fix regexps for config.nt and

34
admin/nt/README-ftp-server
View file

@ -4,9 +4,9 @@ See the end of the file for license conditions.
Precompiled Distributions of
Emacs for Windows
Version 23.1
Version 24.1
July 29, 2009
January 1, 2011
This directory contains precompiled distributions for GNU Emacs on
Windows (versions before Windows 95 and NT4 are not supported).
@ -14,7 +14,7 @@ See the end of the file for license conditions.
Free Software Foundation; the precompiled distributions are provided
here for convenience since the majority of Windows users are not
accustomed to compiling programs themselves. Corresponding source
can be found in the parent directory in emacs-23.1.tar.gz.
can be found in the parent directory in emacs-24.1.tar.gz.
If you have access to the World Wide Web, I would recommend pointing
your favorite web browser to the following document (if you haven't
@ -26,9 +26,9 @@ See the end of the file for license conditions.
If you want to redistribute any of the precompiled distributions of
Emacs, be careful to check the implications of the GPL. For instance,
if you put the emacs-23.1-bin-i386.tar.gz file from this directory on
if you put the emacs-24.1-bin-i386.tar.gz file from this directory on
an Internet site, you must arrange to distribute the source files of
the SAME version (i.e. ../emacs-23.1.tar.gz).
the SAME version (i.e. ../emacs-24.1.tar.gz).
Making a link to our copy of the source is NOT sufficient, since we
might upgrade to a new version while you are still distributing the
@ -37,8 +37,8 @@ See the end of the file for license conditions.
* Files in this directory
+ emacs-23.1-bin-i386.zip
Windows binaries of Emacs-23.1, with all lisp code and documentation
+ emacs-24.1-bin-i386.zip
Windows binaries of Emacs-24.1, with all lisp code and documentation
included.
Download this file if you want a single installation package, and
@ -49,8 +49,8 @@ See the end of the file for license conditions.
If you need the C source code at a later date, it will be safe to
unpack the source distribution on top of this installation.
+ emacs-23.1-barebin-i386.zip
Windows binaries of Emacs-23.1, without lisp code or documentation.
+ emacs-24.1-barebin-i386.zip
Windows binaries of Emacs-24.1, without lisp code or documentation.
Download this file if you already have the source distribution.
@ -62,12 +62,18 @@ See the end of the file for license conditions.
a basic Makefile for compiling with mingw32 and a .def file for
generating a DLL with the appropriate exports in addition to the
source code to provide the subset of functionality Emacs uses from
libXpm. This corresponds to the libXpm.dll in emacs-23.1-bin-i386.zip
and emacs-23.1-barebin-i386.zip.
libXpm. This corresponds to the libXpm.dll in emacs-24.1-bin-i386.zip
and emacs-24.1-barebin-i386.zip.
* Prerequisites for running Emacs on Windows 9X
Using Emacs in GUI mode on Windows 95/98/Me requires the UNICOWS.DLL
dynamic library, which provides MSLU, the Microsoft Unicode Layer
for Windows 9X. You can freely download it from the Microsoft site.
* Image support
Emacs 23.1 contains support for images, however for most image formats
Emacs 24.1 contains support for images, however for most image formats
supporting libraries are required. This distribution has been tested
with the libraries that are distributed with GTK for Windows, and the
libraries found at http://gnuwin32.sourceforge.net/. The following image
@ -119,7 +125,7 @@ See the end of the file for license conditions.
Distributions for non-x86 platforms are no longer supplied. Older
platforms supported by Windows NT no longer seem to be in demand,
and Emacs is yet to be ported to 64 bit Windows platforms. If you
are willing to help port Emacs 23 to 64 bit versions of Windows,
are willing to help port Emacs 24 to 64 bit versions of Windows,
your contribution will be welcome on the emacs-devel mailing list.
* Unpacking distributions
@ -227,7 +233,7 @@ See the end of the file for license conditions.
This document serves as an FAQ and a source for further information
about the Windows port and related software packages. Note that as
most of the information in that FAQ is for earlier versions, so some
information may not be relevant to Emacs-23.1.
information may not be relevant to Emacs-24.1.
In addition to the FAQ, there is a mailing list for discussing issues
related to the Windows port of Emacs. For information about the

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2011-10-28 Deniz Dogan <deniz@dogan.se>
* net/rcirc.el (rcirc-mode): Use hard newlines.
2011-10-28 Alan Mackenzie <acm@muc.de>
Amend to indent and fontify macros "which include their own semicolon"

1
lisp/net/rcirc.el
View file

@ -979,6 +979,7 @@ This number is independent of the number of lines in the buffer.")
(set (make-local-variable 'rcirc-recent-quit-alist) nil)
(set (make-local-variable 'rcirc-current-line) 0)
(use-hard-newlines t)
(set (make-local-variable 'rcirc-short-buffer-name) nil)
(set (make-local-variable 'rcirc-urls) nil)

5
nt/ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-28 Eli Zaretskii <eliz@gnu.org>
* README.W32: Mention UNICOWS.DLL as prerequisite for running
Emacs on Windows 9X.
2011-10-25 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (dist): Don't put the top-level INSTALL into the

21
nt/README.W32
View file

@ -50,6 +50,17 @@ See the end of the file for license conditions.
directly from a CD or USB flash drive without copying or installing
anything on the machine itself.
* Prerequisites for Windows 9X
To run Emacs on Windows 9X (Windows 95/98/Me), you will need to have
the Microsoft Layer for Unicode (MSLU) installed. It can be
downloaded from the Microsoft site, and comes in a form of a single
dynamic library called UNICOWS.DLL. If this library is not
accessible to Emacs, it will pop up a dialog saying that it cannot
find the library, and will refuse to start up a GUI session.
(However, it is still possible to use Emacs in text mode, even
without UNICOWS.DLL, by invoking it as "emacs -nw", see below.)
* Starting Emacs
To run Emacs, simply select Emacs from the Start Menu, or invoke
@ -75,7 +86,9 @@ See the end of the file for license conditions.
it will pop up a command prompt window if run directly from Explorer.
+ runemacs.exe - A wrapper for running Emacs as a GUI application
without popping up a command prompt window.
without popping up a command prompt window. If you create a
desktop shortcut for invoking Emacs, make it point to this
executable, not to emacs.exe.
+ emacsclient.exe - A command-line client program that can
communicate with a running Emacs process. See the `Emacs Server'
@ -98,7 +111,7 @@ See the end of the file for license conditions.
+ ddeclient.exe - A tool for interacting with DDE servers.
+ hexl.exe - A tool for converting files to hex dumps. See the
+ hexl.exe - A tool for producing hex dumps of binary files. See the
`Editing Binary Files' node of the Emacs manual.
+ movemail.exe - A helper application for safely moving mail from
@ -194,6 +207,10 @@ See the end of the file for license conditions.
truncated to abbrevli.elc, your distribution has been corrupted
while unpacking and Emacs will not start.
* On Windows 9X, make sure you have the UNICOWS.DLL library either
in the same directory where you have emacs.exe or in the
directory where system-wide DLLs are kept.
If you believe you have unpacked the distributions correctly and are
still encountering problems, see the section on Further Information
below.

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2011-10-28 Chong Yidong <cyd@gnu.org>
* xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
2011-10-28 Dan Nicolaescu <dann@ics.uci.edu>
* window.c (make_window): Initialize phys_cursor_on_p.

11
src/xdisp.c
View file

@ -26835,11 +26835,14 @@ note_mouse_highlight (struct frame *f, int x, int y)
/* Which window is that in? */
window = window_from_coordinates (f, x, y, &part, 1);
/* If we were displaying active text in another window, clear that.
Also clear if we move out of text area in same window. */
/* If displaying active text in another window, clear that. */
if (! EQ (window, hlinfo->mouse_face_window)
|| (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE
&& !NILP (hlinfo->mouse_face_window)))
/* Also clear if we move out of text area in same window. */
|| (!NILP (hlinfo->mouse_face_window)
&& !NILP (window)
&& part != ON_TEXT
&& part != ON_MODE_LINE
&& part != ON_HEADER_LINE))
clear_mouse_face (hlinfo);
/* Not on a window -> return. */