merge from trunk

5 files changed, 56 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac360a3e422..1b7aceb5979 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * format.el (format-annotate-function):
+        Handle read-only text properties in the source.  (Bug#14887)
+
+2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-display-html): Ignore coding system errors.  One
+        web site uses "utf-8lias" as the coding system.
+
 2013-08-11  Juanma Barranquero  <lekktu@gmail.com>
 
         * frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil.
diff --git a/lisp/format.el b/lisp/format.el
index 221eaadcdd8..fc8dcb97b01 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -225,10 +225,12 @@ For most purposes, consider using `format-encode-region' instead."
                 (setq selective-display sel-disp)
                 (set-buffer-multibyte multibyte)
                 (setq buffer-file-coding-system coding-system))
-              (copy-to-buffer copy-buf from to)
-              (set-buffer copy-buf)
-              (format-insert-annotations write-region-annotations-so-far from)
-              (format-encode-run-method to-fn (point-min) (point-max) orig-buf)
+              (let ((inhibit-read-only t)) ; bug#14887
+                (copy-to-buffer copy-buf from to)
+                (set-buffer copy-buf)
+                (format-insert-annotations write-region-annotations-so-far from)
+                (format-encode-run-method to-fn (point-min) (point-max)
+                                          orig-buf))
               (when (buffer-live-p copy-buf)
                 (with-current-buffer copy-buf
                   ;; Set write-region-post-annotation-function to
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ab776bfbb54..4fcf078e9d6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2013-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-display-external): Run a timer for the temp files
+        deletion after a viewer exits; add a deletion timer for the needsterm
+        case, too.
+
+        * mm-decode.el (mm-display-external): Try to delete temporary files by
+        using a 1-min. timer.
+
 2013-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-decode.el (mm-temp-files-to-be-deleted, mm-temp-files-cache-file):
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f1e11a01194..dbbf0befe60 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -954,10 +954,20 @@ external if displayed external."
                             method file (mm-handle-type handle))))
               (unwind-protect
                   (if window-system
-                      (start-process "*display*" nil
-                                     mm-external-terminal-program
-                                     "-e" shell-file-name
-                                     shell-command-switch command)
+                      (set-process-sentinel
+                       (start-process "*display*" nil
+                                      mm-external-terminal-program
+                                      "-e" shell-file-name
+                                      shell-command-switch command)
+                       `(lambda (process state)
+                          (if (eq 'exit (process-status process))
+                              (run-at-time
+                               60.0 nil
+                               (lambda ()
+                                 (ignore-errors (delete-file ,file))
+                                 (ignore-errors (delete-directory
+                                                 ,(file-name-directory
+                                                   file))))))))
                     (require 'term)
                     (require 'gnus-win)
                     (set-buffer
@@ -971,11 +981,15 @@ external if displayed external."
                     (set-process-sentinel
                      (get-buffer-process buffer)
                      `(lambda (process state)
-                        (if (eq 'exit (process-status process))
-                            (gnus-configure-windows
-                             ',gnus-current-window-configuration))))
+                        (when (eq 'exit (process-status process))
+                          (ignore-errors (delete-file ,file))
+                          (ignore-errors
+                            (delete-directory ,(file-name-directory file)))
+                          (gnus-configure-windows
+                           ',gnus-current-window-configuration))))
                     (gnus-configure-windows 'display-term))
-                (mm-handle-set-external-undisplayer handle (cons file buffer)))
+                (mm-handle-set-external-undisplayer handle (cons file buffer))
+                (add-to-list 'mm-temp-files-to-be-deleted file t))
               (message "Displaying %s..." command))
             'external)
            (copiousoutput
@@ -1023,6 +1037,12 @@ external if displayed external."
                                    (handle handle))
                        (lambda (process state)
                          (when (eq (process-status process) 'exit)
+                           (run-at-time
+                            60.0 nil
+                            (lambda ()
+                              (ignore-errors (delete-file file))
+                              (ignore-errors (delete-directory
+                                              (file-name-directory file)))))
                            (when (buffer-live-p outbuf)
                              (with-current-buffer outbuf
                                (let ((buffer-read-only nil)
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 70c11c3201f..a689ff2ae9f 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -199,7 +199,9 @@ word(s) will be searched for via `eww-search-prefix'."
 
 (defun eww-display-html (charset url)
   (unless (eq charset 'utf8)
-    (decode-coding-region (point) (point-max) charset))
+    (condition-case nil
+        (decode-coding-region (point) (point-max) charset)
+      (coding-system-error nil)))
   (let ((document
          (list
           'base (list (cons 'href url))