diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/dnd.el | 14 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/nnvirtual.el | 8 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
4 files changed, 18 insertions, 16 deletions
diff --git a/lisp/dnd.el b/lisp/dnd.el index 2b68b025ac..3fda471497 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -122,17 +122,17 @@ Return nil if URI is not a local file." ;; The hostname may be our hostname, in that case, convert to a local ;; file. Otherwise return nil. TODO: How about an IP-address as hostname? - (let ((system-name (system-name))) + (let ((sysname (system-name))) (let ((hostname (when (string-match "^file://\\([^/]*\\)" uri) (downcase (match-string 1 uri)))) - (system-name-no-dot - (downcase (if (string-match "^[^\\.]+" system-name) - (match-string 0 system-name) - system-name)))) + (sysname-no-dot + (downcase (if (string-match "^[^\\.]+" sysname) + (match-string 0 sysname) + sysname)))) (when (and hostname (or (string-equal "localhost" hostname) - (string-equal (downcase system-name) hostname) - (string-equal system-name-no-dot hostname))) + (string-equal (downcase sysname) hostname) + (string-equal sysname-no-dot hostname))) (concat "file://" (substring uri (+ 7 (length hostname)))))))) (defsubst dnd-unescape-uri (uri) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index d58a292221..ee5d824a85 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -5849,7 +5849,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 @@ -5863,10 +5863,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) @@ -5881,7 +5881,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/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el index d13b492ddb..61bf5560e2 100644 --- a/lisp/gnus/nnvirtual.el +++ b/lisp/gnus/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 " ") diff --git a/lisp/startup.el b/lisp/startup.el index 8e981bbc64..0c5e66a2e6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -358,6 +358,8 @@ this variable usefully is to set it while building and dumping Emacs." :set (lambda (_variable _value) (error "Customizing `site-run-file' does not work"))) +(make-obsolete-variable 'system-name "use (system-name) instead" "25.1") + (defcustom mail-host-address nil "Name of this machine, for purposes of naming users. If non-nil, Emacs uses this instead of `system-name' when constructing |