From 01e0621bafe60ef8a168eaca3b116cb4cbfdf566 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 30 Dec 2014 14:18:24 +0000 Subject: [PATCH] system-name's returned value can vary Also, the system-name variable is now obsolete. Fixes Bug#19438. * message.el (message-make-fqdn): * nnvirtual.el (nnvirtual-retrieve-headers) (nnvirtual-update-xref-header): Prefer (system-name) to system-name, and avoid naming locals 'system-name'. --- lisp/ChangeLog | 11 +++++++++++ lisp/message.el | 10 +++++----- lisp/nnvirtual.el | 8 ++++---- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7ad8937f..f7464fb28 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2014-12-29 Paul Eggert + + system-name's returned value can vary + Also, the system-name variable is now obsolete. + Fixes Bug#19438. + * message.el (message-make-fqdn): + * nnvirtual.el (nnvirtual-retrieve-headers) + (nnvirtual-update-xref-header): + Prefer (system-name) to system-name, and avoid naming + locals 'system-name'. + 2014-12-29 Lars Ingebrigtsen * mm-decode.el (mm-shr): Bind `shr-width' to `fill-column' so that diff --git a/lisp/message.el b/lisp/message.el index 8fea926d5..b3b98287c 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -5893,7 +5893,7 @@ give as trustworthy answer as possible." (defun message-make-fqdn () "Return user's fully qualified domain name." - (let* ((system-name (system-name)) + (let* ((sysname (system-name)) (user-mail (message-user-mail-address)) (user-domain (if (and user-mail @@ -5907,10 +5907,10 @@ give as trustworthy answer as possible." (not (string-match message-bogus-system-names message-user-fqdn))) ;; `message-user-fqdn' seems to be valid message-user-fqdn) - ((and (string-match message-valid-fqdn-regexp system-name) - (not (string-match message-bogus-system-names system-name))) + ((and (string-match message-valid-fqdn-regexp sysname) + (not (string-match message-bogus-system-names sysname))) ;; `system-name' returned the right result. - system-name) + sysname) ;; Try `mail-host-address'. ((and (boundp 'mail-host-address) (stringp mail-host-address) @@ -5925,7 +5925,7 @@ give as trustworthy answer as possible." user-domain) ;; Default to this bogus thing. (t - (concat system-name + (concat sysname ".i-did-not-set--mail-host-address--so-tickle-me"))))) (defun message-make-domain () diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index f67943a33..61bf5560e 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -99,7 +99,7 @@ component group will show up when you enter the virtual group.") (let ((vbuf (nnheader-set-temp-buffer (get-buffer-create " *virtual headers*"))) (carticles (nnvirtual-partition-sequence articles)) - (system-name (system-name)) + (sysname (system-name)) cgroup carticle article result prefix) (while carticles (setq cgroup (caar carticles)) @@ -151,7 +151,7 @@ component group will show up when you enter the virtual group.") ;; and clean up the xrefs. (princ article nntp-server-buffer) (nnvirtual-update-xref-header cgroup carticle - prefix system-name) + prefix sysname) (forward-line 1)) ) @@ -378,7 +378,7 @@ component group will show up when you enter the virtual group.") (mapc 'nnheader-insert-nov headers)))) -(defun nnvirtual-update-xref-header (group article prefix system-name) +(defun nnvirtual-update-xref-header (group article prefix sysname) "Edit current NOV header in current buffer to have an xref to the component group, and also server prefix any existing xref lines." ;; Move to beginning of Xref field, creating a slot if needed. (beginning-of-line) @@ -393,7 +393,7 @@ component group will show up when you enter the virtual group.") (forward-char -1) (delete-char 1)) - (insert "Xref: " system-name " " group ":") + (insert "Xref: " sysname " " group ":") (princ article (current-buffer)) (insert " ") -- 2.25.1