diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-18 12:14:25 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-18 12:14:25 -0700 |
| commit | b455a1b2a8b927d3376e30814954a88f611a17c1 (patch) | |
| tree | 9a2ebfc3534cb5d0e54124c62abaa7b7075f3536 /lisp/gnus/mail-source.el | |
| parent | 2c335777f78cac0f44df217a48762739533b32db (diff) | |
| parent | 63ba73a9f2bdf75363eea678a8c119ed0ffd9799 (diff) | |
| download | emacs-b455a1b2a8b927d3376e30814954a88f611a17c1.tar.gz emacs-b455a1b2a8b927d3376e30814954a88f611a17c1.tar.bz2 emacs-b455a1b2a8b927d3376e30814954a88f611a17c1.zip | |
Merge from origin/emacs-26
63ba73a Fix documentation of ':propertize' in mode-line-format
22aa665 Reject invalid 5-byte sequences when detecting UTF-8 encoding
0d3c358 Fix 'replace-buffer-contents' in multibyte buffers
c79a627 Update etc/NEWS for mail-source-movemail-program change
63f1dc4 Improve movemail default
0b1a2ae Delete description of deleted Customize functions
fcd66d0 Keep vc-print-log from putting point at buffer end (Bug#31764)
Conflicts:
etc/NEWS
Diffstat (limited to 'lisp/gnus/mail-source.el')
| -rw-r--r-- | lisp/gnus/mail-source.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 51f76a4a2e8..0e1c0736363 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -301,9 +301,9 @@ number." :group 'mail-source :type 'number) -(defcustom mail-source-movemail-program nil +(defcustom mail-source-movemail-program "movemail" "If non-nil, name of program for fetching new mail." - :version "22.1" + :version "26.2" :group 'mail-source :type '(choice (const nil) string)) @@ -682,12 +682,16 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile) (setq errors (generate-new-buffer " *mail source loss*")) (let ((default-directory "/")) (setq result + ;; call-process looks in exec-path, which + ;; contains exec-directory, so will find + ;; Mailutils movemail if it exists, else it will + ;; find "our" movemail in exec-directory. + ;; Bug#31737 (apply 'call-process (append (list - (or mail-source-movemail-program - (expand-file-name "movemail" exec-directory)) + mail-source-movemail-program nil errors nil from to))))) (when (file-exists-p to) (set-file-modes to mail-source-default-file-modes)) |