Commit cce7d530 authored by Glenn Morris's avatar Glenn Morris

Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.

parents 4902e827 51a13bdd
2011-02-23 Juanma Barranquero <lekktu@gmail.com>
* notes/bugtracker (bugtracker_debbugs_url): Fix typo.
2011-02-19 Eli Zaretskii <eliz@gnu.org>
* admin.el (set-version): Add msdos/sed2v2.inp.
......
......@@ -489,7 +489,7 @@ Here "{id}" is a literal string, a placeholder that will be replaced
by the bug number you specify after `--fixes debbugs:' in the bzr
command line (123 in the example above).
In the bazaar.conf file, this setting should go into the [DEFAULTS]
In the bazaar.conf file, this setting should go into the [DEFAULT]
section.
In the locations.conf file, it should go into the branch-specific
......
2011-02-23 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-23 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Features): Minor rephrasing.
(Local Variables): Fix typos.
* edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi:
Standardize some Emacs/XEmacs terminology.
* dired-x.texi (Features): Don't advertise obsolete local variables.
Simplify layout.
(Omitting Variables): Update local variables example.
......
......@@ -152,10 +152,10 @@ Commands using file marking
@noindent
@file{dired-x.el} binds some functions to keys in Dired Mode (@pxref{Key
Index}) and also binds @kbd{C-x C-j} and @kbd{C-x 4 C-j} @emph{globally} to
@code{dired-jump} (@pxref{Miscellaneous Commands}). It may also bind @kbd{C-x
C-f} and @kbd{C-x 4 C-f} to @code{dired-x-find-file} and
@code{dired-x-find-file-other-window}, respectively (@pxref{Find File At
Point}).
@code{dired-jump} (@pxref{Miscellaneous Commands}). Optionally, it
also binds @kbd{C-x C-f} and @kbd{C-x 4 C-f} to
@code{dired-x-find-file} and @code{dired-x-find-file-other-window},
respectively (@pxref{Find File At Point}).
@node Technical Details, , Features, Introduction
@section Technical Details
......@@ -514,7 +514,7 @@ omitted automatically
@noindent
You can set @code{dired-local-variables-file} to @code{nil} to suppress this.
The value of @code{dired-enable-local-variables} controls if and how these
local variables are read. This variable exists so that if may override the
local variables are read. This variable exists so that it may override the
default value of @code{enable-local-variables}.
@noindent
......
......@@ -87,7 +87,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
......@@ -218,7 +218,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
......@@ -237,7 +237,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
......@@ -285,13 +285,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
......@@ -306,7 +306,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
......@@ -321,8 +321,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
......@@ -364,7 +364,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
......@@ -436,7 +436,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
......@@ -518,7 +518,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
......@@ -541,7 +541,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
......@@ -783,7 +783,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
......@@ -898,8 +898,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
......
......@@ -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.
......
......@@ -22498,7 +22498,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.)
......@@ -27766,7 +27766,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
......@@ -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
......
......@@ -211,9 +211,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
......
No preview for this file type
......@@ -63,7 +63,7 @@
@set postfixhop /
@set ipv6prefix
@set ipv6postfix
@set emacsothername GNU Emacs
@set emacsothername Emacs
@set emacsotherdir emacs
@set emacsotherfilename tramp-emacs.html
@end ifset
2011-02-23 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an
error when a multipart boundary in the nested multipart is found.
* mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
header components.
2011-02-23 Glenn Morris <rgm@gnu.org>
* dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer.
......
......@@ -3443,6 +3443,16 @@ does not pop any summary buffer."
(setq yank-action (list 'insert-buffer replybuffer)))
(push (cons "cc" cc) other-headers)
(push (cons "in-reply-to" in-reply-to) other-headers)
(setq other-headers
(mapcar #'(lambda (elt)
(cons (car elt) (if (stringp (cdr elt))
(rfc2047-decode-string (cdr elt)))))
other-headers))
(if (stringp to) (setq to (rfc2047-decode-string to)))
(if (stringp in-reply-to)
(setq in-reply-to (rfc2047-decode-string in-reply-to)))
(if (stringp cc) (setq cc (rfc2047-decode-string cc)))
(if (stringp subject) (setq subject (rfc2047-decode-string subject)))
(prog1
(compose-mail to subject other-headers noerase
switch-function yank-action sendactions
......@@ -3450,7 +3460,7 @@ does not pop any summary buffer."
(if (eq switch-function 'switch-to-buffer-other-frame)
;; This is not a standard frame parameter; nothing except
;; sendmail.el looks at it.
(modify-frame-parameters (selected-frame)
(modify-frame-parameters (selected-frame)
'((mail-dedicated-frame . t)))))))
(defun rmail-mail-return ()
......
......@@ -853,28 +853,33 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
((looking-at "[ \t]*\n")
(setq next (copy-marker (match-end 0) t)))
(t
(rmail-mm-get-boundary-error-message
"Malformed boundary" content-type content-disposition
content-transfer-encoding)))
(setq index (1+ index))
;; Handle the part.
(if parse-tag
;; The original code signalled an error as below, but
;; this line may be a boundary of nested multipart. So,
;; we just set `next' to nil to skip this line
;; (rmail-mm-get-boundary-error-message
;; "Malformed boundary" content-type content-disposition
;; content-transfer-encoding)
(setq next nil)))
(when next
(setq index (1+ index))
;; Handle the part.
(if parse-tag
(save-restriction
(narrow-to-region beg end)
(let ((child (rmail-mime-process
nil (format "%s/%d" parse-tag index)
content-type content-disposition)))
;; Display a tagline.
(aset (aref (rmail-mime-entity-display child) 1) 1
(aset (rmail-mime-entity-tagline child) 2 t))
(push child entities)))
(delete-region end next)
(save-restriction
(narrow-to-region beg end)
(let ((child (rmail-mime-process
nil (format "%s/%d" parse-tag index)
content-type content-disposition)))
;; Display a tagline.
(aset (aref (rmail-mime-entity-display child) 1) 1
(aset (rmail-mime-entity-tagline child) 2 t))
(push child entities)))
(delete-region end next)
(save-restriction
(narrow-to-region beg end)
(rmail-mime-show)))
(goto-char (setq beg next)))
(rmail-mime-show)))
(goto-char (setq beg next))))
(when parse-tag
(setq entities (nreverse entities))
......
2011-02-23 Kenichi Handa <handa@m17n.org>
* font.c (font_open_entity): Be sure to set scaled_pixel_size.
(font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is integer.
2011-02-22 Paul Eggert <eggert@cs.ucla.edu>
* dired.c (Ffile_attributes): Simplify and avoid #ifdef.
......@@ -2806,7 +2806,7 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
Lisp_Object objlist, size, val, font_object;
struct font *font;
int min_width, height;
int scaled_pixel_size;
int scaled_pixel_size = pixel_size;
font_assert (FONT_ENTITY_P (entity));
size = AREF (entity, FONT_SIZE_INDEX);
......@@ -3121,7 +3121,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
XSETFRAME (frame, f);
size = AREF (spec, FONT_SIZE_INDEX);
pixel_size = font_pixel_size (f, spec);
if (pixel_size == 0)
if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
{
double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment