summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/ange-ftp.el10
-rw-r--r--lisp/net/browse-url.el8
-rw-r--r--lisp/net/dbus.el2
-rw-r--r--lisp/net/eudc-hotlist.el2
-rw-r--r--lisp/net/mairix.el3
-rw-r--r--lisp/net/newst-plainview.el6
-rw-r--r--lisp/net/newst-treeview.el6
-rw-r--r--lisp/net/newsticker.el2
-rw-r--r--lisp/net/quickurl.el6
-rw-r--r--lisp/net/secrets.el22
-rw-r--r--lisp/net/snmp-mode.el2
-rw-r--r--lisp/net/soap-client.el2
-rw-r--r--lisp/net/tramp-cache.el5
-rw-r--r--lisp/net/tramp-compat.el2
-rw-r--r--lisp/net/tramp-gvfs.el2
-rw-r--r--lisp/net/tramp-sh.el212
-rw-r--r--lisp/net/tramp-smb.el2
-rw-r--r--lisp/net/tramp.el4
-rw-r--r--lisp/net/xesam.el4
-rw-r--r--lisp/net/zeroconf.el4
20 files changed, 157 insertions, 149 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 488a4fdb976..f6a5b53ae7f 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -46,7 +46,7 @@
;; Extended filename syntax:
;;
;; The default extended filename syntax is '/user@host:name', where the
-;; 'user@' part may be omitted. This syntax can be customised to a certain
+;; 'user@' part may be omitted. This syntax can be customized to a certain
;; extent by changing ange-ftp-name-format. There are limitations.
;; The `host' part has an optional suffix `#port' which may be used to
;; specify a non-default port number for the connexion.
@@ -721,7 +721,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
"^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
"^500 .*AUTH\\|^KERBEROS\\|"
"^504 Unknown security mechanism\\|"
- "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
+ "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd
"^534 Kerberos Authentication not enabled\\|"
"^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
"Regular expression matching FTP messages that can be ignored."
@@ -1665,7 +1665,7 @@ good, skip, fatal, or unknown."
(ange-ftp-process-handle-line line proc)
;; If we've seen a potential error message and it
;; hasn't been cancelled by a good message before
- ;; seeing a propt, then the error was real.
+ ;; seeing a prompt, then the error was real.
(delete-process proc)
(setq ange-ftp-process-busy nil
ange-ftp-process-result-line ange-ftp-pending-error-line))))
@@ -4027,7 +4027,7 @@ E.g.,
(concat bestmatch "/")
bestmatch)))))
-;; Put these lines uncommmented in your .emacs if you want C-r to refresh
+;; Put these lines uncommented in your .emacs if you want C-r to refresh
;; ange-ftp's cache whilst doing filename completion.
;;
;;(define-key minibuffer-local-completion-map "\C-r" 'ange-ftp-re-read-dir)
@@ -4507,7 +4507,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
;; We used to follow symlinks on `file' here. Apparently it was done
;; because some FTP servers react to "ls foo" by listing the symlink foo
;; rather than the directory it points to. Now that ange-ftp-ls uses
- ;; "cd foo; ls" instead, this is not necesssary any more.
+ ;; "cd foo; ls" instead, this is not necessary any more.
(let ((beg (point))
(end (point-marker)))
(set-marker-insertion-type end t)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 10a1fa5afc5..3ab1a345470 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -100,7 +100,7 @@
;; <URL:ftp://ftp.lysator.liu.se/pub/sgml>; hm--html-menus can be used
;; with this.
-;; This package generalises function html-previewer-process in Marc
+;; This package generalizes function html-previewer-process in Marc
;; Andreessen's html-mode (LCD modes/html-mode.el.Z). See also the
;; ffap.el package. The huge hyperbole package also contains similar
;; functions.
@@ -138,7 +138,7 @@
;; M-x browse-url-of-dired-file RET
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Customisation (~/.emacs)
+;; Customization (~/.emacs)
;; To see what variables are available for customization, type
;; `M-x set-variable browse-url TAB'. Better, use
@@ -190,7 +190,7 @@
;;
;; (add-hook 'browse-url-of-file-hook 'browse-url-netscape-reload)
-;; You may also want to customise browse-url-netscape-arguments, e.g.
+;; You may also want to customize browse-url-netscape-arguments, e.g.
;; (setq browse-url-netscape-arguments '("-install"))
;;
;; or similarly for the other browsers.
@@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time
:type '(repeat (string :tag "Argument"))
:group 'browse-url)
-;; GNOME means of invoking either Mozilla or Netrape.
+;; GNOME means of invoking either Mozilla or Netscape.
(defvar browse-url-gnome-moz-program "gnome-moz-remote")
(defcustom browse-url-gnome-moz-arguments '()
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index e5eb2015418..03b84a45ea3 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -505,7 +505,7 @@ not well formed."
(defun dbus-event-member-name (event)
"Return the member name the event is coming from.
-It is either a signal name or a method name. The result is is a
+It is either a signal name or a method name. The result is a
string. EVENT is a D-Bus event, see `dbus-check-event'. This
function raises a `dbus-error' signal in case the event is not
well formed."
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 64b2d34af9c..1f6c4464808 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -53,7 +53,7 @@ These are the special commands of this mode:
s -- Select the server at point.
t -- Transpose the server at point and the previous one
q -- Commit the changes and quit.
- x -- Quit without commiting the changes."
+ x -- Quit without committing the changes."
(interactive)
(kill-all-local-variables)
(setq major-mode 'eudc-hotlist-mode)
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 8c4bbb4a785..68a0a6a85d4 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -51,7 +51,7 @@
;; Currently, RMail, Gnus (with mbox files), and VM are supported as
;; mail programs, but it is pretty easy to interface it with other
;; ones as well. Please see the docs and the source for details.
-;; In a nutshell: include your favourite mail program in
+;; In a nutshell: include your favorite mail program in
;; `mairix-mail-program' and write functions for
;; `mairix-display-functions' and `mairix-get-mail-header-functions'.
;; If you have written such functions for your Emacs mail program of
@@ -945,4 +945,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n")
(provide 'mairix)
;;; mairix.el ends here
-
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 906044079cd..f1b3ce7fd05 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -783,11 +783,11 @@ Return new buffer position."
(newsticker--buffer-set-uptodate nil)
(newsticker--ticker-text-setup)
(newsticker-buffer-update)
- ;; go back to where we came frome
+ ;; Go back to where we came from.
(goto-char pos)
(end-of-line)
(newsticker--buffer-goto '(feed) nil t))))
-
+
(defun newsticker-mark-all-items-at-point-as-read ()
"Mark all items as read and clear ticker contents."
(interactive)
@@ -1574,7 +1574,7 @@ property to '(<nt-type>-<nt-age> <nt-type> <nt-age>)."
(while (and (setq pos2 (next-single-property-change pos1 'nt-type))
(<= pos2 end)
(> pos2 pos1))
- ;; must shift one char to the left in order to handle inivisible
+ ;; must shift one char to the left in order to handle invisible
;; newlines, motion in invisible text areas and all that correctly
(put-text-property (1- pos1) (1- pos2)
'invisible
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 5e38a905ad5..8ff74a94eb0 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -227,7 +227,7 @@ their id stays constant."
(string= (widget-get node1 :tag) (widget-get node2 :tag)))))
(defun newsticker--treeview-do-get-node-of-feed (feed-name startnode)
- "Recursivly search node for feed FEED-NAME starting from STARTNODE."
+ "Recursively search node for feed FEED-NAME starting from STARTNODE."
;;(message "%s/%s" feed-name (widget-get startnode :nt-feed))
(if (string= feed-name (or (widget-get startnode :nt-feed)
(widget-get startnode :nt-vfeed)))
@@ -245,7 +245,7 @@ their id stays constant."
newsticker--treeview-vfeed-tree)))
(defun newsticker--treeview-do-get-node (id startnode)
- "Recursivly search node with ID starting from STARTNODE."
+ "Recursively search node with ID starting from STARTNODE."
(if (newsticker--treeview-ids-eq id (widget-get startnode :nt-id))
(throw 'found startnode)
(let ((children (widget-get startnode :children)))
@@ -1793,7 +1793,7 @@ Update teeview afterwards unless NO-UPDATE is non-nil."
result))
(defun newsticker--group-remove-obsolete-feeds (group)
- "Recursively remove obselete feeds from GROUP."
+ "Recursively remove obsolete feeds from GROUP."
(let ((result nil)
(urls (append newsticker-url-list newsticker-url-list-defaults)))
(mapc (lambda (g)
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index 3a2cf3f04f7..0a1e07e63f1 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -106,7 +106,7 @@
;; asynchronous download of headlines. The modeline in the `*newsticker*'
;; buffer informs whenever new headlines have arrived. Clicking
;; mouse-button 2 or pressing RET in this buffer on a headline will call
-;; browse-url to load the corresponding news story in your favourite web
+;; browse-url to load the corresponding news story in your favorite web
;; browser.
;; The scrolling, or flashing of headlines in the echo area, can be started
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 3f1437f0799..a31ec496c16 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -26,7 +26,7 @@
;;
;; This package provides a simple method of inserting a URL based on the
;; text at point in the current buffer. This is part of an on-going effort
-;; to increase the information I provide people while reducing the ammount
+;; to increase the information I provide people while reducing the amount
;; of typing I need to do. No-doubt there are undiscovered Emacs packages
;; out there that do all of this and do it better, feel free to point me to
;; them, in the mean time I'm having fun playing with Emacs Lisp.
@@ -189,7 +189,7 @@ in your ~/.emacs (after loading/requiring quickurl).")
"Local keymap for a `quickurl-list-mode' buffer.")
(defvar quickurl-list-buffer-name "*quickurl-list*"
- "Name for the URL listinig buffer.")
+ "Name for the URL listing buffer.")
(defvar quickurl-list-last-buffer nil
"`current-buffer' when `quickurl-list' was called.")
@@ -201,7 +201,7 @@ in your ~/.emacs (after loading/requiring quickurl).")
(listp (cdr url)))
(defun quickurl-make-url (keyword url &optional comment)
- "Create a URL from KEYWORD, URL and (optionaly) COMMENT."
+ "Create a URL from KEYWORD, URL and (optionally) COMMENT."
(if (and comment (not (zerop (length comment))))
(list keyword url comment)
(cons keyword url)))
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 9fa5eb32d43..7e0eaff1dce 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -78,7 +78,7 @@
;; (secrets-create-collection "my collection")
;; There exists a special collection called "session", which has the
-;; lifetime of the corrresponding client session (aka Emacs'
+;; lifetime of the corresponding client session (aka Emacs'
;; lifetime). It is created automatically when Emacs uses the Secret
;; Service interface, and it is deleted when Emacs is killed.
;; Therefore, it can be used to store and retrieve secret items
@@ -379,7 +379,7 @@ returned, and it will be stored in `secrets-session-path'."
(defun secrets-prompt-handler (&rest args)
"Handler for signals emitted by `secrets-interface-prompt'."
;; An empty object path is always identified as `secrets-empty-path'
- ;; or `nil'. Either we set it explicitely, or it is returned by the
+ ;; or `nil'. Either we set it explicitly, or it is returned by the
;; "Completed" signal.
(if (car args) ;; dismissed
(setq secrets-prompt-signal (list secrets-empty-path))
@@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'."
(secrets-get-collections)))
(defun secrets-collection-path (collection)
- "Return the object path of collection labelled COLLECTION.
+ "Return the object path of collection labeled COLLECTION.
If COLLECTION is nil, return the session collection path.
If there is no such COLLECTION, return nil."
(or
@@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil."
(throw 'collection-found collection-path))))))
(defun secrets-create-collection (collection)
- "Create collection labelled COLLECTION if it doesn't exist.
+ "Create collection labeled COLLECTION if it doesn't exist.
Return the D-Bus object path for collection."
(let ((collection-path (secrets-collection-path collection)))
;; Create the collection.
@@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported."
"Label"))
(defun secrets-set-alias (collection alias)
- "Set ALIAS as alias of collection labelled COLLECTION.
+ "Set ALIAS as alias of collection labeled COLLECTION.
For the time being, only the alias \"default\" is supported."
(let ((collection-path (secrets-collection-path collection)))
(unless (secrets-empty-path collection-path)
@@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported."
alias :object-path secrets-empty-path))
(defun secrets-unlock-collection (collection)
- "Unlock collection labelled COLLECTION.
+ "Unlock collection labeled COLLECTION.
If successful, return the object path of the collection."
(let ((collection-path (secrets-collection-path collection)))
(unless (secrets-empty-path collection-path)
@@ -509,7 +509,7 @@ If successful, return the object path of the collection."
collection-path))
(defun secrets-delete-collection (collection)
- "Delete collection labelled COLLECTION."
+ "Delete collection labeled COLLECTION."
(let ((collection-path (secrets-collection-path collection)))
(unless (secrets-empty-path collection-path)
(secrets-prompt
@@ -636,7 +636,7 @@ The object path of the created item is returned."
(car result)))))
(defun secrets-item-path (collection item)
- "Return the object path of item labelled ITEM in COLLECTION.
+ "Return the object path of item labeled ITEM in COLLECTION.
If there is no such item, return nil."
(let ((collection-path (secrets-unlock-collection collection)))
(catch 'item-found
@@ -645,7 +645,7 @@ If there is no such item, return nil."
(throw 'item-found item-path))))))
(defun secrets-get-secret (collection item)
- "Return the secret of item labelled ITEM in COLLECTION.
+ "Return the secret of item labeled ITEM in COLLECTION.
If there is no such item, return nil."
(let ((item-path (secrets-item-path collection item)))
(unless (secrets-empty-path item-path)
@@ -656,7 +656,7 @@ If there is no such item, return nil."
"GetSecret" :object-path secrets-session-path))))))
(defun secrets-get-attributes (collection item)
- "Return the lookup attributes of item labelled ITEM in COLLECTION.
+ "Return the lookup attributes of item labeled ITEM in COLLECTION.
If there is no such item, or the item has no attributes, return nil."
(unless (stringp collection) (setq collection "default"))
(let ((item-path (secrets-item-path collection item)))
@@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil."
secrets-interface-item "Attributes")))))
(defun secrets-get-attribute (collection item attribute)
- "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION.
+ "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION.
If there is no such item, or the item doesn't own this attribute, return nil."
(cdr (assoc attribute (secrets-get-attributes collection item))))
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index e9783d46ba8..8112ed5b177 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -676,7 +676,7 @@ controls whether case is significant."
;; v2 SMI TEXTUAL-CONVENTION macro template
;;
(tempo-define-template "snmpv2-textual-convention"
- '(> (P "Texual Convention Type: ") " ::= TEXTUAL-CONVENTION" n>
+ '(> (P "Textual Convention Type: ") " ::= TEXTUAL-CONVENTION" n>
"STATUS "
(if tempo-interactive
(snmp-completing-read "Status: " snmp-mode-status-list nil t)
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index d6949e4d250..74f51d148ef 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -373,7 +373,7 @@ binding) but the same name."
(defstruct (soap-sequence-type (:include soap-element))
parent ; OPTIONAL WSDL-TYPE name
- elements ; LIST of SOAP-SEQUCENCE-ELEMENT
+ elements ; LIST of SOAP-SEQUENCE-ELEMENT
)
(defstruct (soap-array-type (:include soap-element))
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index b35ca3bbd18..56087a3aef6 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -162,6 +162,11 @@ FILE must be a local file name on a connection identified via VEC."
;;;###tramp-autoload
(defun tramp-flush-file-property (vec file)
"Remove all properties of FILE in the cache context of VEC."
+ ;; Remove file property of symlinks.
+ (let ((truename (tramp-get-file-property vec file "file-truename" nil)))
+ (when (and (stringp truename)
+ (not (string-equal file truename)))
+ (tramp-flush-file-property vec truename)))
;; Unify localname.
(setq vec (copy-sequence vec))
(aset vec 3 (tramp-run-real-handler 'directory-file-name (list file)))
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 5054f1d232d..89c7db241d8 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -412,7 +412,7 @@ element is not omitted."
(program &optional infile destination display &rest args)
"Calls `call-process' on the local host.
This is needed because for some Emacs flavors Tramp has
-defadviced `call-process' to behave like `process-file'. The
+defadvised `call-process' to behave like `process-file'. The
Lisp error raised when PROGRAM is nil is trapped also, returning 1."
(let ((default-directory
(if (file-remote-p default-directory)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 269b47be20c..fda88351253 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -39,7 +39,7 @@
;; Consequently, GNU Emacs 23.1 with enabled D-Bus bindings is a
;; precondition.
-;; The GVFS D-Bus interface is said to be instable. There are even no
+;; The GVFS D-Bus interface is said to be unstable. There are even no
;; introspection data. The interface, as discovered during
;; development time, is given in respective comments.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 55732194bc8..51fc6e295f0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -549,7 +549,7 @@ as given in your `~/.profile'."
"*List of environment variables to be set on the remote host.
Each element should be a string of the form ENVVARNAME=VALUE. An
-entry ENVVARNAME= diables the corresponding environment variable,
+entry ENVVARNAME= disables the corresponding environment variable,
which might have been set in the init files like ~/.profile.
Special handling is applied to the PATH environment, which should
@@ -1058,106 +1058,110 @@ target of the symlink differ."
(defun tramp-sh-handle-file-truename (filename &optional counter prev-dirs)
"Like `file-truename' for Tramp files."
(with-parsed-tramp-file-name (expand-file-name filename) nil
- (with-file-property v localname "file-truename"
- (let ((result nil)) ; result steps in reverse order
- (tramp-message v 4 "Finding true name for `%s'" filename)
- (cond
- ;; Use GNU readlink --canonicalize-missing where available.
- ((tramp-get-remote-readlink v)
- (setq result
- (tramp-send-command-and-read
- v
- (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
- (tramp-get-remote-readlink v)
- (tramp-shell-quote-argument localname)))))
-
- ;; Use Perl implementation.
- ((and (tramp-get-remote-perl v)
- (tramp-get-connection-property v "perl-file-spec" nil)
- (tramp-get-connection-property v "perl-cwd-realpath" nil))
- (tramp-maybe-send-script
- v tramp-perl-file-truename "tramp_perl_file_truename")
- (setq result
- (tramp-send-command-and-read
- v
- (format "tramp_perl_file_truename %s"
- (tramp-shell-quote-argument localname)))))
-
- ;; Do it yourself. We bind `directory-sep-char' here for
- ;; XEmacs on Windows, which would otherwise use backslash.
- (t (let* ((directory-sep-char ?/)
- (steps (tramp-compat-split-string localname "/"))
- (localnamedir (tramp-run-real-handler
- 'file-name-as-directory (list localname)))
- (is-dir (string= localname localnamedir))
- (thisstep nil)
- (numchase 0)
- ;; Don't make the following value larger than
- ;; necessary. People expect an error message in a
- ;; timely fashion when something is wrong;
- ;; otherwise they might think that Emacs is hung.
- ;; Of course, correctness has to come first.
- (numchase-limit 20)
- symlink-target)
- (while (and steps (< numchase numchase-limit))
- (setq thisstep (pop steps))
- (tramp-message
- v 5 "Check %s"
- (mapconcat 'identity
- (append '("") (reverse result) (list thisstep))
- "/"))
- (setq symlink-target
- (nth 0 (file-attributes
- (tramp-make-tramp-file-name
- method user host
- (mapconcat 'identity
- (append '("")
- (reverse result)
- (list thisstep))
- "/")))))
- (cond ((string= "." thisstep)
- (tramp-message v 5 "Ignoring step `.'"))
- ((string= ".." thisstep)
- (tramp-message v 5 "Processing step `..'")
- (pop result))
- ((stringp symlink-target)
- ;; It's a symlink, follow it.
- (tramp-message v 5 "Follow symlink to %s" symlink-target)
- (setq numchase (1+ numchase))
- (when (file-name-absolute-p symlink-target)
- (setq result nil))
- ;; If the symlink was absolute, we'll get a string like
- ;; "/user@host:/some/target"; extract the
- ;; "/some/target" part from it.
- (when (tramp-tramp-file-p symlink-target)
- (unless (tramp-equal-remote filename symlink-target)
- (tramp-error
- v 'file-error
- "Symlink target `%s' on wrong host" symlink-target))
- (setq symlink-target localname))
- (setq steps
- (append (tramp-compat-split-string
- symlink-target "/")
- steps)))
- (t
- ;; It's a file.
- (setq result (cons thisstep result)))))
- (when (>= numchase numchase-limit)
- (tramp-error
- v 'file-error
- "Maximum number (%d) of symlinks exceeded" numchase-limit))
- (setq result (reverse result))
- ;; Combine list to form string.
- (setq result
- (if result
- (mapconcat 'identity (cons "" result) "/")
- "/"))
- (when (and is-dir (or (string= "" result)
- (not (string= (substring result -1) "/"))))
- (setq result (concat result "/"))))))
-
- (tramp-message v 4 "True name of `%s' is `%s'" filename result)
- (tramp-make-tramp-file-name method user host result)))))
+ (tramp-make-tramp-file-name method user host
+ (with-file-property v localname "file-truename"
+ (let ((result nil)) ; result steps in reverse order
+ (tramp-message v 4 "Finding true name for `%s'" filename)
+ (cond
+ ;; Use GNU readlink --canonicalize-missing where available.
+ ((tramp-get-remote-readlink v)
+ (setq result
+ (tramp-send-command-and-read
+ v
+ (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
+ (tramp-get-remote-readlink v)
+ (tramp-shell-quote-argument localname)))))
+
+ ;; Use Perl implementation.
+ ((and (tramp-get-remote-perl v)
+ (tramp-get-connection-property v "perl-file-spec" nil)
+ (tramp-get-connection-property v "perl-cwd-realpath" nil))
+ (tramp-maybe-send-script
+ v tramp-perl-file-truename "tramp_perl_file_truename")
+ (setq result
+ (tramp-send-command-and-read
+ v
+ (format "tramp_perl_file_truename %s"
+ (tramp-shell-quote-argument localname)))))
+
+ ;; Do it yourself. We bind `directory-sep-char' here for
+ ;; XEmacs on Windows, which would otherwise use backslash.
+ (t (let* ((directory-sep-char ?/)
+ (steps (tramp-compat-split-string localname "/"))
+ (localnamedir (tramp-run-real-handler
+ 'file-name-as-directory (list localname)))
+ (is-dir (string= localname localnamedir))
+ (thisstep nil)
+ (numchase 0)
+ ;; Don't make the following value larger than
+ ;; necessary. People expect an error message in
+ ;; a timely fashion when something is wrong;
+ ;; otherwise they might think that Emacs is hung.
+ ;; Of course, correctness has to come first.
+ (numchase-limit 20)
+ symlink-target)
+ (while (and steps (< numchase numchase-limit))
+ (setq thisstep (pop steps))
+ (tramp-message
+ v 5 "Check %s"
+ (mapconcat 'identity
+ (append '("") (reverse result) (list thisstep))
+ "/"))
+ (setq symlink-target
+ (nth 0 (file-attributes
+ (tramp-make-tramp-file-name
+ method user host
+ (mapconcat 'identity
+ (append '("")
+ (reverse result)
+ (list thisstep))
+ "/")))))
+ (cond ((string= "." thisstep)
+ (tramp-message v 5 "Ignoring step `.'"))
+ ((string= ".." thisstep)
+ (tramp-message v 5 "Processing step `..'")
+ (pop result))
+ ((stringp symlink-target)
+ ;; It's a symlink, follow it.
+ (tramp-message
+ v 5 "Follow symlink to %s" symlink-target)
+ (setq numchase (1+ numchase))
+ (when (file-name-absolute-p symlink-target)
+ (setq result nil))
+ ;; If the symlink was absolute, we'll get a
+ ;; string like "/user@host:/some/target";
+ ;; extract the "/some/target" part from it.
+ (when (tramp-tramp-file-p symlink-target)
+ (unless (tramp-equal-remote filename symlink-target)
+ (tramp-error
+ v 'file-error
+ "Symlink target `%s' on wrong host"
+ symlink-target))
+ (setq symlink-target localname))
+ (setq steps
+ (append (tramp-compat-split-string
+ symlink-target "/")
+ steps)))
+ (t
+ ;; It's a file.
+ (setq result (cons thisstep result)))))
+ (when (>= numchase numchase-limit)
+ (tramp-error
+ v 'file-error
+ "Maximum number (%d) of symlinks exceeded" numchase-limit))
+ (setq result (reverse result))
+ ;; Combine list to form string.
+ (setq result
+ (if result
+ (mapconcat 'identity (cons "" result) "/")
+ "/"))
+ (when (and is-dir
+ (or (string= "" result)
+ (not (string= (substring result -1) "/"))))
+ (setq result (concat result "/"))))))
+
+ (tramp-message v 4 "True name of `%s' is `%s'" localname result)
+ result)))))
;; Basic functions.
@@ -4307,7 +4311,7 @@ connection if a previous connection has died for some reason."
(tramp-compat-temporary-file-directory)))))
spec)
- ;; Add arguments for asynchrononous processes.
+ ;; Add arguments for asynchronous processes.
(when (and process-name async-args)
(setq login-args (append async-args login-args)))
@@ -5029,11 +5033,11 @@ function cell is returned to be applied on a buffer."
;; until the last but one hop via `start-file-process'. Apply it
;; also for ftp and smb.
;; * WIBNI if we had a command "trampclient"? If I was editing in
-;; some shell with root priviledges, it would be nice if I could
+;; some shell with root privileges, it would be nice if I could
;; just call
;; trampclient filename.c
;; as an editor, and the _current_ shell would connect to an Emacs
-;; server and would be used in an existing non-priviledged Emacs
+;; server and would be used in an existing non-privileged Emacs
;; session for doing the editing in question.
;; That way, I need not tell Emacs my password again and be afraid
;; that it makes it into core dumps or other ugly stuff (I had Emacs
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 150ef18be52..73b9339e25a 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -480,7 +480,7 @@ PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored."
;; Dissect NAME.
(with-parsed-tramp-file-name name nil
;; Tilde expansion if necessary. We use the user name as share,
- ;; which is offen the case in domains.
+ ;; which is often the case in domains.
(when (string-match "\\`/?~\\([^/]*\\)" localname)
(setq localname
(replace-match
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5fca1018095..0ee6ad8dea4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should
choose a shell here which groks tilde expansion. `/bin/sh' normally
does not understand tilde expansion.
-For encoding and deocding, commands like the following are executed:
+For encoding and decoding, commands like the following are executed:
/bin/sh -c COMMAND < INPUT > OUTPUT
@@ -3851,7 +3851,7 @@ Only works for Bourne-like shells."
;; expects English? Or just to set LC_MESSAGES to "C" if Tramp
;; expects only English messages? (Juri Linkov)
;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846)
-;; * I was wondering it it would be possible to use tramp even if I'm
+;; * I was wondering if it would be possible to use tramp even if I'm
;; actually using sshfs. But when I launch a command I would like
;; to get it executed on the remote machine where the files really
;; are. (Andrea Crotti)
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 56e9cb68c61..ea4a887898e 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -88,7 +88,7 @@
;;
;; (setq xesam-query-type 'fulltext-query)
;;
-;; Another option to be customised is the number of hits to be
+;; Another option to be customized is the number of hits to be
;; presented at once.
;;
;; (setq xesam-hits-per-page 50)
@@ -409,7 +409,7 @@ If there is no registered search engine at all, the function returns `nil'."
(setq vendor-id (xesam-get-property engine "vendor.id")
hit-fields (xesam-get-property engine "hit.fields"))
- ;; Ususally, `hit.fields' shall describe supported fields.
+ ;; Usually, `hit.fields' shall describe supported fields.
;; That is not the case now, so we set it ourselves.
;; Hopefully, this will change later.
(setq hit-fields
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index d801a4c094c..cc538c224dc 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -249,7 +249,7 @@ qualified name, i.e., it contains DOMAIN.
APROTOCOL stands for the network protocol family ADDRESS is
encoded (`zeroconf-avahi-protocol-inet4' means INET4,
`zeroconf-avahi-protocol-inet6' means INET6). It can be
-different from PROTOCOL, when an adrress resolution has been
+different from PROTOCOL, when an address resolution has been
requested for another protocol family but the default one.
ADDRESS is the service address, encoded according to the
@@ -486,7 +486,7 @@ TYPE. The resulting list has the format
(nth 9 (zeroconf-resolve-service service)))
-;;; Services signalling.
+;;; Services signaling.
;; Register for the service type browser. Service registrations will
;; happen in `zeroconf-service-type-browser-handler', when there is an
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-28 03:12:47 +0000