]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 15 Feb 2019 21:25:31 +0000 (13:25 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 15 Feb 2019 21:25:31 +0000 (13:25 -0800)
25d9fe2 Work for empty MIME attachments (related to bug#34387)

1  2 
lisp/gnus/mm-decode.el
lisp/gnus/mm-view.el
lisp/gnus/mml.el

index 80a2e50c4985ee40f37d2e9a015134e84a8e2dab,21552abae734e227e560699f47b3346ac997aaad..2a769fccf5461ae7f84dba020a531bac0834ccb8
@@@ -760,10 -761,10 +760,10 @@@ MIME-Version header before proceeding.
  (defun mm-copy-to-buffer ()
    "Copy the contents of the current buffer to a fresh buffer."
    (let ((obuf (current-buffer))
 -        (mb (mm-multibyte-p))
 +        (mb enable-multibyte-characters)
          beg)
      (goto-char (point-min))
-     (search-forward-regexp "^\n" nil t)
+     (search-forward-regexp "^\n" nil 'move) ;; There might be no body.
      (setq beg (point))
      (with-current-buffer
            (generate-new-buffer " *mm*")
Simple merge
Simple merge