Commit 01140829 authored by Miles Bader's avatar Miles Bader
Browse files

Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-790
parents 9258f2ef d3a9d7d6
......@@ -333,10 +333,10 @@ Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el
url-file.el url-handlers.el url-http.el url-nfs.el
Chong Yidong: changed cus-edit.el simple.el files.el custom.el
display.texi longlines.el xdisp.c files.texi info.el keyboard.c
display.texi xdisp.c longlines.el files.texi info.el keyboard.c
compile.el custom.texi text.texi xterm.c frames.texi image-mode.el
mouse.el misc.texi startup.el wid-edit.el cus-theme.el
and 296 other files
and 297 other files
Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el
......@@ -652,8 +652,8 @@ Eli Tziperman: wrote rmail-spam-filter.el
Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el
and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c
startup.el mainmake.v2 config.bat rmail.el menu-bar.el pc-win.el
simple.el msdos.h internal.el xfaces.c emacs.c frame.c dosfns.c
faces.el frame.el and 532 other files
simple.el msdos.h internal.el xfaces.c emacs.c frame.c INSTALL dosfns.c
faces.el and 532 other files
Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el
sh-script.el text.texi
......@@ -1699,8 +1699,8 @@ Martin Neitzel: changed sc.el
Martin Rudalics: changed cus-edit.el wid-edit.el cus-start.el files.el
flyspell.el font-lock.el complete.el insdel.c ispell.el macmenu.c
syntax.c w32menu.c wdired.el whitespace.el window.el xdisp.c xmenu.c
backups.texi buffer.c buffer.h casefiddle.c and 36 other files
syntax.c table.el w32menu.c wdired.el whitespace.el window.el xdisp.c
xmenu.c backups.texi buffer.c buffer.h and 36 other files
Martin Stjernholm: wrote cc-bytecomp.el
and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el
......@@ -1877,7 +1877,7 @@ Miles Bader: wrote button.el image-file.el macroexp.el minibuf-eldef.el
and changed comint.el faces.el simple.el editfns.c xfaces.c info.el
xdisp.c minibuf.c wid-edit.el xterm.c subr.el window.el cus-edit.el
diff-mode.el dispextern.h quick-install-emacs xfns.c help.el lisp.h
textprop.c bytecomp.el and 241 other files
textprop.c bytecomp.el and 242 other files
Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el
mule-conf.el mule.el pop3.el
......@@ -1942,7 +1942,7 @@ Niimi Satoshi: changed pp.el search.c
Niklas Morberg: changed nnweb.el gnus-art.el nnimap.el spam.el
Nikolaj Schumacher: changed compile.el
Nikolaj Schumacher: changed compile.el rx.el
Noah Friedman: wrote eldoc.el rlogin.el rsz-mini.el type-break.el
and changed comint.el emacs-buffer.gdb files.el mailabbrev.el sendmail.el
......@@ -2291,7 +2291,7 @@ Rune Kleveland: changed xfns.c
Russ Allbery: changed message.el
Ryan Yeske: wrote rcirc.el
and changed ffap.el rmailsum.el simple.el testcover.el
and changed ffap.el ispell.el rmailsum.el simple.el testcover.el
Ryszard Kubiak: changed ogonek.el
......@@ -2416,9 +2416,9 @@ Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el
log-view.el pcvs-defs.el pcvs-info.el pcvs-parse.el pcvs-util.el
reveal.el smerge-mode.el
and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h
keyboard.c keymap.c tex-mode.el fill.el alloc.c compile.el files.el
regex.c simple.el easy-mmode.el vc-hooks.el info.el syntax.c xdisp.c
sh-script.el and 518 other files
keyboard.c fill.el keymap.c tex-mode.el alloc.c compile.el files.el
regex.c simple.el easy-mmode.el syntax.c vc-hooks.el info.el xdisp.c
sh-script.el and 519 other files
Steinar Bang: changed imap.el
......@@ -2533,7 +2533,7 @@ Terrence Brannon: wrote landmark.el
Terry Jones: wrote shadow.el
Tetsurou Okazaki: changed xterm.c
Tetsurou Okazaki: changed log-edit.el xterm.c
Theodore Jump: changed w32-win.el w32faces.c
......@@ -2614,6 +2614,8 @@ Toru Tomabechi: wrote tibet-util.el tibetan.el
Toshiaki Nomura: changed uxpds.h
Trent Buck: changed rcirc.el
Trey Jackson: changed spam-stat.el
Triet Hoai Lai: changed vntelex.el viet-util.el vietnamese.el
......@@ -2636,8 +2638,8 @@ and changed calendar.texi newsticker.texi Makefile.in
Ulrich Leodolter: changed w32proc.c
Ulrich Mueller: changed gud.el Makefile.in case-table.el fortran.el
iso-acc.el sysdep.c
Ulrich Mueller: changed gud.el Makefile.in XMakeAssoc.c case-table.el
fortran.el iso-acc.el sysdep.c
Ulrik Vieth: wrote meta-mode.el
and changed files.el
......@@ -2734,7 +2736,7 @@ Yagi Tatsuya: changed gnus-art.el gnus-start.el
Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h
macmenu.c macgui.h image.c macselect.c keyboard.c xdisp.c makefile.MPW
config.h emacs.c Makefile.in macos.texi INSTALL darwin.h xfaces.c
config.h emacs.c INSTALL Makefile.in macos.texi darwin.h xfaces.c
dispnew.c alloc.c and 77 other files
Yann Dirson: changed imenu.el
......
......@@ -10,6 +10,10 @@
* Makefile.in (install-arch-indep): Install only the DOC- file
specific to the build, if possible, rather than DOC-*.
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-05-25 Chong Yidong <cyd@stupidchicken.com>
* mkinstalldirs: Sync to version in automake CVS.
......
......@@ -6,6 +6,10 @@
* make-tarball.txt: Add note about cutting the branch.
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-02-03 Eli Zaretskii <eliz@gnu.org>
* nt/makedist.bat: Change EOL format to DOS. Don't use
......
......@@ -12,10 +12,10 @@ make sure all the pages really look ok in the manual as formatted.
Requests to have been sent out on 2006-05-23 (Reiner Steib).
LANG Translator Status
cs Pavel Jank Can't work on it now.
cs Pavel Janík Can't work on it now.
de Sven Joachim Done
fr Eric Jacoboni Done
pl W‚odek Bzyl Done
pl Włodek Bzyl Done
pt-br Rodrigo Real Done
ru Alex Ott Done
sk Miroslav Vaško No response
......@@ -76,7 +76,7 @@ SECTION READERS
etc/TUTORIAL rms
etc/TUTORIAL.bg Ognyan Kulev <ogi@fmi.uni-sofia.bg>
etc/TUTORIAL.cn
etc/TUTORIAL.cs Pavel Jank <Pavel@Janik.cz>
etc/TUTORIAL.cs Pavel Janík <Pavel@Janik.cz>
etc/TUTORIAL.de Werner LEMBERG <wl@gnu.org>
etc/TUTORIAL.eo
etc/TUTORIAL.es Marcelo Toledo
......@@ -89,7 +89,7 @@ etc/TUTORIAL.pl Slawomir Nowaczyk <slawek@cs.lth.se>
etc/TUTORIAL.pt_BR Marcelo Toledo
etc/TUTORIAL.ro
etc/TUTORIAL.ru Alex Ott <alexott@gmail.com>
etc/TUTORIAL.sk Pavel Jank <Pavel@Janik.cz>
etc/TUTORIAL.sk Pavel Janík <Pavel@Janik.cz>
etc/TUTORIAL.sl Primoz PETERLIN <primoz.peterlin@biofiz.mf.uni-lj.si>
etc/TUTORIAL.sv Mats Lidell <matsl@contactor.se>
etc/TUTORIAL.th Virach Sornlertlamvanich <virach@tcllab.org>
......
......@@ -35,6 +35,72 @@
old binaries.
* Files in this directory
+ emacs-22.1-bin-i386.zip
Windows binaries of Emacs-22.1, with all lisp code and documentation
included.
Download this file if you want a single installation package, and
are not interested in the C source code for Emacs. After
unpacking, you can optionally run the file bin/addpm.exe to have
Emacs add icons to the Start Menu.
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-22.1-barebin-i386.zip
Windows binaries of Emacs-22.1, without lisp code or documentation.
Download this file if you already have the source distribution, or
if you need to redump the emacs.exe executable.
Unpack this over the top of either the source distribution or the
bin distribution above. It contains the bin subdirectory and etc/DOC
file, plus temacs.exe and dump.bat, which are required if you want to
redump emacs without recompiling it.
+ emacs-21.3-bin-i386.tar.gz
Windows binaries of Emacs 21.3, with compiled lisp code and some
documentation included.
This is provided for users who require the older version.
+ emacs-21.3-leim.tar.gz
Compiled lisp input methods. This optional addition to Emacs-21.3
is required if you want to enter languages that are not directly
supported by your keyboard.
* Image support
Emacs 22.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
formats are supported:
PBM/PGM/PPM: Supported natively by Emacs. This format is used for
the black and white versions of the toolbar icons.
XPM: requires a Windows port of the XPM library 3.4 or later,
which will be named xpm4.dll, libxpm-nox4.dll or
libxpm.dll. This format is used for the color versions of the
toolbar icons, and other images in Emacs.
PNG: requires the PNG reference library 1.2 or later, which will
be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
or libpng.dll. LibPNG requires zlib, which should come from the same
source as you got libpng.
JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
or libtiff.dll.
GIF: requires libungif or giflib 4.1 or later, which will be
called giflib4.dll, libungif4.dll or libungif.dll.
* Distributions in .tar.gz and .zip format
Emacs is distributed primarily as source code in a large gzipped tar file
......@@ -46,23 +112,6 @@
but since there are no longer legal problems with .zip files, and the
latest versions of Windows support these natively, the Windows binaries
of Emacs are now distributed as .zip files.
Here are the combinations (i386 in the name indicates a zipfile contains
executables compiled for Intel-compatible x86 systems):
+ Primary precompiled distribution, including lisp source:
emacs-22.1-bin-i386.zip
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:
emacs-22.1-barebin-i386.zip (requires ../emacs-22.1.tar.gz)
+ The complete official source for Emacs:
../emacs-22.1.tar.gz
* Distributions for non-x86 platforms
......@@ -108,7 +157,7 @@
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
Zip files can be unpacked using unzip.exe from info-zip.org
if you do not already have other tools to do this.
% unzip some.zip
......@@ -165,7 +214,10 @@
http://www.gnu.org/software/emacs/windows/ntemacs.html
This document serves as an FAQ and a source for further information
about the Windows port and related software packages.
about the Windows port and related software packages. Note that as
of writing, most of the information in that FAQ was for Emacs-21.3
and earlier versions, so some information may not be relevant to
Emacs-22.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
......
......@@ -36,7 +36,7 @@ rem Info-ZIP zip seems to be broken on Windows.
rem It always writes to zip.zip and treats the zipfile argument as one
rem of the files to go in it.
rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS
7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim
7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp
del emacs-%1\README.W32
if not (%4) == () goto end
......
......@@ -20,6 +20,15 @@
(EDB, Go in a buffer): Update urls.
Suggested by CHENG Gao <chenggao@gmail.com>.
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-06-02 CHENG Gao <chenggao@gmail.com>
* MORE.STUFF: Remove dead URL for Fortune, and update URLs for
Hideshow, Org, EDB, and Remember.
2007-05-29 Robert J. Chassell <bob@rattlesnake.com>
* NEWS: Fix instances of `allow' without object.
......
......@@ -69,17 +69,19 @@ You might find bug-fixes or enhancements in these places.
* Expand: <URL:http://w3.teaser.fr/%7Eflepied/expand.el.gz>
* Fortune: <URL:http://www.coling.uni-freiburg.de/%7Eschauer/emacs.html>
* Gnus: <URL:http://www.gnus.org/>
* Ffap: <URL:http://www.mathcs.emory.edu/%7Emic/ftp/emacs/>
(And some addons for it.)
* Hideshow: <URL:http://staff.science.uva.nl/~dominik/Tools/org/>
* Ispell: <URL:http://www.eng.utah.edu/~kstevens/ispell-page.html>
* MH-E: <URL:http://mh-e.sourceforge.net/>
* Org mode: <URL:http://staff.science.uva.nl/~dominik/Tools/org/>
* PS mode: <URL:http://odur.let.rug.nl/%7Ekleiweg/postscript/>
* PS-print: <URL:http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage>
......@@ -233,10 +235,10 @@ Several are for Debian GNU/Linux in particular.
DTD-aware serious SGML/XML editing.
* Quack: <URL:http://www.neilvandyke.org/quack/>
Quack enhances Emacs support for Scheme
Quack enhances Emacs support for Scheme.
* Remember:
<URL:http://sacha.free.net.ph/notebook/wiki/RememberEl.php>
* Remember: <URL:https://gna.org/p/remember-el>
A Personal Information Manager (PIM) for Emacs.
* Session: <URL:http://emacs-session.sourceforge.net/>
Session Management for Emacs.
......
......@@ -33,6 +33,24 @@ Some specific packages that are known to cause problems are:
** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version.
** cua.el, cua-mode.el: remove old versions.
* Installation Changes in Emacs 22.2
* Changes in Emacs 22.2
** The values of `dired-recursive-deletes' and `dired-recursive-copies'
have been changed to `top'. This means that the user is asked once,
before deleting/copying the indicated directory recursively.
** In Image mode, whenever the displayed image is wider and/or higher
than the window, the usual keys for moving the cursor cause the image
to be scrolled horizontally or vertically instead.
* New Modes and Packages in Emacs 22.2
** The new package css-mode.el provides a major mode for editing CSS files.
** The new package socks.el implements the SOCKS v5 protocol.
* Installation Changes in Emacs 22.1
......
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-01-30 Kenichi Handa <handa@m17n.org>
* CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/PY-b5.tit, CXTERM-DIC/SW.tit,
......
......@@ -15,6 +15,10 @@
* makefile.w32-in (VERSION): Increase to 22.1.50.
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-02-26 Francesco Potort,Al(B <pot@gnu.org>
* Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs".
......
......@@ -67,6 +67,16 @@
* textmodes/org.el (org-export-ascii-bullets, org-batch-agenda)
(org-batch-agenda-csv): Fix typos in docstrings.
2007-06-06 Juanma Barranquero <lekktu@gmail.com>
* international/mule-cmds.el (toggle-enable-multibyte-characters)
(sort-coding-systems, search-unencodable-char): Doc fixes.
(coding-system-change-eol-conversion, set-default-coding-systems)
(prefer-coding-system, find-multibyte-characters, princ-list)
(leim-list-entry-regexp, set-input-method, locale-language-names)
(input-method-exit-on-first-char, exit-language-environment-hook)
(locale-charset-language-names): Fix typos in docstrings.
2007-06-06 Juanma Barranquero <lekktu@gmail.com>
* pgg.el (pgg-sign-region, pgg-sign):
......@@ -453,6 +463,10 @@
* files.el (auto-mode-alist): Change the regexp so that
ChangeLog.unicode and ChangeLog.multi-tty use change-log-mode.
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-05-19 Chong Yidong <cyd@stupidchicken.com>
* paren.el (show-paren-function): Undo 2007-04-19 and 2007-04-20
......
......@@ -5478,7 +5478,7 @@
(cperl-string-syntax-table): Make { and } not-grouping
(Sometimes they ARE grouping in RExen, but matching them would only
confuse in many situations when they are not)
(beginning-of-buffer): Replace two occurences with goto-char...
(beginning-of-buffer): Replace two occurrences with goto-char...
(cperl-calculate-indent): `char-after' could be nil...
(cperl-find-pods-heres): REx can start after "[" too.
Hightlight (??{}) in RExen too.
......@@ -19664,14 +19664,14 @@
New defvar. Replaces `dired-move-to-filename-regexp' from dired.el.
 
* dired.el (dired-move-to-filename-regexp): Remove.
All occurences replaced by `directory-listing-before-filename-regexp'.
All occurrences replaced by `directory-listing-before-filename-regexp'.
 
* dired-x.el, locate.el, vc.el:
Replace `dired-move-to-filename-regexp' by
`directory-listing-before-filename-regexp'. In vc.el it is
overwritten locally; maybe this can be handled in files.el too.
 
* net/ange-ftp.el (ange-ftp-date-regexp): Remove. All occurences
* net/ange-ftp.el (ange-ftp-date-regexp): Remove. All occurrences
replaced by `directory-listing-before-filename-regexp'.
 
2005-10-23 Andreas Schwab <schwab@suse.de>
;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
;;; mule-cmds.el --- commands for multilingual environment -*-coding: iso-2022-7bit -*-
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007 Free Software Foundation, Inc.
......@@ -203,7 +203,7 @@
"`\\(\\sw\\(\\sw\\|\\s_\\)+\\)'")))
(defun coding-system-change-eol-conversion (coding-system eol-type)
"Return a coding system which differs from CODING-SYSTEM in eol conversion.
"Return a coding system which differs from CODING-SYSTEM in EOL conversion.
The returned coding system converts end-of-line by EOL-TYPE
but text as the same way as CODING-SYSTEM.
EOL-TYPE should be `unix', `dos', `mac', or nil.
......@@ -253,8 +253,8 @@ the buffer; it only changes the way those bytes are interpreted.
In general, therefore, this command *changes* the sequence of
characters that the current buffer contains.
We suggest you avoid using use this command unless you know what you
are doing. If you use it by mistake, and the buffer is now displayed
We suggest you avoid using this command unless you know what you are
doing. If you use it by mistake, and the buffer is now displayed
wrong, use this command again to toggle back to the right mode."
(interactive "P")
(let ((new-flag
......@@ -327,10 +327,10 @@ This sets the following coding systems:
o default coding system for subprocess I/O
This also sets the following values:
o default value used as `file-name-coding-system' for converting file names
if CODING-SYSTEM is ASCII-compatible.
if CODING-SYSTEM is ASCII-compatible
o default value for the command `set-terminal-coding-system' (not on MSDOS)
o default value for the command `set-keyboard-coding-system'
if CODING-SYSTEM is ASCII-compatible.."
if CODING-SYSTEM is ASCII-compatible"
(check-coding-system coding-system)
(setq-default buffer-file-coding-system coding-system)
(if (fboundp 'ucs-set-table-for-input)
......@@ -372,7 +372,7 @@ This also sets the following coding systems:
o coding system of a newly created buffer
o default coding system for subprocess I/O
This also sets the following values:
o default value used as `file-name-coding-system' for converting file names.
o default value used as `file-name-coding-system' for converting file names
o default value for the command `set-terminal-coding-system' (not on MSDOS)
o default value for the command `set-keyboard-coding-system'
......@@ -423,16 +423,16 @@ The function `sort-coding-systems' use it.")
(defun sort-coding-systems (codings)
"Sort coding system list CODINGS by a priority of each coding system.
Returns the sorted list. CODINGS is modified by side effects.
Return the sorted list. CODINGS is modified by side effects.
If a coding system is most preferred, it has the highest priority.
Otherwise, a coding system corresponds to some MIME charset has higher
priorities. Among them, a coding system included in `coding-system'
key of the current language environment has higher priorities. See
also the documentation of `language-info-alist'.
Otherwise, coding systems that correspond to MIME charsets have
higher priorities. Among them, a coding system included in the
`coding-system' key of the current language environment has higher
priority. See also the documentation of `language-info-alist'.
If the variable `sort-coding-systems-predicate' (which see) is
non-nil, it is used to sort CODINGS in the different way than above."
non-nil, it is used to sort CODINGS instead."
(if sort-coding-systems-predicate
(sort codings sort-coding-systems-predicate)
(let* ((from-categories (mapcar #'(lambda (x) (symbol-value x))
......@@ -566,7 +566,7 @@ where
COUNT is a number of characters,
CHARs are the characters found from the character set.
Optional 3rd arg MAXCOUNT limits how many CHARs are put in the above list.
Optional 4th arg EXCLUDE is a list of character sets to be ignored.
Optional 4th arg EXCLUDES is a list of character sets to be ignored.
For invalid characters, CHARs are actually strings."
(let ((chars nil)
......@@ -616,8 +616,8 @@ It asks which coding system to check.
If such a character is found, set point after that character.
Otherwise, don't move point.
When called from a program, the value is a position of the found character,
or nil if all characters are encodable."
When called from a program, the value is the position of the unencodable
character found, or nil if all characters are encodable."
(interactive
(list (let ((default (or buffer-file-coding-system 'us-ascii)))
(read-coding-system
......@@ -1295,7 +1295,7 @@ Emacs loads this file at startup time.")
(defvar leim-list-entry-regexp "^(register-input-method"
"Regexp matching head of each entry in LEIM list file.
See also the variable `leim-list-header'")
See also the variable `leim-list-header'.")
(defvar update-leim-list-functions
'(quail-update-leim-list-file)
......@@ -1479,7 +1479,7 @@ When called interactively, the optional arg INTERACTIVE is non-nil,
which marks the variable `default-input-method' as set for Custom buffers.
To deactivate the input method interactively, use \\[toggle-input-method].
To deactivate it programmatically, use \\[inactivate-input-method]."
To deactivate it programmatically, use `inactivate-input-method'."
(interactive
(let* ((default (or (car input-method-history) default-input-method)))
(list (read-input-method-name
......@@ -1648,7 +1648,7 @@ just inactivated.")
"This flag controls when an input method returns.
Usually, the input method does not return while there's a possibility
that it may find a different translation if a user types another key.
But, it this flag is non-nil, the input method returns as soon as
But, if this flag is non-nil, the input method returns as soon as
the current key sequence gets long enough to have some valid translation.")
(defvar input-method-use-echo-area nil
......@@ -1680,7 +1680,7 @@ When this hook is run, the variable `current-language-environment'
is still bound to the language environment being exited.
This hook is mainly used for canceling the effect of
`set-language-environment-hook' (which-see).")
`set-language-environment-hook' (which see).")
(put 'setup-specified-language-environment 'apropos-inhibit t)
......@@ -2015,7 +2015,7 @@ specifies the character set for the major languages of Western Europe."
(set-display-table-and-terminal-coding-system language-name))
(defsubst princ-list (&rest args)
"Print all arguments with `princ', then print \"\n\"."
"Print all arguments with `princ', then print \"\\n\"."
(while args (princ (car args)) (setq args (cdr args)))
(princ "\n"))
......@@ -2345,10 +2345,10 @@ specifies the character set for the major languages of Western Europe."
("wen" . "Latin-2") ; MS Windows Upper Sorbian
))
"Alist of locale regexps vs the corresponding languages and coding systems.
Each element has these form:
Each element has this form:
\(LOCALE-REGEXP LANG-ENV CODING-SYSTEM)
The first element whose LOCALE-REGEXP matches the start of a
downcased locale specifies the LANG-ENV \(language environtment)
downcased locale specifies the LANG-ENV \(language environment)
and CODING-SYSTEM corresponding to that locale. If there is no
appropriate language environment, the element may have this form:
\(LOCALE-REGEXP . LANG-ENV)
......@@ -2372,7 +2372,7 @@ specific encoding such as \"Latin-1\" and \"UTF-8\".")
The first element whose locale regexp matches the start of a downcased locale
specifies the language name whose charset corresponds to that locale.
This language name is used if the locale is not listed in
`locale-language-names'")
`locale-language-names'.")
(defconst locale-preferred-coding-systems
(purecopy
......
This diff is collapsed.
......@@ -332,7 +332,7 @@ cache or user."
(interactive "r")
(let ((status
(pgg-save-coding-system start end
(pgg-invoke "encrypt-symmetric-region"
(pgg-invoke "encrypt-symmetric-region"
(or pgg-scheme pgg-default-scheme)
(point-min) (point-max) passphrase))))
(when (interactive-p)
......@@ -485,7 +485,7 @@ signer's public key from `pgg-default-keyserver-address'."
(or (cdr (assq 'preferred-key-server packet))
pgg-default-keyserver-address))
(pgg-fetch-key keyserver key))
(setq status
(setq status
(pgg-save-coding-system start end
(pgg-invoke "verify-region" (or pgg-scheme pgg-default-scheme)
(point-min) (point-max) signature)))
......
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-01-30 Robert J. Chassell <bob@rattlesnake.com>
* emacs-lisp-intro.texi (else): Rephrase message of first
......
......@@ -9,6 +9,23 @@
width and height.
(Drag Events, Motion Events): Update to new format for position.
2007-06-02 Richard Stallman <rms@gnu.org>
* frames.texi (Color Parameters): Add xref to (emacs)Standard Faces.
2007-06-02 Chong Yidong <cyd@stupidchicken.com>
* Version 22.1 released.
2007-06-01 Stefan Monnier <monnier@iro.umontreal.ca>
* text.texi (Special Properties): Correct meaning of fontified
face.
2007-05-30 Richard Stallman <rms@gnu.org>