From: Richard Stallman Date: Sun, 5 Apr 2015 12:44:01 +0000 (-0400) Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs X-Git-Tag: emacs-25.0.90~2563 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5842e489eef061766a747e26ca81e1ef6e2ece5a;p=emacs.git Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Conflicts: lisp/ChangeLog --- 5842e489eef061766a747e26ca81e1ef6e2ece5a diff --cc lisp/ChangeLog index f6a79c7dea6,fb82b5b574a..33e14568376 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,16 -1,8 +1,21 @@@ +2015-04-05 Richard Stallman + + * mail/rmail.el (rmail-show-message-1): When displaying a mime message, + indicate start and finish in the echo area. + + * mail/rmail.el (rmail-epa-decrypt): Disregard 
 before armor.
 +	Ignore more kinds of whitespace in mime headers.
 +	Modify the decrypted mime part's mime type so it will be displayed
 +	by default when visiting this message again.
 +
 +	* net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc.
 +	(browse-url-firefox-arguments)
 +	(browse-url-firefox-startup-arguments): Doc fix.
+ 2015-04-05  Artur Malabarba  
+ 
+ 	* emacs-lisp/package.el: Add package-initialize to user-init-file.
+ 	(package--ensure-init-file): New function.
+ 	(package-install, package-install-from-buffer): Use it.
  
  2015-04-05  Pete Williamson    (tiny-change)