From: Glenn Morris <rgm@gnu.org>
Date: Wed, 20 Feb 2019 20:07:22 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~3566
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3;p=emacs.git

Merge from origin/emacs-26

ff9c962 ; * lisp/ldefs-boot.el: Update.
b4a251c * ; ChangeLog.3 update
d3104e3 * etc/AUTHORS: Update.
a19bfb7 Remove .art from the default list of ImageMagick extensions
6985caa Fix input after setting x-wait-for-event-timeout nil
715388a Fix two warnings in eshell.texi
d49cdd9 * lisp/minibuffer.el (completion-table-dynamic): Improve docs...
5dc4e51 * lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fi...
76ef805 Fix a typo in ELisp manual
b5e66f4 Update citations of Internet RFCs
57ece2a Fix handling of manpage references divided by hyphenation
7ad0cd6 * doc/misc/eshell.texi: Fix some @ref's.
12b7940 Fix a typo in lispref/syntax.texi

# Conflicts:
#	lisp/gnus/nnrss.el
#	lisp/mail/ietf-drums.el
---

83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3
diff --cc lisp/gnus/gnus-util.el
index ca1466d630b,ae8cd45672e..d570f78347b
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@@ -139,9 -140,9 +139,9 @@@ This is a compatibility function for di
  
  (defun gnus-extract-address-components (from)
    "Extract address components from a From header.
- Given an RFC-822 address FROM, extract full name and canonical address.
+ Given an RFC-822 (or later) address FROM, extract name and address.
  Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  Much more simple
 -solution than `mail-extract-address-components', which works much better, but
 +solution than `mail-header-parse-address', which works much better, but
  is slower."
    (let (name address)
      ;; First find the address - the thing with the @ in it.  This may
diff --cc lisp/gnus/nnrss.el
index 6a475966641,01cf7c08c98..7f2accc2b66
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@@ -454,8 -454,8 +454,8 @@@ which RSS 2.0 allows.
      (cond ((null date))			; do nothing for this case
  	  ;; if the date is just digits (unix time stamp):
  	  ((string-match "^[0-9]+$" date)
 -	   (setq given (seconds-to-time (string-to-number date))))
 +	   (setq given (encode-time (string-to-number date))))
- 	  ;; RFC822
+ 	  ;; RFC 822
  	  ((string-match " [0-9]+ " date)
  	   (setq vector (timezone-parse-date date)
  		 year (string-to-number (aref vector 0)))
diff --cc lisp/mail/ietf-drums.el
index 81377c9c41a,bc0fc2b74e6..29752cb5c28
--- a/lisp/mail/ietf-drums.el
+++ b/lisp/mail/ietf-drums.el
@@@ -1,4 -1,4 +1,4 @@@
- ;;; ietf-drums.el --- Functions for parsing RFC822bis headers  -*- lexical-binding:t -*-
 -;;; ietf-drums.el --- Functions for parsing RFC 2822 headers
++;;; ietf-drums.el --- Functions for parsing RFC 2822 headers  -*- lexical-binding:t -*-
  
  ;; Copyright (C) 1998-2019 Free Software Foundation, Inc.