diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bookmark.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-global.el | 2 | ||||
| -rw-r--r-- | lisp/image-dired.el | 8 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-init.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-ptch.el | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index f3c8b2a755f..7d45832f58c 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -2123,7 +2123,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\ (current-buffer)))) (read-string "Pattern: ") (when timer (cancel-timer timer) (setq timer nil))) - (when timer ;; Signalled an error or a `quit'. + (when timer ;; Signaled an error or a `quit'. (cancel-timer timer) (bookmark-bmenu-list) (bookmark-bmenu-goto-bookmark bmk))))) diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index 03a21b0ee0d..4793c53f80d 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el @@ -47,7 +47,7 @@ in a GNU Global supported hierarchy. Two sanity checks are performed to assure (a) that GNU global program exists and (b) that the GNU global program version is compatibility with the database -version. If optional NOERROR is nil, then an error may be signalled on version +version. If optional NOERROR is nil, then an error may be signaled on version mismatch. If NOERROR is not nil, then no error will be signaled. Instead return value will indicate success or failure with non-nil or nil respective values." diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 560cadbe75b..2af72fc4527 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -262,7 +262,7 @@ is replaced by the file name of the temporary file." (executable-find "pngnq-s9")) "The file name of the `pngnq' program. It quantizes colors of PNG images down to 256 colors or fewer -using the Neuquant procedure." +using the NeuQuant algorithm." :version "26.1" :type '(choice (const :tag "Not Set" nil) file) :group 'image-dired) @@ -702,7 +702,7 @@ Increase at own risk.") process)) (defun image-dired-pngcrush-thumb (spec) - "Optimize thumbnail decsribed by format SPEC with pngcrush(1)." + "Optimize thumbnail described by format SPEC with pngcrush(1)." ;; If pngnq wasn't run, then the THUMB-nq8.png file does not exist. ;; pngcrush needs an infile and outfile, so we just copy THUMB to ;; THUMB-nq8.png and use the latter as a temp file. @@ -727,7 +727,7 @@ Increase at own risk.") process)) (defun image-dired-optipng-thumb (spec) - "Optimize thumbnail decsribed by format SPEC with optipng(1)." + "Optimize thumbnail described by format SPEC with optipng(1)." (let ((process (apply #'start-process "image-dired-optipng" nil image-dired-cmd-optipng-program @@ -765,7 +765,7 @@ Increase at own risk.") (make-directory thumbnail-dir t) (set-file-modes thumbnail-dir #o700)) - ;; Thumbnail file creation processes begin here and are marshalled + ;; Thumbnail file creation processes begin here and are marshaled ;; in a queue by `image-dired-create-thumb'. (setq process (apply #'start-process "image-dired-create-thumbnail" nil diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 5b48c8d93df..d5ea002fa82 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1884,7 +1884,7 @@ With a prefix argument, REVERSE the hunk." ;; Advance to the next hunk with skip-hunk-start set to t ;; because we want the behavior of moving to the next logical ;; hunk, not the original behavior where were would sometimes - ;; stay on the curent hunk. This is the behavior we get when + ;; stay on the current hunk. This is the behavior we get when ;; navigating through hunks interactively, and we want it when ;; applying hunks too (see http://debbugs.gnu.org/17544). (when diff-advance-after-apply-hunk diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index b0d5d2fabc4..c96a9684ac8 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -318,7 +318,7 @@ It needs to be killed when we quit the session.") (defsubst ediff-patch-metajob (&optional metajob) (memq (or metajob ediff-metajob-name) '(ediff-multifile-patch))) -;; metajob involving only one group of files, such as multipatch or directory +;; metajob involving only one group of files, such as multi-patch or directory ;; revision (defsubst ediff-one-filegroup-metajob (&optional metajob) (or (ediff-revision-metajob metajob) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 3effd9b2cf9..9f0e1dcf4f7 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -431,15 +431,15 @@ Please advise: (f2-exists (setcar session-file-object file2)) (f1-exists (setcar session-file-object file1)) (t - ;; TODO: Often for multipaches the file doesn't exist because the - ;; directory part is wrong; for instance, if the patch need to - ;; be applied into + ;; TODO: Often for multi-patches the file doesn't exist + ;; because the directory part is wrong; for instance, if the + ;; patch needs to be applied into ;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory) ;; and default-directory is ;; (expand-file-name "lisp" source-directory) ;; then Ediff assumes the wrong file: ;; (expand-file-name "lisp/ediff-ptch.el" source-directory). - ;; We might identify these common failoures and suggest + ;; We might identify these common failures and suggest ;; in the prompt the possible corrected file. --Tino (with-output-to-temp-buffer ediff-msg-buffer (ediff-with-current-buffer standard-output |