diff options
| author | Paul Eggert | 2016-12-22 10:13:46 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-12-22 10:14:11 -0800 |
| commit | 73349822cbd6e50526eda9c75453584d73dfca83 (patch) | |
| tree | 444c07a3fbaaf3b2b02e1a08a18bad5bab7bbef0 /lisp | |
| parent | b10bd71987cdeb753c106145d6270a359505359c (diff) | |
| download | emacs-73349822cbd6e50526eda9c75453584d73dfca83.tar.gz emacs-73349822cbd6e50526eda9c75453584d73dfca83.zip | |
; Spelling fixes
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>\\ | |||
| 2123 | (current-buffer)))) | 2123 | (current-buffer)))) |
| 2124 | (read-string "Pattern: ") | 2124 | (read-string "Pattern: ") |
| 2125 | (when timer (cancel-timer timer) (setq timer nil))) | 2125 | (when timer (cancel-timer timer) (setq timer nil))) |
| 2126 | (when timer ;; Signalled an error or a `quit'. | 2126 | (when timer ;; Signaled an error or a `quit'. |
| 2127 | (cancel-timer timer) | 2127 | (cancel-timer timer) |
| 2128 | (bookmark-bmenu-list) | 2128 | (bookmark-bmenu-list) |
| 2129 | (bookmark-bmenu-goto-bookmark bmk))))) | 2129 | (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. | |||
| 47 | 47 | ||
| 48 | Two sanity checks are performed to assure (a) that GNU global program exists | 48 | Two sanity checks are performed to assure (a) that GNU global program exists |
| 49 | and (b) that the GNU global program version is compatibility with the database | 49 | and (b) that the GNU global program version is compatibility with the database |
| 50 | version. If optional NOERROR is nil, then an error may be signalled on version | 50 | version. If optional NOERROR is nil, then an error may be signaled on version |
| 51 | mismatch. If NOERROR is not nil, then no error will be signaled. Instead | 51 | mismatch. If NOERROR is not nil, then no error will be signaled. Instead |
| 52 | return value will indicate success or failure with non-nil or nil respective | 52 | return value will indicate success or failure with non-nil or nil respective |
| 53 | values." | 53 | 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." | |||
| 262 | (executable-find "pngnq-s9")) | 262 | (executable-find "pngnq-s9")) |
| 263 | "The file name of the `pngnq' program. | 263 | "The file name of the `pngnq' program. |
| 264 | It quantizes colors of PNG images down to 256 colors or fewer | 264 | It quantizes colors of PNG images down to 256 colors or fewer |
| 265 | using the Neuquant procedure." | 265 | using the NeuQuant algorithm." |
| 266 | :version "26.1" | 266 | :version "26.1" |
| 267 | :type '(choice (const :tag "Not Set" nil) file) | 267 | :type '(choice (const :tag "Not Set" nil) file) |
| 268 | :group 'image-dired) | 268 | :group 'image-dired) |
| @@ -702,7 +702,7 @@ Increase at own risk.") | |||
| 702 | process)) | 702 | process)) |
| 703 | 703 | ||
| 704 | (defun image-dired-pngcrush-thumb (spec) | 704 | (defun image-dired-pngcrush-thumb (spec) |
| 705 | "Optimize thumbnail decsribed by format SPEC with pngcrush(1)." | 705 | "Optimize thumbnail described by format SPEC with pngcrush(1)." |
| 706 | ;; If pngnq wasn't run, then the THUMB-nq8.png file does not exist. | 706 | ;; If pngnq wasn't run, then the THUMB-nq8.png file does not exist. |
| 707 | ;; pngcrush needs an infile and outfile, so we just copy THUMB to | 707 | ;; pngcrush needs an infile and outfile, so we just copy THUMB to |
| 708 | ;; THUMB-nq8.png and use the latter as a temp file. | 708 | ;; THUMB-nq8.png and use the latter as a temp file. |
| @@ -727,7 +727,7 @@ Increase at own risk.") | |||
| 727 | process)) | 727 | process)) |
| 728 | 728 | ||
| 729 | (defun image-dired-optipng-thumb (spec) | 729 | (defun image-dired-optipng-thumb (spec) |
| 730 | "Optimize thumbnail decsribed by format SPEC with optipng(1)." | 730 | "Optimize thumbnail described by format SPEC with optipng(1)." |
| 731 | (let ((process | 731 | (let ((process |
| 732 | (apply #'start-process "image-dired-optipng" nil | 732 | (apply #'start-process "image-dired-optipng" nil |
| 733 | image-dired-cmd-optipng-program | 733 | image-dired-cmd-optipng-program |
| @@ -765,7 +765,7 @@ Increase at own risk.") | |||
| 765 | (make-directory thumbnail-dir t) | 765 | (make-directory thumbnail-dir t) |
| 766 | (set-file-modes thumbnail-dir #o700)) | 766 | (set-file-modes thumbnail-dir #o700)) |
| 767 | 767 | ||
| 768 | ;; Thumbnail file creation processes begin here and are marshalled | 768 | ;; Thumbnail file creation processes begin here and are marshaled |
| 769 | ;; in a queue by `image-dired-create-thumb'. | 769 | ;; in a queue by `image-dired-create-thumb'. |
| 770 | (setq process | 770 | (setq process |
| 771 | (apply #'start-process "image-dired-create-thumbnail" nil | 771 | (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." | |||
| 1884 | ;; Advance to the next hunk with skip-hunk-start set to t | 1884 | ;; Advance to the next hunk with skip-hunk-start set to t |
| 1885 | ;; because we want the behavior of moving to the next logical | 1885 | ;; because we want the behavior of moving to the next logical |
| 1886 | ;; hunk, not the original behavior where were would sometimes | 1886 | ;; hunk, not the original behavior where were would sometimes |
| 1887 | ;; stay on the curent hunk. This is the behavior we get when | 1887 | ;; stay on the current hunk. This is the behavior we get when |
| 1888 | ;; navigating through hunks interactively, and we want it when | 1888 | ;; navigating through hunks interactively, and we want it when |
| 1889 | ;; applying hunks too (see http://debbugs.gnu.org/17544). | 1889 | ;; applying hunks too (see http://debbugs.gnu.org/17544). |
| 1890 | (when diff-advance-after-apply-hunk | 1890 | (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.") | |||
| 318 | (defsubst ediff-patch-metajob (&optional metajob) | 318 | (defsubst ediff-patch-metajob (&optional metajob) |
| 319 | (memq (or metajob ediff-metajob-name) | 319 | (memq (or metajob ediff-metajob-name) |
| 320 | '(ediff-multifile-patch))) | 320 | '(ediff-multifile-patch))) |
| 321 | ;; metajob involving only one group of files, such as multipatch or directory | 321 | ;; metajob involving only one group of files, such as multi-patch or directory |
| 322 | ;; revision | 322 | ;; revision |
| 323 | (defsubst ediff-one-filegroup-metajob (&optional metajob) | 323 | (defsubst ediff-one-filegroup-metajob (&optional metajob) |
| 324 | (or (ediff-revision-metajob metajob) | 324 | (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: | |||
| 431 | (f2-exists (setcar session-file-object file2)) | 431 | (f2-exists (setcar session-file-object file2)) |
| 432 | (f1-exists (setcar session-file-object file1)) | 432 | (f1-exists (setcar session-file-object file1)) |
| 433 | (t | 433 | (t |
| 434 | ;; TODO: Often for multipaches the file doesn't exist because the | 434 | ;; TODO: Often for multi-patches the file doesn't exist |
| 435 | ;; directory part is wrong; for instance, if the patch need to | 435 | ;; because the directory part is wrong; for instance, if the |
| 436 | ;; be applied into | 436 | ;; patch needs to be applied into |
| 437 | ;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory) | 437 | ;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory) |
| 438 | ;; and default-directory is | 438 | ;; and default-directory is |
| 439 | ;; (expand-file-name "lisp" source-directory) | 439 | ;; (expand-file-name "lisp" source-directory) |
| 440 | ;; then Ediff assumes the wrong file: | 440 | ;; then Ediff assumes the wrong file: |
| 441 | ;; (expand-file-name "lisp/ediff-ptch.el" source-directory). | 441 | ;; (expand-file-name "lisp/ediff-ptch.el" source-directory). |
| 442 | ;; We might identify these common failoures and suggest | 442 | ;; We might identify these common failures and suggest |
| 443 | ;; in the prompt the possible corrected file. --Tino | 443 | ;; in the prompt the possible corrected file. --Tino |
| 444 | (with-output-to-temp-buffer ediff-msg-buffer | 444 | (with-output-to-temp-buffer ediff-msg-buffer |
| 445 | (ediff-with-current-buffer standard-output | 445 | (ediff-with-current-buffer standard-output |