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

merge emacs-23

Browse source
This commit is contained in:
Kenichi Handa 2011-02-22 09:22:09 +09:00
commit 2e15a2cf4d
70 changed files with 315 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/emacs/ChangeLog
View file

@ -1,3 +1,7 @@
2011-02-19 Glenn Morris <rgm@gnu.org>
* dired.texi (Dired): Dired-X version number was dropped.
2011-02-05 Chong Yidong <cyd@stupidchicken.com>
* rmail.texi (Rmail Display): Document Rmail MIME support more

2
doc/emacs/dired.texi
View file

@ -24,7 +24,7 @@ files. You first mark certain files in order to operate on all of
them with one command.
The Dired-X package provides various extra features for Dired mode.
@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}.
@xref{Top, Dired-X,,dired-x, Dired Extra User's Manual}.
You can also view a list of files in a directory with @kbd{C-x C-d}
(@code{list-directory}). Unlike Dired, this command does not allow

4
doc/lispintro/ChangeLog
View file

@ -1,3 +1,7 @@
2011-02-18 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
2010-09-21 Glenn Morris <rgm@gnu.org>
* cons-1.eps, cons-2.eps, cons-2a.eps, cons-3.eps, cons-4.eps:

2
doc/lispintro/emacs-lisp-intro.texi
View file

@ -216,7 +216,7 @@
@c ----------------------------------------------------
@dircategory Emacs
@dircategory GNU Emacs Lisp
@direntry
* Emacs Lisp Intro: (eintr).
A simple introduction to Emacs Lisp programming.

14
doc/lispref/ChangeLog
View file

@ -1,3 +1,17 @@
2011-02-18 Eli Zaretskii <eliz@gnu.org>
* elisp.texi: Sync @dircategory with ../../info/dir.
* files.texi (Visiting Functions): Document find-file-literally,
both the command and the variable.
* variables.texi (Creating Buffer-Local): Explain the meaning of
permanent local variables.
2011-02-18 Glenn Morris <rgm@gnu.org>
* keymaps.texi (Remapping Commands): Mention how to undo it.
2011-02-05 Chong Yidong <cyd@stupidchicken.com>
* commands.texi (Accessing Mouse): Note that a header line is not

2
doc/lispref/elisp.texi
View file

@ -63,7 +63,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory GNU Emacs Lisp
@direntry
* Elisp: (elisp). The Emacs Lisp Reference Manual.
@end direntry

30
doc/lispref/files.texi
View file

@ -114,6 +114,26 @@ When @code{find-file} is called interactively, it prompts for
@var{filename} in the minibuffer.
@end deffn
@deffn Command find-file-literally filename
This command visits @var{filename}, like @code{find-file} does, but it
does not perform any format conversions (@pxref{Format Conversion}),
character code conversions (@pxref{Coding Systems}), or end-of-line
conversions (@pxref{Coding System Basics, End of line conversion}).
The buffer visiting the file is made unibyte, and its major mode is
Fundamental mode, regardless of the file name. File local variable
specifications in the file (@pxref{File Local Variables}) are
ignored, and automatic decompression and adding a newline at the end
of the file due to @code{require-final-newline} (@pxref{Saving
Buffers, require-final-newline}) are also disabled.
Note that if Emacs already has a buffer visiting the same file
non-literally, it will not visit the same file literally, but instead
just switch to the existing buffer. If you want to be sure of
accessing a file's contents literally, you should create a temporary
buffer and then read the file contents into it using
@code{insert-file-contents-literally} (@pxref{Reading from Files}).
@end deffn
@defun find-file-noselect filename &optional nowarn rawfile wildcards
This function is the guts of all the file-visiting functions. It
returns a buffer visiting the file @var{filename}. You may make the
@ -225,6 +245,16 @@ This is not a normal hook because the values of the functions are
used, and in many cases only some of the functions are called.
@end defvar
@defvar find-file-literally
This buffer-local variable, if set to a non-@code{nil} value, makes
@code{save-buffer} behave as if the buffer were visiting its file
literally, i.e. without conversions of any kind. The command
@code{find-file-literally} sets this variable's local value, but other
equivalent functions and commands can do that as well, e.g.@: to avoid
automatic addition of a newline at the end of the file. This variable
us permanent local, so it is unaffected by changes of major modes.
@end defvar
@node Subroutines of Visiting
@comment node-name, next, previous, up
@subsection Subroutines of Visiting

6
doc/lispref/keymaps.texi
View file

@ -1510,6 +1510,12 @@ does not have the effect of remapping @code{kill-line} into
if an ordinary binding specifies @code{my-kill-line}, this keymap will
remap it to @code{my-other-kill-line}.
To undo the remapping of a command, remap it to @code{nil}; e.g.
@smallexample
(define-key my-mode-map [remap kill-line] nil)
@end smallexample
@defun command-remapping command &optional position keymaps
This function returns the remapping for @var{command} (a symbol),
given the current active keymaps. If @var{command} is not remapped

2
doc/lispref/variables.texi
View file

@ -1409,6 +1409,8 @@ subsequent major mode. @xref{Hooks}.
@cindex permanent local variable
A buffer-local variable is @dfn{permanent} if the variable name (a
symbol) has a @code{permanent-local} property that is non-@code{nil}.
Such variables are unaffected by @code{kill-all-local-variables}, and
their local bindings are therefore not cleared by changing major modes.
Permanent locals are appropriate for data pertaining to where the file
came from or how to save it, rather than with how to edit the contents.

62
doc/misc/ChangeLog
View file

@ -1,3 +1,65 @@
2011-02-19 Glenn Morris <rgm@gnu.org>
* edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi:
Standardize some Emacs/XEmacs terminology.
2011-02-19 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and
"Debian GNU/Linux".
* trampver.texi [xemacs]: Set emacsothername to "Emacs".
2011-02-18 Eli Zaretskii <eliz@gnu.org>
* ada-mode.texi: Sync @dircategory with ../../info/dir.
* auth.texi: Sync @dircategory with ../../info/dir.
* autotype.texi: Sync @dircategory with ../../info/dir.
* calc.texi: Sync @dircategory with ../../info/dir.
* cc-mode.texi: Sync @dircategory with ../../info/dir.
* cl.texi: Sync @dircategory with ../../info/dir.
* dbus.texi: Sync @dircategory with ../../info/dir.
* dired-x.texi: Sync @dircategory with ../../info/dir.
* ebrowse.texi: Sync @dircategory with ../../info/dir.
* ede.texi: Sync @dircategory with ../../info/dir.
* ediff.texi: Sync @dircategory with ../../info/dir.
* edt.texi: Sync @dircategory with ../../info/dir.
* eieio.texi: Sync @dircategory with ../../info/dir.
* emacs-mime.texi: Sync @dircategory with ../../info/dir.
* epa.texi: Sync @dircategory with ../../info/dir.
* erc.texi: Sync @dircategory with ../../info/dir.
* eshell.texi: Sync @dircategory with ../../info/dir.
* eudc.texi: Sync @dircategory with ../../info/dir.
* flymake.texi: Sync @dircategory with ../../info/dir.
* forms.texi: Sync @dircategory with ../../info/dir.
* gnus.texi: Sync @dircategory with ../../info/dir.
* idlwave.texi: Sync @dircategory with ../../info/dir.
* mairix-el.texi: Sync @dircategory with ../../info/dir.
* message.texi: Sync @dircategory with ../../info/dir.
* mh-e.texi: Sync @dircategory with ../../info/dir.
* newsticker.texi: Sync @dircategory with ../../info/dir.
* nxml-mode.texi: Sync @dircategory with ../../info/dir.
* org.texi: Sync @dircategory with ../../info/dir.
* pcl-cvs.texi: Sync @dircategory with ../../info/dir.
* pgg.texi: Sync @dircategory with ../../info/dir.
* rcirc.texi: Sync @dircategory with ../../info/dir.
* reftex.texi: Sync @dircategory with ../../info/dir.
* remember.texi: Sync @dircategory with ../../info/dir.
* sasl.texi: Sync @dircategory with ../../info/dir.
* sc.texi: Sync @dircategory with ../../info/dir.
* semantic.texi: Sync @dircategory with ../../info/dir.
* ses.texi: Sync @dircategory with ../../info/dir.
* sieve.texi: Sync @dircategory with ../../info/dir.
* smtpmail.texi: Sync @dircategory with ../../info/dir.
* speedbar.texi: Sync @dircategory with ../../info/dir.
* trampver.texi [emacs]: Set emacsname to "Emacs".
* tramp.texi: Sync @dircategory with ../../info/dir.
* url.texi: Sync @dircategory with ../../info/dir.
* vip.texi: Sync @dircategory with ../../info/dir.
* viper.texi: Sync @dircategory with ../../info/dir.
* widget.texi: Sync @dircategory with ../../info/dir.
* woman.texi: Sync @dircategory with ../../info/dir.
2011-02-14 Glenn Morris <rgm@gnu.org>
* dired-x.texi: Drop meaningless version number.

2
doc/misc/ada-mode.texi
View file

@ -20,7 +20,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code.
@end direntry

4
doc/misc/auth.texi
View file

@ -29,7 +29,7 @@ license to the document, as described in section 6 of the license.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* Auth-source: (auth). The Emacs auth-source library.
@end direntry
@ -214,7 +214,7 @@ string or a @code{nil} object. Currently only the modes ``login'' and
@var{port} contains the protocol name (e.g. ``imap'') or
a port number. It must be a string, corresponding to the port in the
users' netrc files.
user's netrc files.
@example
;; IMAP example

2
doc/misc/autotype.texi
View file

@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Autotype: (autotype). Convenient features for text that you
enter frequently in Emacs.

2
doc/misc/calc.texi
View file

@ -110,7 +110,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Calc: (calc). Advanced desk calculator and mathematical tool.
@end direntry

2
doc/misc/cc-mode.texi
View file

@ -179,7 +179,7 @@ developing GNU and promoting software freedom.''
@comment Info directory entry for use by install-info. The indentation
@comment here is by request from the FSF folks.
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C,
Java, Pike, AWK, and CORBA IDL code.

2
doc/misc/cl.texi
View file

@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* CL: (cl). Partial Common Lisp support for Emacs Lisp.
@end direntry

2
doc/misc/dbus.texi
View file

@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* D-Bus: (dbus). Using D-Bus in Emacs.
@end direntry

2
doc/misc/dired-x.texi
View file

@ -34,7 +34,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Dired-X: (dired-x). Dired Extra Features.
@end direntry

2
doc/misc/ebrowse.texi
View file

@ -27,7 +27,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Ebrowse: (ebrowse). A C++ class browser for Emacs.
@end direntry

4
doc/misc/ede.texi
View file

@ -22,9 +22,9 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* ede: (ede). Project management for Emacs.
* EDE: (ede). The Emacs Development Environment.
@end direntry
@titlepage

2
doc/misc/ediff.texi
View file

@ -42,7 +42,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Ediff: (ediff). A visual interface for comparing and merging programs.
@end direntry

32
doc/misc/edt.texi
View file

@ -23,7 +23,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* EDT: (edt). An Emacs emulation of the EDT editor.
@end direntry
@ -88,7 +88,7 @@ informing you that the emulation has been enabled: ``Default EDT keymap
active''.
You can have the EDT Emulation start up automatically, each time you
initiate a GNU Emacs session, by adding the following line to your
initiate an Emacs session, by adding the following line to your
@file{.emacs} file:
@example
@ -219,7 +219,7 @@ user quits without saving those buffers.
@item
Emulate EDT Keypad Mode commands closely so that current EDT users will
find that it easy and comfortable to use GNU Emacs with a small learning
find that it easy and comfortable to use Emacs with a small learning
curve.
@item
@ -238,7 +238,7 @@ Provide an easy way to restore @strong{all} original Emacs key bindings,
just as they existed before the EDT emulation was first invoked.
@item
Support GNU Emacs 19 and higher. XEmacs 19, and above, is also supported.
Support Emacs and XEmacs 19 and higher.
@item
Supports highlighting of marked text within the EDT emulation on all
@ -286,13 +286,13 @@ apply to you.
@node Starting emulation
@chapter How to Get Started
Start up GNU Emacs and enter @kbd{M-x edt-emulation-on} to begin the
Start up Emacs and enter @kbd{M-x edt-emulation-on} to begin the
emulation. After initialization is complete, the following message will
appear below the status line informing you that the emulation has been
enabled: ``Default EDT keymap active''.
You can have the EDT Emulation start up automatically, each time you
initiate a GNU Emacs session, by adding the following line to your
initiate an Emacs session, by adding the following line to your
@file{.emacs} file:
@example
@ -307,7 +307,7 @@ in the EDT Default Mode).
It is easy to customize key bindings in the EDT Emulation
(@pxref{Customizing}). Customizations are placed in a file called
@file{edt-user.el}. The Emacs @file{etc/} directory contains an
example. If @file{edt-user.el} is found in your GNU Emacs load path
example. If @file{edt-user.el} is found in your Emacs load path
during EDT Emulation initialization, then the following message will
appear below the status line indicating that the emulation has been
enabled, enhanced by your own customizations: ``User EDT custom keymap
@ -322,8 +322,8 @@ restores the original key bindings in effect just prior to invoking the
emulation.
Emacs binds keys to @acronym{ASCII} control characters and so does the
real EDT. Where EDT key bindings and GNU Emacs key bindings conflict,
the default GNU Emacs key bindings are retained by the EDT emulation by
real EDT. Where EDT key bindings and Emacs key bindings conflict,
the default Emacs key bindings are retained by the EDT emulation by
default. If you are a diehard EDT user you may not like this. The
@ref{Control keys} section explains how to change this so that the EDT
bindings to @acronym{ASCII} control characters override the default
@ -365,7 +365,7 @@ older SunOS release configured with a Sun Type 5 keyboard:
@example
! File: .xmodmaprc
!
! Set up Sun Type 5 keypad for use with the GNU Emacs EDT Emulation
! Set up Sun Type 5 keypad for use with the Emacs EDT Emulation
!
keycode 53 = KP_Divide
keycode 54 = KP_Multiply
@ -437,7 +437,7 @@ things up nicely.
@example
! File: .xmodmaprc
!
! Set up PC keypad under GNU/Linux for the GNU Emacs EDT Emulation
! Set up PC keypad under GNU/Linux for the Emacs EDT Emulation
!
clear mod2
keycode 77 = F12
@ -519,7 +519,7 @@ assign Num_Lock back to mod2.
@example
! File: .xmodmaprc
!
! Set up PC keypad under GNU/Linux for the GNU Emacs EDT Emulation
! Set up PC keypad under GNU/Linux for the Emacs EDT Emulation
!
clear mod2
keycode 77 = F12
@ -542,7 +542,7 @@ In general, you will find that this emulation of EDT replicates most,
but not all, of EDT's most used Keypad Mode editing functions and
behavior. It is not perfect, but most EDT users who have tried the
emulation agree that it is quite good enough to make it easy for
die-hard EDT users to move over to using GNU Emacs.
die-hard EDT users to move over to using Emacs.
Here's a list of the most important differences between EDT and this GNU
Emacs EDT Emulation. The list is short but you must be aware of these
@ -784,7 +784,7 @@ terminals on the same system, you need not look at @file{edt-user.el2}.
@end ignore
First, you need to have your own private lisp directory, say
@file{~/lisp}, and you should add it to the GNU Emacs load path.
@file{~/lisp}, and you should add it to the Emacs load path.
@strong{Please note:} A few sites have different load-path requirements,
so the above directions may need some modification if your site has such
@ -899,8 +899,8 @@ Here are some examples:
@node Control keys
@section Enabling EDT Control Key Sequence Bindings
Where EDT key bindings and GNU Emacs key bindings conflict, the default
GNU Emacs key bindings are retained by default. Some diehard EDT users
Where EDT key bindings and Emacs key bindings conflict, the default
Emacs key bindings are retained by default. Some diehard EDT users
may not like this. So, if the variable
@code{edt-use-EDT-control-key-bindings} is set to true in a user's
@file{.emacs} file, then the default EDT Emulation mode will enable most

4
doc/misc/eieio.texi
View file

@ -27,9 +27,9 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* eieio: (eieio). Objects for Emacs.
* EIEIO: (eieio). An objects system for Emacs Lisp.
@end direntry
@titlepage

2
doc/misc/emacs-mime.texi
View file

@ -29,7 +29,7 @@ developing GNU and promoting software freedom.''
@c Node ``Interface Functions'' uses Latin-1 characters
@documentencoding ISO-8859-1
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* Emacs MIME: (emacs-mime). Emacs MIME de/composition library.
@end direntry

2
doc/misc/epa.texi
View file

@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard.
@end direntry

4
doc/misc/erc.texi
View file

@ -28,7 +28,7 @@ and modified without restriction.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* ERC: (erc). Powerful and extensible IRC client for Emacs.
@end direntry
@ -36,7 +36,7 @@ and modified without restriction.
@titlepage
@title ERC manual
@subtitle a full-featured IRC client
@subtitle for GNU Emacs and XEmacs
@subtitle for Emacs and XEmacs
@c The following two commands
@c start the copyright page.

2
doc/misc/eshell.texi
View file

@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Eshell: (eshell). A command shell implemented in Emacs Lisp.
@end direntry

2
doc/misc/eudc.texi
View file

@ -29,7 +29,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* EUDC: (eudc). Emacs client for directory servers (LDAP, PH).
@end direntry

2
doc/misc/flymake.texi
View file

@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Flymake: (flymake). A universal on-the-fly syntax checker.
@end direntry

2
doc/misc/forms.texi
View file

@ -35,7 +35,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Forms: (forms). Emacs package for editing data bases
by filling in forms.

6
doc/misc/gnus.texi
View file

@ -320,7 +320,7 @@ developing GNU and promoting software freedom.''
@end iflatex
@end iftex
@dircategory Emacs
@dircategory Emacs network features
@direntry
* Gnus: (gnus). The newsreader Gnus.
@end direntry
@ -23156,7 +23156,7 @@ variables should be either strings or symbols naming functions that
return a string. When the mouse passes over text with this property
set, a balloon window will appear and display the string. Please
refer to @ref{Tooltips, ,Tooltips, emacs, The Emacs Manual},
(in GNU Emacs) or the doc string of @code{balloon-help-mode} (in
(in Emacs) or the doc string of @code{balloon-help-mode} (in
XEmacs) for more information on this. (For technical reasons, the
guillemets have been approximated as @samp{<<} and @samp{>>} in this
paragraph.)
@ -28476,7 +28476,7 @@ to install Gnus after compiling it, give @file{make.bat} @code{/copy} as
the second parameter.
@file{make.bat} has been rewritten from scratch, it now features
automatic recognition of XEmacs and GNU Emacs, generates
automatic recognition of XEmacs and Emacs, generates
@file{gnus-load.el}, checks if errors occur while compilation and
generation of info files and reports them at the end of the build
process. It now uses @code{makeinfo} if it is available and falls

4
doc/misc/idlwave.texi
View file

@ -39,7 +39,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* IDLWAVE: (idlwave). Major mode and shell for IDL files.
@end direntry
@ -4275,7 +4275,7 @@ browse-url-browser-function} or similar when attempting to load IDLWAVE
under XEmacs.}
You don't have the @samp{browse-url} (or other required) XEmacs package.
Unlike GNU Emacs, XEmacs distributes many packages separately from the
Unlike Emacs, XEmacs distributes many packages separately from the
main program. IDLWAVE is actually among these, but is not always the
most up to date. When installing IDLWAVE as an XEmacs package, it
should prompt you for required additional packages. When installing it

2
doc/misc/mairix-el.texi
View file

@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* Mairix: (mairix-el). Emacs interface to the Mairix mail indexer.
@end direntry

2
doc/misc/message.texi
View file

@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* Message: (message). Mail and news composition mode that
goes with Gnus.

8
doc/misc/mh-e.texi
View file

@ -56,7 +56,7 @@ Public License.''
@end copying
@c Info Directory Entry
@dircategory Emacs
@dircategory Emacs network features
@direntry
* MH-E: (mh-e). Emacs interface to the MH mail system.
@end direntry
@ -212,9 +212,9 @@ However, MH-E was the tip of the iceberg, and I discovered more and
more niceties about GNU Emacs and MH@. Now I'm fully hooked on both of
them.
The MH-E package is distributed with GNU Emacs@footnote{Version
@value{VERSION} of MH-E appeared in GNU Emacs 23.1. It is supported
in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions
The MH-E package is distributed with Emacs@footnote{Version
@value{VERSION} of MH-E appeared in Emacs 23.1. It is supported
in Emacs 21 and 22, as well as XEmacs 21 (except for versions
21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher,
all versions of nmh, and GNU mailutils 1.0 and higher.}, so you
shouldn't have to do anything special to use it. Gnus is also

2
doc/misc/newsticker.texi
View file

@ -30,7 +30,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* Newsticker: (newsticker). A Newsticker for Emacs.
@end direntry

2
doc/misc/nxml-mode.texi
View file

@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* nXML Mode: (nxml-mode). XML editing mode with RELAX NG support.
@end direntry

2
doc/misc/org.texi
View file

@ -66,7 +66,7 @@ license to the document, as described in section 6 of the license.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs editing modes
@direntry
* Org Mode: (org). Outline-based notes management and organizer.
@end direntry

2
doc/misc/pcl-cvs.texi
View file

@ -24,7 +24,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* PCL-CVS: (pcl-cvs). Emacs front-end to CVS.
@end direntry

2
doc/misc/pgg.texi
View file

@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* PGG: (pgg). Emacs interface to various PGP implementations.
@end direntry

2
doc/misc/rcirc.texi
View file

@ -22,7 +22,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* Rcirc: (rcirc). Internet Relay Chat (IRC) client.
@end direntry

2
doc/misc/reftex.texi
View file

@ -44,7 +44,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* RefTeX: (reftex). Emacs support for LaTeX cross-references
and citations.

2
doc/misc/remember.texi
View file

@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Remember: (remember). Simple information manager for Emacs.
@end direntry

2
doc/misc/sasl.texi
View file

@ -30,7 +30,7 @@ license to the document, as described in section 6 of the license.
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* SASL: (sasl). The Emacs SASL library.
@end direntry

2
doc/misc/sc.texi
View file

@ -33,7 +33,7 @@ developing GNU and promoting software freedom.''
@c @smallbook
@dircategory Emacs
@dircategory Emacs network features
@direntry
* SC: (sc). Supercite lets you cite parts of messages
you're replying to, in flexible ways.

2
doc/misc/semantic.texi
View file

@ -41,7 +41,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Semantic: (semantic). Source code parser library and utilities.
@end direntry

2
doc/misc/ses.texi
View file

@ -28,7 +28,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* SES: (ses). Simple Emacs Spreadsheet.
@end direntry

2
doc/misc/sieve.texi
View file

@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs network features
@direntry
* Sieve: (sieve). Managing Sieve scripts in Emacs.
@end direntry

2
doc/misc/smtpmail.texi
View file

@ -20,7 +20,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* SMTP: (smtpmail). Emacs library for sending mail via SMTP.
@end direntry

2
doc/misc/speedbar.texi
View file

@ -21,7 +21,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* Speedbar: (speedbar). File/Tag summarizing utility.
@end direntry

36
doc/misc/tramp.texi
View file

@ -55,7 +55,7 @@ supports it in developing GNU and promoting software freedom.''
@end copying
@c Entries for @command{install-info} to use
@dircategory @value{emacsname}
@dircategory @value{emacsname} network features
@direntry
* TRAMP: (tramp). Transparent Remote Access, Multiple Protocol
@value{emacsname} remote file access via rsh and rcp.
@ -376,13 +376,12 @@ behind the scenes when you open a file with @value{tramp}.
@cindex obtaining Tramp
@value{tramp} is freely available on the Internet and the latest
release may be downloaded from
@uref{ftp://ftp.gnu.org/gnu/tramp/}. This release includes the full
documentation and code for @value{tramp}, suitable for installation.
But GNU Emacs (22 or later) includes @value{tramp} already, and there
is a @value{tramp} package for XEmacs, as well. So maybe it is easier
to just use those. But if you want the bleeding edge, read
on@dots{...}
release may be downloaded from @uref{ftp://ftp.gnu.org/gnu/tramp/}.
This release includes the full documentation and code for
@value{tramp}, suitable for installation. But Emacs (22 or later)
includes @value{tramp} already, and there is a @value{tramp} package
for XEmacs, as well. So maybe it is easier to just use those. But if
you want the bleeding edge, read on@dots{...}
For the especially brave, @value{tramp} is available from CVS. The CVS
version is the latest version of the code and may contain incomplete
@ -455,10 +454,10 @@ Storing files into IMAP mailboxes has been added in September 2009.
@end ifset
In December 2001, @value{tramp} has been added to the XEmacs package
repository. Being part of the GNU Emacs repository happened in June
2002, the first release including @value{tramp} was GNU Emacs 22.1.
repository. Being part of the Emacs repository happened in June 2002,
the first release including @value{tramp} was Emacs 22.1.
@value{tramp} is also a GNU/Linux Debian package since February 2001.
@value{tramp} is also a Debian GNU/Linux package since February 2001.
@c Installation chapter is necessary only in case of standalone
@ -1762,9 +1761,10 @@ By default, this is set to a reasonable set of defaults for most
machines. The symbol @code{tramp-default-remote-path} is a place
holder, it is replaced by the list of directories received via the
command @command{getconf PATH} on your remote machine. For example,
on GNU Debian this is @file{/bin:/usr/bin}, whereas on Solaris this is
@file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}. It is
recommended to apply this symbol on top of @code{tramp-remote-path}.
on Debian GNU/Linux this is @file{/bin:/usr/bin}, whereas on Solaris
this is @file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}.
It is recommended to apply this symbol on top of
@code{tramp-remote-path}.
It is possible, however, that your local (or remote ;) system
administrator has put the tools you want in some obscure local
@ -2757,8 +2757,8 @@ There is also a Savannah project page.
@item
Which systems does it work on?
The package has been used successfully on GNU Emacs 22, GNU Emacs 23,
XEmacs 21 (starting with 21.4), and SXEmacs 22.
The package has been used successfully on Emacs 22, Emacs 23, XEmacs
21 (starting with 21.4), and SXEmacs 22.
The package was intended to work on Unix, and it really expects a
Unix-like system on the remote end (except the @option{smb} and
@ -3597,9 +3597,9 @@ printed and deleted.
But I have decided that this is too fragile to reliably work, so on some
systems you'll have to do without the uuencode methods.
@item The @value{tramp} filename syntax differs between GNU Emacs and XEmacs.
@item The @value{tramp} filename syntax differs between Emacs and XEmacs.
The GNU Emacs maintainers wish to use a unified filename syntax for
The Emacs maintainers wish to use a unified filename syntax for
Ange-FTP and @value{tramp} so that users don't have to learn a new
syntax. It is sufficient to learn some extensions to the old syntax.

4
doc/misc/trampver.texi
View file

@ -44,7 +44,7 @@
@c Emacs values.
@ifset emacs
@set emacsname GNU Emacs
@set emacsname Emacs
@set emacsdir emacs
@set ftppackagename Ange-FTP
@set prefix /
@ -70,7 +70,7 @@
@set postfixhop /
@set ipv6prefix
@set ipv6postfix
@set emacsothername GNU Emacs
@set emacsothername Emacs
@set emacsotherdir emacs
@set emacsotherfilename tramp-emacs.html
@set japanesemanual tramp_ja-xemacs.html

2
doc/misc/url.texi
View file

@ -12,7 +12,7 @@
\overfullrule=0pt
%\global\baselineskip 30pt % for printing in double space
@end tex
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* URL: (url). URL loading package.
@end direntry

2
doc/misc/vip.texi
View file

@ -36,7 +36,7 @@ developing GNU and promoting software freedom.''
@finalout
@contents
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* VIP: (vip). An older VI-emulation for Emacs.
@end direntry

2
doc/misc/viper.texi
View file

@ -24,7 +24,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* VIPER: (viper). The newest Emacs VI-emulation mode.
(also, A VI Plan for Emacs Rescue

2
doc/misc/widget.texi
View file

@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs lisp libraries
@direntry
* Widget: (widget). The "widget" package used by the Emacs
Customization facility.

2
doc/misc/woman.texi
View file

@ -35,7 +35,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@dircategory Emacs
@dircategory Emacs misc features
@direntry
* WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man".
@end direntry

28
lisp/ChangeLog
View file

@ -3,6 +3,34 @@
* mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
header components.
2011-02-19 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to
get the header copy into the temporary buffer.
(rmail-mime-insert-decoded-text): Ignore us-ascii.
(rmail-show-mime): When rmail-mime-coding-system is nil, set
buffer-file-coding-system to undecided.
2011-02-18 Eli Zaretskii <eliz@gnu.org>
* image-mode.el (image-toggle-display-image): Disable
require-final-newline in buffers visiting binary image files.
(Bug#8047)
* international/mule-cmds.el (read-char-by-name, ucs-insert):
Document completion with asterisk and a substring.
2011-02-18 Glenn Morris <rgm@gnu.org>
* files.el (find-file-literally): Doc fix.
2011-02-17 Glenn Morris <rgm@gnu.org>
* simple.el (rfc822-goto-eoh): Give it a doc-string.
* log-edit.el (log-edit-insert-changelog):
Fix `log-edit-strip-single-file-name' functionality. (Bug#8057)
2011-02-14 Chong Yidong <cyd@stupidchicken.com>
* pgg-gpg.el (pgg-gpg-process-region): Bind

3
lisp/files.el
View file

@ -2008,7 +2008,8 @@ Don't call it from programs! Use `insert-file-contents-literally' instead.
(defvar find-file-literally nil
"Non-nil if this buffer was made by `find-file-literally' or equivalent.
This is a permanent local.")
This has the `permanent-local' property, which takes effect if you
make the variable buffer-local.")
(put 'find-file-literally 'permanent-local t)
(defun find-file-literally (filename)

9
lisp/gnus/ChangeLog
View file

@ -1,3 +1,12 @@
2011-02-18 Glenn Morris <rgm@gnu.org>
* gnus.el (gnus-meta): Doc fix.
2011-02-17 Chong Yidong <cyd@stupidchicken.com>
* nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
in case it's not yet loaded.
2011-01-13 Chong Yidong <cyd@stupidchicken.com>
* message.el (message-bury): Add special-case handling for Rmail.

2
lisp/gnus/gnus.el
View file

@ -275,7 +275,7 @@
(defgroup gnus-meta nil
"Meta variables controlling major portions of Gnus.
In general, modifying these variables does not take affect until Gnus
In general, modifying these variables does not take effect until Gnus
is restarted, and sometimes reloaded."
:group 'gnus)

4
lisp/gnus/nnfolder.el
View file

@ -1099,8 +1099,8 @@ This command does not work if you use short group names."
(gnus-make-directory (file-name-directory (buffer-file-name)))
(let ((coding-system-for-write
(or nnfolder-file-coding-system-for-write
nnfolder-file-coding-system))
(copyright-update nil))
nnfolder-file-coding-system)))
(set (make-local-variable 'copyright-update) nil)
(save-buffer)))
(unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
(nnfolder-save-nov)))

5
lisp/image-mode.el
View file

@ -507,6 +507,11 @@ was inserted."
;; This just makes the arrow displayed in the right fringe
;; area look correct when the image is wider than the window.
(setq truncate-lines t)
;; Disable adding a newline at the end of the image file when it
;; is written with, e.g., C-x C-w.
(if (coding-system-equal (coding-system-base buffer-file-coding-system)
'no-conversion)
(set (make-local-variable 'require-final-newline) nil))
;; Allow navigation of large images
(set (make-local-variable 'auto-hscroll-mode) nil)
(setq image-type type)

25
lisp/international/mule-cmds.el
View file

@ -2934,11 +2934,19 @@ on encoding."
(defun read-char-by-name (prompt)
"Read a character by its Unicode name or hex number string.
Display PROMPT and read a string that represents a character by its
Unicode property `name' or `old-name'. You can type a few of first
letters of the Unicode name and use completion. This function also
accepts a hexadecimal number of Unicode code point or a number in
hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984
for decimal. Returns a character as a number."
Unicode property `name' or `old-name'.
This function returns the character as a number.
You can type a few of the first letters of the Unicode name and
use completion. If you type a substring of the Unicode name
preceded by an asterisk `*' and use completion, it will show all
the characters whose names include that substring, not necessarily
at the beginning of the name.
This function also accepts a hexadecimal number of Unicode code
point or a number in hash notation, e.g. #o21430 for octal,
#x2318 for hex, or #10r8984 for decimal."
(let* ((completion-ignore-case t)
(input (completing-read prompt ucs-completions)))
(cond
@ -2953,6 +2961,13 @@ for decimal. Returns a character as a number."
"Insert COUNT copies of CHARACTER of the given Unicode code point.
Interactively, prompts for a Unicode character name or a hex number
using `read-char-by-name'.
You can type a few of the first letters of the Unicode name and
use completion. If you type a substring of the Unicode name
preceded by an asterisk `*' and use completion, it will show all
the characters whose names include that substring, not necessarily
at the beginning of the name.
The optional third arg INHERIT (non-nil when called interactively),
says to inherit text properties from adjoining text, if those
properties are sticky."

20
lisp/log-edit.el
View file

@ -621,14 +621,18 @@ regardless of user name or time."
(delete-region start end)
(rfc822-goto-eoh)
(insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n")))))
(goto-char (point-min))
(when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+"))
(forward-line 1)
(when (not (re-search-forward "^\\*\\s-+" nil t))
(goto-char (point-min))
(skip-chars-forward "^():")
(skip-chars-forward ": ")
(delete-region (point-min) (point))))))
(and log-edit-strip-single-file-name
(progn (rfc822-goto-eoh)
(if (looking-at "\n") (forward-char 1))
(looking-at "\\*\\s-+"))
(let ((start (point)))
(forward-line 1)
(when (not (re-search-forward "^\\*\\s-+" nil t))
(goto-char start)
(skip-chars-forward "^():")
(skip-chars-forward ": ")
(delete-region start (point)))))
(goto-char (point-min))))
;;;;
;;;; functions for getting commit message from ChangeLog a file...

2
lisp/mail/rmail.el
View file

@ -4297,7 +4297,7 @@ With prefix argument N moves forward N messages with these labels.
;;;***
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "7f6ad821b4543a18139fee9250beea5c")
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69")
;;; Generated autoloads from rmailmm.el
(autoload 'rmail-mime "rmailmm" "\

16
lisp/mail/rmailmm.el
View file

@ -471,10 +471,11 @@ See `rmail-mime-entity' for the detail."
HEADER is a header component of a MIME-entity object (see
`rmail-mime-entity')."
(with-temp-buffer
(let ((last-coding-system-used nil))
(let ((buf (current-buffer)))
(with-current-buffer rmail-mime-mbox-buffer
(let ((rmail-buffer rmail-mime-mbox-buffer)
(rmail-view-buffer rmail-mime-view-buffer))
(let ((last-coding-system-used nil)
(rmail-buffer rmail-mime-mbox-buffer)
(rmail-view-buffer buf))
(save-excursion
(goto-char (aref header 0))
(rmail-copy-headers (point) (aref header 1)))))
@ -513,7 +514,9 @@ HEADER is a header component of a MIME-entity object (see
((string= transfer-encoding "quoted-printable")
(quoted-printable-decode-region pos (point))))))
(decode-coding-region pos (point) coding-system)
(if (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
(if (and
(or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
(not (eq (coding-system-base coding-system) 'us-ascii)))
(setq rmail-mime-coding-system coding-system))
(or (bolp) (insert "\n"))))
@ -1301,7 +1304,10 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
(rmail-mime-find-header-encoding
(rmail-mime-entity-header entity)))))
(set-buffer-file-coding-system
(coding-system-base rmail-mime-coding-system) t t))
(if rmail-mime-coding-system
(coding-system-base rmail-mime-coding-system)
'undecided)
t t))
;; Decoding failed. ENTITY is an error message. Insert the
;; original message body as is, and show warning.
(let ((region (with-current-buffer rmail-mime-mbox-buffer

5
lisp/simple.el
View file

@ -5585,7 +5585,10 @@ appears to have customizations applying to the old default,
'mail-send-and-exit)
(defun rfc822-goto-eoh ()
;; Go to header delimiter line in a mail message, following RFC822 rules
"If the buffer starts with a mail header, move point to the header's end.
Otherwise, moves to `point-min'.
The end of the header is the start of the next line, if there is one,
else the end of the last line. This function obeys RFC822."
(goto-char (point-min))
(when (re-search-forward
"^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2011-02-19 Chong Yidong <cyd@stupidchicken.com>
* Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
2011-02-17 Kenichi Handa <handa@m17n.org>
* font.c (font_open_entity): Be sure to set scaled_pixel_size.

2
src/Makefile.in
View file

@ -979,7 +979,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre
often contain options that have to do with using Emacs''s crt0,
which are only good with temacs. */
prefix-args${EXEEXT}: prefix-args.o $(config_h)
$(CC) $(LDFLAGS) prefix-args.o -o prefix-args
$(CC) $(ALL_CFLAGS) $(LDFLAGS) prefix-args.o -o prefix-args
#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK)