procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs--rel--22

Browse source 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1032
This commit is contained in:
Miles Bader 2008-02-01 02:40:23 +00:00
commit 68e7476278
7 changed files with 111 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
admin/nt/README.W32
View file

@ -68,11 +68,56 @@ See the end of the file for license conditions.
(non-windowed) mode of operation is most useful if you have a telnet
server on your machine, allowing you to run Emacs remotely.
* EXE files included
Emacs comes with the following executable files in the bin directory.
+ emacs.exe - The main Emacs executable. As this is designed to run
as both a text-mode application (emacs -nw) and as a GUI application,
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.
+ emacsclient.exe - A command-line client program that can
communicate with a running Emacs process. See the `Emacs Server'
node of the Emacs manul.
+ emacsclientw.exe - A version of emacsclient that does not open
a command-line window.
+ addpm.exe - A basic installer that creates Start Menu icons for Emacs.
Running this is optional.
+ cmdproxy.exe - Used internally by Emacs to work around problems with
the native shells in various versions of Windows.
+ ctags.exe, etags.exe - Tools for generating tag files. See the
`Tags' node of the Emacs manual.
+ ebrowse.exe - A tool for generating C++ browse information. See the
`Ebrowse' manual.
+ ddeclient.exe - A tool for interacting with DDE servers.
+ hexl.exe - A tool for converting files to hex dumps. See the
`Editing Binary Files' node of the Emacs manual.
+ movemail.exe - A helper application for safely moving mail from
a mail spool or POP server to a local user mailbox. See the
`Movemail' node of the Emacs manual.
+ digest-doc.exe, sorted-doc.exe - Tools for rebuilding the
built-in documentation.
* Image support
Emacs has built in support for XBM and PPM/PGM/PBM images, and the
libXpm library is bundled, providing XPM support (required for color
toolbar icons and splash screen).
toolbar icons and splash screen). Source for libXpm should be available
on the same place as you got this binary distribution from. The version
of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
libXpm library from X11R7.3.
Emacs can also support some other image formats with appropriate
libraries. These libraries are all available as part of GTK, or from

9
lisp/ChangeLog
View file

@ -1,3 +1,12 @@
2008-02-01 Jason Rumney <jasonr@gnu.org>
* w32-fns.el: Partially revert 2007-11-10 change.
2008-02-01 Martin Rudalics <rudalics@gmx.at>
* mail/rmail.el (rmail-highlight): Fix specification.
Reported by: pod <pod@herald.ox.ac.uk>.
2008-02-01 Stefan Monnier <monnier@iro.umontreal.ca>
* image-mode.el (image-mode-current-vscroll)

2
lisp/mail/rmail.el
View file

@ -332,7 +332,7 @@ See also `rmail-highlight-face'."
:group 'rmail-headers)
(defface rmail-highlight
'((t :default highlight))
'((t (:inherit highlight)))
"Face to use for highlighting the most important header fields."
:group 'rmail-headers
:version "22.1")

10
lisp/w32-fns.el
View file

@ -377,9 +377,9 @@ bit output with no translation."
(w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932)
(w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932)
(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
(w32-add-charset-info "ksc5601.1989-1" 'w32-charset-hangeul 949)
(w32-add-charset-info "big5-1" 'w32-charset-chinesebig5 950)
(w32-add-charset-info "gb2312.1980-1" 'w32-charset-gb2312 936)
(w32-add-charset-info "ksc5601.1989" 'w32-charset-hangeul 949)
(w32-add-charset-info "big5" 'w32-charset-chinesebig5 950)
(w32-add-charset-info "gb2312.1980" 'w32-charset-gb2312 936)
(w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil)
(w32-add-charset-info "ms-oem" 'w32-charset-oem 437)
(w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850)
@ -395,8 +395,8 @@ bit output with no translation."
(w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
(w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
(w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
(w32-add-charset-info "tis620-1" 'w32-charset-thai 874)
(w32-add-charset-info "ksc5601.1992-1" 'w32-charset-johab 1361)
(w32-add-charset-info "tis620" 'w32-charset-thai 874)
(w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
(w32-add-charset-info "mac-latin" 'w32-charset-mac nil)))
(if (boundp 'w32-unicode-charset-defined)
(progn

43
nt/README
View file

@ -21,6 +21,49 @@
See the INSTALL file in this directory for detailed instructions on
building and installing Emacs on your system.
* EXE files produced
Building and installing Emacs will produce the following executable
files in the bin directory.
+ emacs.exe - The main Emacs executable. As this is designed to run
as both a text-mode application (emacs -nw) and as a GUI application,
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.
+ emacsclient.exe - A command-line client program that can
communicate with a running Emacs process. See the `Emacs Server'
node of the Emacs manul.
+ emacsclientw.exe - A version of emacsclient that does not open
a command-line window.
+ addpm.exe - A basic installer that creates Start Menu icons for Emacs.
Running this is optional.
+ cmdproxy.exe - Used internally by Emacs to work around problems with
the native shells in various versions of Windows.
+ ctags.exe, etags.exe - Tools for generating tag files. See the
`Tags' node of the Emacs manual.
+ ebrowse.exe - A tool for generating C++ browse information. See the
`Ebrowse' manual.
+ ddeclient.exe - A tool for interacting with DDE servers.
+ hexl.exe - A tool for converting files to hex dumps. See the
`Editing Binary Files' node of the Emacs manual.
+ movemail.exe - A helper application for safely moving mail from
a mail spool or POP server to a local user mailbox. See the
`Movemail' node of the Emacs manual.
+ digest-doc.exe, sorted-doc.exe - Tools for rebuilding the
built-in documentation.
* Further information
There is a web page that serves as a FAQ for the Windows port of

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2008-02-01 Kenichi Handa <handa@ni.aist.go.jp>
* ccl.c (CCL_WRITE_CHAR): Fix overflow checking.
(CCL_WRITE_MULTIBYTE_CHAR): Likewise.
2008-01-31 Kenichi Handa <handa@ni.aist.go.jp>
* keyboard.c (make_ctrl_char): If C is a multibyte character, just

4
src/ccl.c
View file

@ -748,7 +748,7 @@ while(0)
int bytes = SINGLE_BYTE_CHAR_P (ch) ? 1: CHAR_BYTES (ch); \
if (!dst) \
CCL_INVALID_CMD; \
else if (dst + bytes + extra_bytes < (dst_bytes ? dst_end : src)) \
else if (dst + bytes + extra_bytes <= (dst_bytes ? dst_end : src)) \
{ \
if (bytes == 1) \
{ \
@ -775,7 +775,7 @@ while(0)
int bytes = CHAR_BYTES (ch); \
if (!dst) \
CCL_INVALID_CMD; \
else if (dst + bytes + extra_bytes < (dst_bytes ? dst_end : src)) \
else if (dst + bytes + extra_bytes <= (dst_bytes ? dst_end : src)) \
{ \
if (CHAR_VALID_P ((ch), 0)) \
dst += CHAR_STRING ((ch), dst); \