From: Michael Albinus Date: Sat, 5 Feb 2011 09:52:07 +0000 (+0100) Subject: Replace "explicite" with "explicit" globally X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1031 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c68ca0e31c448062847e34ba4dc0d96ae6dbf66;p=emacs.git Replace "explicite" with "explicit" globally Replace "instead of" with "instead" where there was nothing after "of" Audit use of comma before interrogative pronoun, "that", or "which" --- diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index c893ce797ed..a98e523a68b 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -33,7 +33,7 @@ ;; - localname is NIL. This are reusable properties. Examples: ;; "remote-shell" identifies the POSIX shell to be called on the ;; remote host, or "perl" is the command to be called on the remote -;; host, when starting a Perl script. These properties are saved in +;; host when starting a Perl script. These properties are saved in ;; the file `tramp-persistency-file-name'. ;; ;; - localname is a string. This are temporary properties, which are diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 4dcc3d5484e..3c0642c3c78 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -156,7 +156,7 @@ 'set-file-times filename time))))) ;; We currently use "[" and "]" in the filename format for IPv6 - ;; hosts of GNU Emacs. This means, that Emacs wants to expand + ;; hosts of GNU Emacs. This means that Emacs wants to expand ;; wildcards if `find-file-wildcards' is non-nil, and then barfs ;; because no expansion could be found. We detect this situation ;; and do something really awful: we have `file-expand-wildcards' diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 0f3a0cf33ff..57cc54935dc 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1212,14 +1212,14 @@ connection if a previous connection has died for some reason." ;; Enable auth-sorce and password-cache. (tramp-set-connection-property vec "first-password-request" t) - ;; There will be a callback of "askPassword", when a password is + ;; There will be a callback of "askPassword" when a password is ;; needed. (dbus-register-method :session dbus-service-emacs object-path tramp-gvfs-interface-mountoperation "askPassword" 'tramp-gvfs-handler-askpassword) - ;; There could be a callback of "askQuestion", when adding fingerprint. + ;; There could be a callback of "askQuestion" when adding fingerprint. (dbus-register-method :session dbus-service-emacs object-path tramp-gvfs-interface-mountoperation "askQuestion" @@ -1426,7 +1426,7 @@ They are retrieved from the hal daemon." ;;; TODO: ;; * Host name completion via smb-server or smb-network. -;; * Check, how two shares of the same SMB server can be mounted in +;; * Check how two shares of the same SMB server can be mounted in ;; parallel. ;; * Apply SDP on bluetooth devices, in order to filter out obex ;; capability. diff --git a/lisp/net/tramp-imap.el b/lisp/net/tramp-imap.el index e0799e070ab..3a536103c3d 100644 --- a/lisp/net/tramp-imap.el +++ b/lisp/net/tramp-imap.el @@ -265,7 +265,7 @@ of `copy' and `rename'." filename newname) ;; We just make a local copy of FILENAME, and write it then to - ;; NEWNAME. This must be optimized, when both files are + ;; NEWNAME. This must be optimized when both files are ;; located on the same IMAP server. (with-temp-buffer (if (and t1 t2) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 151758b1e9a..63a4c19eccf 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -66,7 +66,7 @@ files conditionalize this setup based on the TERM environment variable." :group 'tramp :type 'string) -;; ksh on OpenBSD 4.5 requires, that $PS1 contains a `#' character for +;; ksh on OpenBSD 4.5 requires that $PS1 contains a `#' character for ;; root users. It uses the `$' character for other users. In order ;; to guarantee a proper prompt, we use "#$ " for the prompt. @@ -509,7 +509,7 @@ entry ENVVARNAME= diables 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 -not be set here. Instead of, it should be set via `tramp-remote-path'." +not be set here. Instead, it should be set via `tramp-remote-path'." :group 'tramp :type '(repeat string)) @@ -2209,7 +2209,7 @@ The method used must be an out-of-band method." (with-parsed-tramp-file-name (if t1 filename newname) nil (if (and t1 t2) - ;; Both are Tramp files. We shall optimize it, when the + ;; Both are Tramp files. We shall optimize it when the ;; methods for filename and newname are the same. (let* ((dir-flag (file-directory-p filename)) (tmpfile (tramp-compat-make-temp-file localname dir-flag))) @@ -2405,7 +2405,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." (tramp-send-command v (format "rm -rf %s" (tramp-shell-quote-argument localname)) - ;; Don't read the output, do it explicitely. + ;; Don't read the output, do it explicitly. nil t) ;; Wait for the remote system to return to us... ;; This might take a while, allow it plenty of time. @@ -3150,7 +3150,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." ;; filename does not exist (eq modes nil) it has been ;; renamed to the backup file. This case `save-buffer' ;; handles permissions. - ;; Ensure, that it is still readable. + ;; Ensure that it is still readable. (when modes (set-file-modes tmpfile @@ -3296,7 +3296,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." (when (or (eq visit t) (stringp visit)) (let ((file-attr (file-attributes filename))) (set-visited-file-modtime - ;; We must pass modtime explicitely, because filename can + ;; We must pass modtime explicitly, because filename can ;; be different from (buffer-file-name), f.e. if ;; `file-precious-flag' is set. (nth 5 file-attr)) @@ -3403,7 +3403,7 @@ Fall back to normal file name handler if no Tramp handler exists." (with-parsed-tramp-file-name filename nil (cond ;; That's what we want: file names, for which checks are - ;; applied. We assume, that VC uses only `file-exists-p' and + ;; applied. We assume that VC uses only `file-exists-p' and ;; `file-readable-p' checks; otherwise we must extend the ;; list. We do not perform any action, but return nil, in ;; order to keep `vc-registered' running. @@ -4303,7 +4303,7 @@ connection if a previous connection has died for some reason." ;; it is just a prefix for the ControlPath option ;; of ssh; the real temporary file has another ;; name, and it is created and protected by ssh. - ;; It is also removed by ssh, when the connection + ;; It is also removed by ssh when the connection ;; is closed. (tmpfile (tramp-set-connection-property @@ -5074,7 +5074,7 @@ function cell is returned to be applied on a buffer." ;; * It makes me wonder if tramp couldn't fall back to ssh when scp ;; isn't on the remote host. (Mark A. Hershberger) ;; * Use lsh instead of ssh. (Alfred M. Szmidt) -;; * Optimize out-of-band copying, when both methods are scp-like (not +;; * Optimize out-of-band copying when both methods are scp-like (not ;; rsync). ;; * Keep a second connection open for out-of-band methods like scp or ;; rsync.