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 Paul Eggert <eggert@cs.ucla.edu>
+
+ 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 <larsi@gnus.org>
* mm-decode.el (mm-shr): Bind `shr-width' to `fill-column' so that
(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
(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)
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 ()
(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))
;; and clean up the xrefs.
(princ article nntp-server-buffer)
(nnvirtual-update-xref-header cgroup carticle
- prefix system-name)
+ prefix sysname)
(forward-line 1))
)
(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)
(forward-char -1)
(delete-char 1))
- (insert "Xref: " system-name " " group ":")
+ (insert "Xref: " sysname " " group ":")
(princ article (current-buffer))
(insert " ")