]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Wed, 20 Feb 2019 20:07:22 +0000 (12:07 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 20 Feb 2019 20:07:22 +0000 (12:07 -0800)
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

36 files changed:
1  2 
ChangeLog.3
doc/lispref/abbrevs.texi
doc/lispref/os.texi
doc/lispref/syntax.texi
doc/misc/emacs-mime.texi
doc/misc/eshell.texi
doc/misc/gnus.texi
lisp/calendar/parse-time.el
lisp/emacs-lisp/debug.el
lisp/gnus/gnus-cite.el
lisp/gnus/gnus-util.el
lisp/gnus/message.el
lisp/gnus/mm-bodies.el
lisp/gnus/nnrss.el
lisp/image.el
lisp/ldefs-boot.el
lisp/mail/feedmail.el
lisp/mail/ietf-drums.el
lisp/mail/mail-extr.el
lisp/mail/mail-utils.el
lisp/mail/rfc2047.el
lisp/mail/rmail.el
lisp/mail/sendmail.el
lisp/mail/smtpmail.el
lisp/mail/supercite.el
lisp/man.el
lisp/mh-e/mh-e.el
lisp/mh-e/mh-utils.el
lisp/minibuffer.el
lisp/net/imap.el
lisp/net/newst-backend.el
lisp/org/org-id.el
lisp/ps-samp.el
lisp/simple.el
lisp/url/url-util.el
src/w32term.c

diff --cc ChangeLog.3
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ca1466d630b75ad5c3f68904a474d8763d160ef2,ae8cd45672e5c25a1f19408bd4de2bb9ed6a352d..d570f78347b43648b595ce90a52dd2bff527a1f4
@@@ -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
Simple merge
Simple merge
index 6a475966641457f7a6854758220ac393923e4279,01cf7c08c98e4ed551d274de59ab7385d2ec5f6c..7f2accc2b669c9c1a1bae96886e1a7c40f4db045
@@@ -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/image.el
Simple merge
Simple merge
Simple merge
index 81377c9c41aec4a95324d3c31610976b15d1d35a,bc0fc2b74e69d28f3d423d3b805f68019efc9b26..29752cb5c28e0f279104335500b7efd23e952a52
@@@ -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.
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/man.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/ps-samp.el
Simple merge
diff --cc lisp/simple.el
Simple merge
Simple merge
diff --cc src/w32term.c
Simple merge