unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Juanma Barranquero <lekktu@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 16733@debbugs.gnu.org
Subject: bug#16733: messed up unicode chars in package description
Date: Wed, 19 Mar 2014 18:43:46 +0100	[thread overview]
Message-ID: <CAAeL0SSjE-TkiS52a4WVN-BzMDU6fjC_JS9y7pdpHjEvphT7zQ@mail.gmail.com> (raw)
In-Reply-To: <83zjkm865z.fsf@gnu.org>

On Wed, Mar 19, 2014 at 6:11 PM, Eli Zaretskii <eliz@gnu.org> wrote:

> I think you want url-insert from url-handlers.el.

Thanks.

So the following patch is a better fix. I'm OK with installing it,
though it is a bit more intrusive that the previous one.

   J


2014-03-19  Juanma Barranquero  <lekktu@gmail.com>

        * emacs-lisp/package.el: Fix bug#16733.
        (url-handlers): Require.
        (package--with-work-buffer): When LOCATION is a URL, use url-insert to
        properly decode the buffer.  Suggested by Eli Zaretskii <eliz@gnu.org>.


=== modified file 'lisp/emacs-lisp/package.el'
--- lisp/emacs-lisp/package.el  2014-03-19 16:14:26 +0000
+++ lisp/emacs-lisp/package.el  2014-03-19 17:35:44 +0000
@@ -166,6 +166,7 @@
 (eval-when-compile (require 'cl-lib))

 (require 'tabulated-list)
+(require 'url-handlers)

 (defgroup package nil
   "Manager for Emacs Lisp packages."
@@ -770,15 +771,13 @@
 and evaluates BODY while that buffer is current.  This work
 buffer is killed afterwards.  Return the last value in BODY."
   (declare (indent 2) (debug t))
-  `(let* ((http (string-match "\\`https?:" ,location))
-         (buffer
-          (if http
-              (url-retrieve-synchronously (concat ,location ,file))
-            (generate-new-buffer "*package work buffer*"))))
+  `(let ((buffer (generate-new-buffer "*package work buffer*")))
      (prog1
         (with-current-buffer buffer
-          (if http
-              (progn (package-handle-response)
+          (if (string-match-p "\\`https?:" ,location)
+              (progn (url-insert (url-retrieve-synchronously
+                                  (concat ,location ,file)))
+                     (package-handle-response)
                      (re-search-forward "^$" nil 'move)
                      (forward-char)
                      (delete-region (point-min) (point)))
@@ -1531,8 +1530,7 @@
                        (setq readme-string (buffer-string))
                        t))
                 (error nil))
-              (let ((coding (detect-coding-string readme-string t)))
-                (insert (decode-coding-string readme-string coding t))))
+              (insert readme-string))
              ((file-readable-p readme)
               (insert-file-contents readme)
               (goto-char (point-max))))))))





  reply	other threads:[~2014-03-19 17:43 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-13  1:47 bug#16733: messed up unicode chars in package description Glenn Morris
2014-03-19  1:34 ` Juanma Barranquero
2014-03-19  6:26   ` Glenn Morris
2014-03-19 10:19     ` Juanma Barranquero
2014-03-19 15:53       ` Glenn Morris
2014-03-19 16:08         ` Juanma Barranquero
2014-03-19 16:16           ` Glenn Morris
2014-03-19 16:24             ` Juanma Barranquero
2014-03-19 17:11               ` Eli Zaretskii
2014-03-19 17:43                 ` Juanma Barranquero [this message]
2014-03-19 18:05                   ` Glenn Morris
2014-03-19 18:33                     ` Juanma Barranquero
2014-03-20  5:12                     ` Juanma Barranquero
2014-03-20 16:02                       ` Glenn Morris
2014-03-20 16:30                         ` Juanma Barranquero
2014-03-20 16:21                       ` Eli Zaretskii
2014-03-20 17:26                         ` Juanma Barranquero
2014-03-22  1:11                           ` Juanma Barranquero
2014-03-22  1:18                             ` Juanma Barranquero
2014-03-22  1:33                               ` Juanma Barranquero
2014-03-22  2:54                                 ` Stefan Monnier
2014-03-22  3:27                                   ` Juanma Barranquero
2014-03-22 14:33                                     ` Stefan
2014-03-22 14:43                                       ` Juanma Barranquero
2014-03-22 15:55                                         ` Stefan
2014-03-22 16:46                                           ` Juanma Barranquero
2014-03-22 18:53                                             ` Stefan
2014-03-22 19:05                                               ` Juanma Barranquero
2014-03-23 22:24                                                 ` Stefan
2014-03-25  3:04                                                   ` Juanma Barranquero
2014-03-25  3:35                                                     ` Stefan Monnier
2014-03-25  9:54                                                       ` Juanma Barranquero
2014-03-25 13:21                                                         ` Stefan Monnier
2014-03-26 15:24                                                           ` Juanma Barranquero
2014-03-22  7:25                             ` Eli Zaretskii
2014-03-22 12:20                               ` Juanma Barranquero
2014-03-22 14:31                               ` Stefan
2014-03-22 14:39                                 ` Juanma Barranquero
2014-03-22 15:02                                   ` Eli Zaretskii
2014-03-22 15:07                                     ` Juanma Barranquero
2014-03-22 15:09                                       ` Eli Zaretskii
2014-03-22 15:11                                         ` Juanma Barranquero
2014-03-19 19:00             ` Stefan
2014-03-19 19:42             ` Glenn Morris
2014-03-19 20:44               ` Juanma Barranquero
2014-03-19 17:08           ` Eli Zaretskii
2014-03-19 17:09             ` Juanma Barranquero

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAAeL0SSjE-TkiS52a4WVN-BzMDU6fjC_JS9y7pdpHjEvphT7zQ@mail.gmail.com \
    --to=lekktu@gmail.com \
    --cc=16733@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).