From dbc0543206eafc2e3bcad46e19629d817f496cf5 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 17 Feb 2011 16:47:29 +0900 Subject: [PATCH 1/9] Fix font-size handling bug. --- src/ChangeLog | 6 ++++++ src/font.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 68e9c76a437..6b3c5bc3ab4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-17 Kenichi Handa + + * 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-13 Eli Zaretskii * xdisp.c (redisplay_internal): Resynchronize `w' if the selected diff --git a/src/font.c b/src/font.c index ebf0b547b9f..08309d3697b 100644 --- a/src/font.c +++ b/src/font.c @@ -3042,7 +3042,7 @@ font_open_entity (f, entity, 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); @@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, 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]); From 6e7fa8e2d9458c05e2ea8dcbed74c4ed2a21c06e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 19 Feb 2011 20:55:44 +0100 Subject: [PATCH 2/9] * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and "Debian GNU/Linux". * trampver.texi [xemacs]: Set emacsothername to "Emacs". --- doc/misc/ChangeLog | 7 +++++++ doc/misc/tramp.texi | 34 +++++++++++++++++----------------- doc/misc/trampver.texi | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 8d1c5dc46ab..d2ba81618b3 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,10 @@ +2011-02-19 Michael Albinus + + * 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 * ada-mode.texi: Sync @dircategory with ../../info/dir. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 8a7cbf6a69d..f76df61335c 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -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. diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 3cde3eb4bfc..1cfcba637ae 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -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 From 47301027bbbbd1babcfedf1ef38b2c776b33c462 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 19 Feb 2011 13:20:34 -0800 Subject: [PATCH 3/9] doc/misc minor stylistic changes. * doc/misc/edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi: Standardize some Emacs/XEmacs terminology. --- doc/misc/ChangeLog | 5 +++++ doc/misc/edt.texi | 30 +++++++++++++++--------------- doc/misc/erc.texi | 2 +- doc/misc/gnus.texi | 4 ++-- doc/misc/idlwave.texi | 2 +- doc/misc/mh-e.texi | 6 +++--- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d2ba81618b3..1f153db305f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2011-02-19 Glenn Morris + + * edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi: + Standardize some Emacs/XEmacs terminology. + 2011-02-19 Michael Albinus * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index d5a28481352..68c2db73361 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -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 diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 8056845e4d3..aa7cb893fd7 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -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. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 6cd603d9d0a..a3b5ddde4a1 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -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 diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 02924d7472f..54088cef210 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -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 diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index a0ab0d7a4f9..17594701997 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -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 From 1f459fa46cbd419bc55f8be03bce617d96af4da5 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 22 Feb 2011 09:19:08 +0900 Subject: [PATCH 4/9] Decode "encoded-words" of header components on replying. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmail.el | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d8446cef10..65b4ec8d400 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-21 Kenichi Handa + + * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of + header components. + 2011-02-14 Chong Yidong * pgg-gpg.el (pgg-gpg-process-region): Bind diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 370999dabf8..94f5ce45054 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3449,6 +3449,16 @@ does not pop any summary buffer." (setq yank-action (list 'insert-buffer replybuffer))) (setq others (cons (cons "cc" cc) others)) (setq others (cons (cons "in-reply-to" in-reply-to) others)) + (setq others + (mapcar #'(lambda (elt) + (cons (car elt) (if (stringp (cdr elt)) + (rfc2047-decode-string (cdr elt))))) + others)) + (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))) (if same-window (compose-mail to subject others noerase nil From 31fdb5440874d2fa9fd6e8458dda6f508275fec6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 22 Feb 2011 02:04:16 +0100 Subject: [PATCH 5/9] admin/notes/bugtracker (bugtracker_debbugs_url): Fix typo. --- admin/ChangeLog | 4 ++++ admin/notes/bugtracker | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 33b091ba0b9..d0e7b78f2e8 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-02-22 Juanma Barranquero + + * notes/bugtracker (bugtracker_debbugs_url): Fix typo. + 2011-01-03 Glenn Morris * admin.el (set-copyright): Also handle \year in refcards/*.tex. diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index ca71214cdcc..204948261ba 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -459,7 +459,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 From 251ebe0f6446248399e2820a291365a33f0ead8b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 22 Feb 2011 10:49:06 +0900 Subject: [PATCH 6/9] In rmail, decode "encoded-words" of header components on replying. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmail.el | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e0c9f552c9f..a70330d1022 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-22 Kenichi Handa + + * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of + header components. + 2011-02-19 Kenichi Handa * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index fc4b642e8bb..5e9baed1c2e 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3449,6 +3449,16 @@ does not pop any summary buffer." (setq yank-action (list 'insert-buffer replybuffer))) (setq others (cons (cons "cc" cc) others)) (setq others (cons (cons "in-reply-to" in-reply-to) others)) + (setq others + (mapcar #'(lambda (elt) + (cons (car elt) (if (stringp (cdr elt)) + (rfc2047-decode-string (cdr elt))))) + others)) + (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))) (if same-window (compose-mail to subject others noerase nil From e3b300a497971596f3cc6c0f3eb187c903d43dd0 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 22 Feb 2011 10:58:03 +0900 Subject: [PATCH 7/9] Fix font size handling. --- src/ChangeLog | 6 ++++++ src/font.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3a356bb81aa..f9c15811547 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-22 Kenichi Handa + + * 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-19 Chong Yidong * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. diff --git a/src/font.c b/src/font.c index ebf0b547b9f..08309d3697b 100644 --- a/src/font.c +++ b/src/font.c @@ -3042,7 +3042,7 @@ font_open_entity (f, entity, 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); @@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, 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]); From c1449bffe23febaed03c89eaffce7f3ec5d88cce Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 23 Feb 2011 11:32:35 +0900 Subject: [PATCH 8/9] mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an error when a multipart boundary in the nested multipart is found. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmailmm.el | 43 ++++++++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a70330d1022..75010513c12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-23 Kenichi Handa + + * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an + error when a multipart boundary in the nested multipart is found. + 2011-02-22 Kenichi Handa * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index e44dd877e4f..4aa3e81132f 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -852,28 +852,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))) + ;; 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))) - (setq index (1+ index)) - ;; Handle the part. - (if parse-tag + (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)) From 51a13bdd9324860db6381e6da121411467087bec Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 22 Feb 2011 19:32:42 -0800 Subject: [PATCH 9/9] * doc/misc/dired-x.texi (Features, Local Variables): Fix typos. (Features): Minor rephrasing. --- doc/misc/ChangeLog | 5 +++++ doc/misc/dired-x.texi | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 1f153db305f..a822338225a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2011-02-23 Glenn Morris + + * dired-x.texi (Features, Local Variables): Fix typos. + (Features): Minor rephrasing. + 2011-02-19 Glenn Morris * edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi: diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index fada13faf15..2a49390041a 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -145,12 +145,12 @@ Guessing shell commands in Dired buffers. @xref{Shell Command Guessing}. @end itemize @item -Running Dired command in non-Dired buffers. +Running Dired commands in non-Dired buffers. @itemize @bullet @xref{Virtual Dired}. @end itemize @item -Finding a file mentioned in a buffer +Finding a file mentioned in a buffer. @itemize @bullet @xref{Find File At Point}. @end itemize @@ -164,10 +164,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 @@ -548,7 +548,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