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

Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

Browse source
This commit is contained in:
Glenn Morris 2011-02-19 11:40:59 -08:00
commit 67ab0163d6
67 changed files with 252 additions and 76 deletions
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-14 Jan Djärv <jan.h.d@swipnet.se>
* xresources.texi (X Resources): Remove *faceName and replace it with

2
doc/emacs/dired.texi
View file

@ -23,7 +23,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-19 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
2011-01-23 Werner Lemberg <wl@gnu.org>
* Makefile.in (MAKEINFO): Now controlled by `configure'.

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.

20
doc/lispref/ChangeLog
View file

@ -1,3 +1,23 @@
2011-02-19 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.
* 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-19 Glenn Morris <rgm@gnu.org>
* keymaps.texi (Remapping Commands): Mention how to undo it.
2011-02-09 Reuben Thomas <rrt@sc3d.org>
* loading.texi (Hooks for Loading): Remove unnecessary advice

2
doc/lispref/elisp.texi
View file

@ -62,7 +62,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

@ -113,6 +113,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
@ -224,6 +244,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

@ -1508,6 +1508,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

@ -1407,6 +1407,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.

50
doc/misc/ChangeLog
View file

@ -1,3 +1,53 @@
2011-02-19 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-19 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Technical Details): No longer redefines dired-add-entry,

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

@ -19,7 +19,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

2
doc/misc/auth.texi
View file

@ -32,7 +32,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

2
doc/misc/autotype.texi
View file

@ -26,7 +26,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

@ -111,7 +111,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

@ -177,7 +177,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

@ -21,7 +21,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

@ -25,7 +25,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

@ -36,7 +36,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

@ -26,7 +26,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

@ -21,9 +21,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

@ -41,7 +41,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

2
doc/misc/edt.texi
View file

@ -22,7 +22,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

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

@ -30,7 +30,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

2
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

2
doc/misc/eshell.texi
View file

@ -24,7 +24,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

@ -28,7 +28,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

@ -34,7 +34,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.

2
doc/misc/gnus.texi
View file

@ -321,7 +321,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

2
doc/misc/idlwave.texi
View file

@ -38,7 +38,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

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

@ -26,7 +26,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.

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

@ -55,7 +55,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

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

@ -286,7 +286,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

@ -23,7 +23,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

@ -27,7 +27,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

@ -43,7 +43,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

@ -33,7 +33,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

@ -32,7 +32,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

@ -40,7 +40,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

@ -27,7 +27,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

@ -27,7 +27,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

@ -20,7 +20,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

2
doc/misc/tramp.texi
View file

@ -54,7 +54,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.

2
doc/misc/trampver.texi
View file

@ -38,7 +38,7 @@
@c Emacs values.
@ifset emacs
@set emacsname GNU Emacs
@set emacsname Emacs
@set emacsdir emacs
@set ftppackagename Ange-FTP
@set prefix /

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

@ -35,7 +35,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

@ -23,7 +23,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

@ -24,7 +24,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

@ -34,7 +34,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

22
lisp/ChangeLog
View file

@ -1,3 +1,25 @@
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-19 Eli Zaretskii <eliz@gnu.org>
* international/mule-cmds.el (read-char-by-name, ucs-insert):
Document completion with asterisk and a substring.
2011-02-19 Glenn Morris <rgm@gnu.org>
* files.el (find-file-literally): Doc fix.
* 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-19 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-read-shell-command): Merge into dired-aux's version.

3
lisp/files.el
View file

@ -2072,7 +2072,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-19 Glenn Morris <rgm@gnu.org>
* gnus.el (gnus-meta): Doc fix.
2011-02-19 Chong Yidong <cyd@stupidchicken.com>
* nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
in case it's not yet loaded.
2011-02-19 Lars Ingebrigtsen <larsi@gnus.org>
* nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"

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

@ -1090,8 +1090,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)))

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

@ -2938,11 +2938,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
@ -2957,6 +2965,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."

2
lisp/mail/rmail.el
View file

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

16
lisp/mail/rmailmm.el
View file

@ -472,10 +472,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)))))
@ -514,7 +515,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"))))
@ -1302,7 +1305,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

@ -5723,7 +5723,10 @@ appears to have customizations applying to the old default,
:group 'mail)
(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)

20
lisp/vc/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...