[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103351: Merge from emacs-23; up to r
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103351: Merge from emacs-23; up to r100491 |
|
Date: |
Sat, 19 Feb 2011 11:40:59 -0800 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103351 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-19 11:40:59 -0800
message:
Merge from emacs-23; up to r100491
modified:
doc/emacs/ChangeLog
doc/emacs/dired.texi
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/files.texi
doc/lispref/keymaps.texi
doc/lispref/variables.texi
doc/misc/ChangeLog
doc/misc/ada-mode.texi
doc/misc/auth.texi
doc/misc/autotype.texi
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/cl.texi
doc/misc/dbus.texi
doc/misc/dired-x.texi
doc/misc/ebrowse.texi
doc/misc/ede.texi
doc/misc/ediff.texi
doc/misc/edt.texi
doc/misc/eieio.texi
doc/misc/emacs-mime.texi
doc/misc/epa.texi
doc/misc/erc.texi
doc/misc/eshell.texi
doc/misc/eudc.texi
doc/misc/flymake.texi
doc/misc/forms.texi
doc/misc/gnus.texi
doc/misc/idlwave.texi
doc/misc/mairix-el.texi
doc/misc/message.texi
doc/misc/mh-e.texi
doc/misc/newsticker.texi
doc/misc/nxml-mode.texi
doc/misc/org.texi
doc/misc/pcl-cvs.texi
doc/misc/pgg.texi
doc/misc/rcirc.texi
doc/misc/reftex.texi
doc/misc/remember.texi
doc/misc/sasl.texi
doc/misc/sc.texi
doc/misc/semantic.texi
doc/misc/ses.texi
doc/misc/sieve.texi
doc/misc/smtpmail.texi
doc/misc/speedbar.texi
doc/misc/tramp.texi
doc/misc/trampver.texi
doc/misc/url.texi
doc/misc/vip.texi
doc/misc/viper.texi
doc/misc/widget.texi
doc/misc/woman.texi
lisp/ChangeLog
lisp/files.el
lisp/gnus/ChangeLog
lisp/gnus/gnus.el
lisp/gnus/nnfolder.el
lisp/international/mule-cmds.el
lisp/mail/rmail.el
lisp/mail/rmailmm.el
lisp/simple.el
lisp/vc/log-edit.el
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2011-02-14 17:21:10 +0000
+++ b/doc/emacs/ChangeLog 2011-02-19 19:40:59 +0000
@@ -1,3 +1,7 @@
+2011-02-19 Glenn Morris <address@hidden>
+
+ * dired.texi (Dired): Dired-X version number was dropped.
+
2011-02-14 Jan Djärv <address@hidden>
* xresources.texi (X Resources): Remove *faceName and replace it with
=== modified file 'doc/emacs/dired.texi'
--- a/doc/emacs/dired.texi 2011-01-25 04:08:28 +0000
+++ b/doc/emacs/dired.texi 2011-02-19 19:40:59 +0000
@@ -23,7 +23,7 @@
them with one command.
The Dired-X package provides various extra features for Dired mode.
address@hidden, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}.
address@hidden, 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
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2011-01-25 04:08:28 +0000
+++ b/doc/lispintro/ChangeLog 2011-02-19 19:40:59 +0000
@@ -1,3 +1,7 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
+
2011-01-23 Werner Lemberg <address@hidden>
* Makefile.in (MAKEINFO): Now controlled by `configure'.
=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi 2011-01-25 04:08:28 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi 2011-02-19 19:40:59 +0000
@@ -216,7 +216,7 @@
@c ----------------------------------------------------
address@hidden Emacs
address@hidden GNU Emacs Lisp
@direntry
* Emacs Lisp Intro: (eintr).
A simple introduction to Emacs Lisp programming.
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-02-09 00:28:06 +0000
+++ b/doc/lispref/ChangeLog 2011-02-19 19:40:59 +0000
@@ -1,3 +1,23 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
+
+ * keymaps.texi (Remapping Commands): Mention how to undo it.
+
2011-02-09 Reuben Thomas <address@hidden>
* loading.texi (Hooks for Loading): Remove unnecessary advice
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2011-02-16 08:39:19 +0000
+++ b/doc/lispref/elisp.texi 2011-02-19 19:40:59 +0000
@@ -62,7 +62,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden GNU Emacs Lisp
@direntry
* Elisp: (elisp). The Emacs Lisp Reference Manual.
@end direntry
=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi 2011-01-25 04:08:28 +0000
+++ b/doc/lispref/files.texi 2011-02-19 19:40:59 +0000
@@ -113,6 +113,26 @@
@var{filename} in the minibuffer.
@end deffn
address@hidden 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
address@hidden (@pxref{Reading from Files}).
address@hidden 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 @@
used, and in many cases only some of the functions are called.
@end defvar
address@hidden find-file-literally
+This buffer-local variable, if set to a address@hidden value, makes
address@hidden behave as if the buffer were visiting its file
+literally, i.e. without conversions of any kind. The command
address@hidden 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.
address@hidden defvar
+
@node Subroutines of Visiting
@comment node-name, next, previous, up
@subsection Subroutines of Visiting
=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi 2011-01-31 23:54:50 +0000
+++ b/doc/lispref/keymaps.texi 2011-02-19 19:40:59 +0000
@@ -1508,6 +1508,12 @@
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.
+
address@hidden
+(define-key my-mode-map [remap kill-line] nil)
address@hidden 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
=== modified file 'doc/lispref/variables.texi'
--- a/doc/lispref/variables.texi 2011-01-25 04:08:28 +0000
+++ b/doc/lispref/variables.texi 2011-02-19 19:40:59 +0000
@@ -1407,6 +1407,8 @@
@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 address@hidden
+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.
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2011-02-19 19:20:38 +0000
+++ b/doc/misc/ChangeLog 2011-02-19 19:40:59 +0000
@@ -1,3 +1,53 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* dired-x.texi (Technical Details): No longer redefines dired-add-entry,
=== modified file 'doc/misc/ada-mode.texi'
--- a/doc/misc/ada-mode.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/ada-mode.texi 2011-02-19 19:40:59 +0000
@@ -19,7 +19,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs editing modes
@direntry
* Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code.
@end direntry
=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi 2011-02-17 23:46:18 +0000
+++ b/doc/misc/auth.texi 2011-02-19 19:40:59 +0000
@@ -32,7 +32,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* Auth-source: (auth). The Emacs auth-source library.
@end direntry
=== modified file 'doc/misc/autotype.texi'
--- a/doc/misc/autotype.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/autotype.texi 2011-02-19 19:40:59 +0000
@@ -26,7 +26,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Autotype: (autotype). Convenient features for text that you
enter frequently in Emacs.
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2011-02-07 01:40:47 +0000
+++ b/doc/misc/calc.texi 2011-02-19 19:40:59 +0000
@@ -111,7 +111,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Calc: (calc). Advanced desk calculator and mathematical tool.
@end direntry
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/cc-mode.texi 2011-02-19 19:40:59 +0000
@@ -177,7 +177,7 @@
@comment Info directory entry for use by install-info. The indentation
@comment here is by request from the FSF folks.
address@hidden Emacs
address@hidden Emacs editing modes
@direntry
* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C,
Java, Pike, AWK, and CORBA IDL code.
=== modified file 'doc/misc/cl.texi'
--- a/doc/misc/cl.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/cl.texi 2011-02-19 19:40:59 +0000
@@ -21,7 +21,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* CL: (cl). Partial Common Lisp support for Emacs Lisp.
@end direntry
=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi 2011-02-07 09:21:08 +0000
+++ b/doc/misc/dbus.texi 2011-02-19 19:40:59 +0000
@@ -25,7 +25,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* D-Bus: (dbus). Using D-Bus in Emacs.
@end direntry
=== modified file 'doc/misc/dired-x.texi'
--- a/doc/misc/dired-x.texi 2011-02-19 19:20:38 +0000
+++ b/doc/misc/dired-x.texi 2011-02-19 19:40:59 +0000
@@ -36,7 +36,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Dired-X: (dired-x). Dired Extra Features.
@end direntry
=== modified file 'doc/misc/ebrowse.texi'
--- a/doc/misc/ebrowse.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/ebrowse.texi 2011-02-19 19:40:59 +0000
@@ -26,7 +26,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Ebrowse: (ebrowse). A C++ class browser for Emacs.
@end direntry
=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/ede.texi 2011-02-19 19:40:59 +0000
@@ -21,9 +21,9 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
-* ede: (ede). Project management for Emacs.
+* EDE: (ede). The Emacs Development Environment.
@end direntry
@titlepage
=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/ediff.texi 2011-02-19 19:40:59 +0000
@@ -41,7 +41,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Ediff: (ediff). A visual interface for comparing and merging programs.
@end direntry
=== modified file 'doc/misc/edt.texi'
--- a/doc/misc/edt.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/edt.texi 2011-02-19 19:40:59 +0000
@@ -22,7 +22,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* EDT: (edt). An Emacs emulation of the EDT editor.
@end direntry
=== modified file 'doc/misc/eieio.texi'
--- a/doc/misc/eieio.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/eieio.texi 2011-02-19 19:40:59 +0000
@@ -27,9 +27,9 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
-* eieio: (eieio). Objects for Emacs.
+* EIEIO: (eieio). An objects system for Emacs Lisp.
@end direntry
@titlepage
=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi 2011-02-06 00:25:41 +0000
+++ b/doc/misc/emacs-mime.texi 2011-02-19 19:40:59 +0000
@@ -30,7 +30,7 @@
@c Node ``Interface Functions'' uses Latin-1 characters
@documentencoding ISO-8859-1
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* Emacs MIME: (emacs-mime). Emacs MIME de/composition library.
@end direntry
=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/epa.texi 2011-02-19 19:40:59 +0000
@@ -31,7 +31,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard.
@end direntry
=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/erc.texi 2011-02-19 19:40:59 +0000
@@ -28,7 +28,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* ERC: (erc). Powerful and extensible IRC client for Emacs.
@end direntry
=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/eshell.texi 2011-02-19 19:40:59 +0000
@@ -24,7 +24,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Eshell: (eshell). A command shell implemented in Emacs Lisp.
@end direntry
=== modified file 'doc/misc/eudc.texi'
--- a/doc/misc/eudc.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/eudc.texi 2011-02-19 19:40:59 +0000
@@ -28,7 +28,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* EUDC: (eudc). Emacs client for directory servers (LDAP, PH).
@end direntry
=== modified file 'doc/misc/flymake.texi'
--- a/doc/misc/flymake.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/flymake.texi 2011-02-19 19:40:59 +0000
@@ -28,7 +28,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Flymake: (flymake). A universal on-the-fly syntax checker.
@end direntry
=== modified file 'doc/misc/forms.texi'
--- a/doc/misc/forms.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/forms.texi 2011-02-19 19:40:59 +0000
@@ -34,7 +34,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Forms: (forms). Emacs package for editing data bases
by filling in forms.
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2011-02-06 00:25:41 +0000
+++ b/doc/misc/gnus.texi 2011-02-19 19:40:59 +0000
@@ -321,7 +321,7 @@
@end iflatex
@end iftex
address@hidden Emacs
address@hidden Emacs network features
@direntry
* Gnus: (gnus). The newsreader Gnus.
@end direntry
=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/idlwave.texi 2011-02-19 19:40:59 +0000
@@ -38,7 +38,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs editing modes
@direntry
* IDLWAVE: (idlwave). Major mode and shell for IDL files.
@end direntry
=== modified file 'doc/misc/mairix-el.texi'
--- a/doc/misc/mairix-el.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/mairix-el.texi 2011-02-19 19:40:59 +0000
@@ -22,7 +22,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* Mairix: (mairix-el). Emacs interface to the Mairix mail indexer.
@end direntry
=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi 2011-02-06 00:25:41 +0000
+++ b/doc/misc/message.texi 2011-02-19 19:40:59 +0000
@@ -26,7 +26,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* Message: (message). Mail and news composition mode that
goes with Gnus.
=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/mh-e.texi 2011-02-19 19:40:59 +0000
@@ -55,7 +55,7 @@
@end copying
@c Info Directory Entry
address@hidden Emacs
address@hidden Emacs network features
@direntry
* MH-E: (mh-e). Emacs interface to the MH mail system.
@end direntry
=== modified file 'doc/misc/newsticker.texi'
--- a/doc/misc/newsticker.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/newsticker.texi 2011-02-19 19:40:59 +0000
@@ -30,7 +30,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* Newsticker: (newsticker). A Newsticker for Emacs.
@end direntry
=== modified file 'doc/misc/nxml-mode.texi'
--- a/doc/misc/nxml-mode.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/nxml-mode.texi 2011-02-19 19:40:59 +0000
@@ -31,7 +31,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs editing modes
@direntry
* nXML Mode: (nxml-mode). XML editing mode with RELAX NG support.
@end direntry
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/org.texi 2011-02-19 19:40:59 +0000
@@ -286,7 +286,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs editing modes
@direntry
* Org Mode: (org). Outline-based notes management and organizer
@end direntry
=== modified file 'doc/misc/pcl-cvs.texi'
--- a/doc/misc/pcl-cvs.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/pcl-cvs.texi 2011-02-19 19:40:59 +0000
@@ -23,7 +23,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* PCL-CVS: (pcl-cvs). Emacs front-end to CVS.
@end direntry
=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2011-02-06 00:25:41 +0000
+++ b/doc/misc/pgg.texi 2011-02-19 19:40:59 +0000
@@ -27,7 +27,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* PGG: (pgg). Emacs interface to various PGP implementations.
@end direntry
=== modified file 'doc/misc/rcirc.texi'
--- a/doc/misc/rcirc.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/rcirc.texi 2011-02-19 19:40:59 +0000
@@ -22,7 +22,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* Rcirc: (rcirc). Internet Relay Chat (IRC) client.
@end direntry
=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/reftex.texi 2011-02-19 19:40:59 +0000
@@ -43,7 +43,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* RefTeX: (reftex). Emacs support for LaTeX cross-references
and citations.
=== modified file 'doc/misc/remember.texi'
--- a/doc/misc/remember.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/remember.texi 2011-02-19 19:40:59 +0000
@@ -25,7 +25,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Remember: (remember). Simple information manager for Emacs.
@end direntry
=== modified file 'doc/misc/sasl.texi'
--- a/doc/misc/sasl.texi 2011-02-06 00:25:41 +0000
+++ b/doc/misc/sasl.texi 2011-02-19 19:40:59 +0000
@@ -33,7 +33,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* SASL: (sasl). The Emacs SASL library.
@end direntry
=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/sc.texi 2011-02-19 19:40:59 +0000
@@ -32,7 +32,7 @@
@c @smallbook
address@hidden Emacs
address@hidden Emacs network features
@direntry
* SC: (sc). Supercite lets you cite parts of messages
you're replying to, in flexible ways.
=== modified file 'doc/misc/semantic.texi'
--- a/doc/misc/semantic.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/semantic.texi 2011-02-19 19:40:59 +0000
@@ -40,7 +40,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Semantic: (semantic). Source code parser library and utilities.
@end direntry
=== modified file 'doc/misc/ses.texi'
--- a/doc/misc/ses.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/ses.texi 2011-02-19 19:40:59 +0000
@@ -27,7 +27,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* SES: (ses). Simple Emacs Spreadsheet.
@end direntry
=== modified file 'doc/misc/sieve.texi'
--- a/doc/misc/sieve.texi 2011-02-06 00:25:41 +0000
+++ b/doc/misc/sieve.texi 2011-02-19 19:40:59 +0000
@@ -27,7 +27,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs network features
@direntry
* Sieve: (sieve). Managing Sieve scripts in Emacs.
@end direntry
=== modified file 'doc/misc/smtpmail.texi'
--- a/doc/misc/smtpmail.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/smtpmail.texi 2011-02-19 19:40:59 +0000
@@ -20,7 +20,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* SMTP: (smtpmail). Emacs library for sending mail via SMTP.
@end direntry
=== modified file 'doc/misc/speedbar.texi'
--- a/doc/misc/speedbar.texi 2011-02-13 02:21:30 +0000
+++ b/doc/misc/speedbar.texi 2011-02-19 19:40:59 +0000
@@ -20,7 +20,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* Speedbar: (speedbar). File/Tag summarizing utility.
@end direntry
=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi 2011-02-13 12:21:04 +0000
+++ b/doc/misc/tramp.texi 2011-02-19 19:40:59 +0000
@@ -54,7 +54,7 @@
@end copying
@c Entries for @command{install-info} to use
address@hidden @value{emacsname}
address@hidden @value{emacsname} network features
@direntry
* TRAMP: (tramp). Transparent Remote Access, Multiple Protocol
@value{emacsname} remote file access via rsh
and rcp.
=== modified file 'doc/misc/trampver.texi'
--- a/doc/misc/trampver.texi 2011-02-13 12:21:04 +0000
+++ b/doc/misc/trampver.texi 2011-02-19 19:40:59 +0000
@@ -38,7 +38,7 @@
@c Emacs values.
@ifset emacs
address@hidden emacsname GNU Emacs
address@hidden emacsname Emacs
@set emacsdir emacs
@set ftppackagename Ange-FTP
@set prefix /
=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2011-02-12 23:40:43 +0000
+++ b/doc/misc/url.texi 2011-02-19 19:40:59 +0000
@@ -12,7 +12,7 @@
\overfullrule=0pt
%\global\baselineskip 30pt % for printing in double space
@end tex
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* URL: (url). URL loading package.
@end direntry
=== modified file 'doc/misc/vip.texi'
--- a/doc/misc/vip.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/vip.texi 2011-02-19 19:40:59 +0000
@@ -35,7 +35,7 @@
@finalout
@contents
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* VIP: (vip). An older VI-emulation for Emacs.
@end direntry
=== modified file 'doc/misc/viper.texi'
--- a/doc/misc/viper.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/viper.texi 2011-02-19 19:40:59 +0000
@@ -23,7 +23,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* VIPER: (viper). The newest Emacs VI-emulation mode.
(also, A VI Plan for Emacs Rescue
=== modified file 'doc/misc/widget.texi'
--- a/doc/misc/widget.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/widget.texi 2011-02-19 19:40:59 +0000
@@ -24,7 +24,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs lisp libraries
@direntry
* Widget: (widget). The "widget" package used by the Emacs
Customization facility.
=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/woman.texi 2011-02-19 19:40:59 +0000
@@ -34,7 +34,7 @@
@end quotation
@end copying
address@hidden Emacs
address@hidden Emacs misc features
@direntry
* WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man".
@end direntry
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-02-19 19:20:38 +0000
+++ b/lisp/ChangeLog 2011-02-19 19:40:59 +0000
@@ -1,3 +1,25 @@
+2011-02-19 Kenichi Handa <address@hidden>
+
+ * 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 <address@hidden>
+
+ * international/mule-cmds.el (read-char-by-name, ucs-insert):
+ Document completion with asterisk and a substring.
+
+2011-02-19 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* dired-x.el (dired-read-shell-command): Merge into dired-aux's version.
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2011-02-18 17:18:16 +0000
+++ b/lisp/files.el 2011-02-19 19:40:59 +0000
@@ -2072,7 +2072,8 @@
(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)
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-02-19 09:45:07 +0000
+++ b/lisp/gnus/ChangeLog 2011-02-19 19:40:59 +0000
@@ -1,3 +1,12 @@
+2011-02-19 Glenn Morris <address@hidden>
+
+ * gnus.el (gnus-meta): Doc fix.
+
+2011-02-19 Chong Yidong <address@hidden>
+
+ * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
+ in case it's not yet loaded.
+
2011-02-19 Lars Ingebrigtsen <address@hidden>
* nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK"
=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-02-03 23:43:22 +0000
+++ b/lisp/gnus/gnus.el 2011-02-19 19:40:59 +0000
@@ -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)
=== modified file 'lisp/gnus/nnfolder.el'
--- a/lisp/gnus/nnfolder.el 2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/nnfolder.el 2011-02-19 19:40:59 +0000
@@ -1090,8 +1090,8 @@
(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)))
=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el 2011-01-25 04:08:28 +0000
+++ b/lisp/international/mule-cmds.el 2011-02-19 19:40:59 +0000
@@ -2938,11 +2938,19 @@
(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 @@
"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."
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2011-02-12 21:45:42 +0000
+++ b/lisp/mail/rmail.el 2011-02-19 19:40:59 +0000
@@ -4306,7 +4306,7 @@
;;;***
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el"
"3e235bdf4c2e54da06abcdd72e7f7649")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el"
"9c0902449733cabd5c7e7d17092a7c69")
;;; Generated autoloads from rmailmm.el
(autoload 'rmail-mime "rmailmm" "\
=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el 2011-01-25 04:08:28 +0000
+++ b/lisp/mail/rmailmm.el 2011-02-19 19:40:59 +0000
@@ -472,10 +472,11 @@
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 @@
((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 @@
(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
=== modified file 'lisp/simple.el'
--- a/lisp/simple.el 2011-02-16 21:06:23 +0000
+++ b/lisp/simple.el 2011-02-19 19:40:59 +0000
@@ -5723,7 +5723,10 @@
: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)
=== modified file 'lisp/vc/log-edit.el'
--- a/lisp/vc/log-edit.el 2011-01-25 04:08:28 +0000
+++ b/lisp/vc/log-edit.el 2011-02-19 19:40:59 +0000
@@ -621,14 +621,18 @@
(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...
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103351: Merge from emacs-23; up to r100491,
Glenn Morris <=