diff options
| author | Paul Eggert | 2013-02-01 22:04:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-02-01 22:04:06 -0800 |
| commit | d9c287e589bdb05c2c818e340946546868d34e04 (patch) | |
| tree | 14207931ccd04c3c7af811f1b298bdd7f578221c | |
| parent | 94fbc901707d7c1fd7ec0471d288e585caf59b34 (diff) | |
| download | emacs-d9c287e589bdb05c2c818e340946546868d34e04.tar.gz emacs-d9c287e589bdb05c2c818e340946546868d34e04.zip | |
Spelling fixes.
| -rw-r--r-- | lisp/progmodes/cc-awk.el | 5 | ||||
| -rw-r--r-- | lisp/progmodes/make-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 2 | ||||
| -rw-r--r-- | src/w32.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 0711bc983e8..4b3fc91b0ff 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el | |||
| @@ -142,7 +142,7 @@ | |||
| 142 | 142 | ||
| 143 | (defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]") | 143 | (defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]") |
| 144 | ;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a | 144 | ;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a |
| 145 | ;; localisation string in gawk 3.1 | 145 | ;; localization string in gawk 3.1 |
| 146 | (defconst c-awk-harmless-line-string*-re | 146 | (defconst c-awk-harmless-line-string*-re |
| 147 | (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*")) | 147 | (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*")) |
| 148 | ;; Matches a (possibly empty) sequence of chars without unescaped /, ", \, | 148 | ;; Matches a (possibly empty) sequence of chars without unescaped /, ", \, |
| @@ -795,7 +795,8 @@ | |||
| 795 | (setq anchor (point)) | 795 | (setq anchor (point)) |
| 796 | (search-forward-regexp c-awk-harmless-string*-here-re nil t) | 796 | (search-forward-regexp c-awk-harmless-string*-here-re nil t) |
| 797 | ;; We are now looking at either a " or a / or a brace/paren/semicolon. | 797 | ;; We are now looking at either a " or a / or a brace/paren/semicolon. |
| 798 | ;; Do our thing on the string, regexp or divsion sign or update our state. | 798 | ;; Do our thing on the string, regexp or division sign or update |
| 799 | ;; our state. | ||
| 799 | (setq anchor-state-/div | 800 | (setq anchor-state-/div |
| 800 | (cond | 801 | (cond |
| 801 | ((looking-at "_?\"") | 802 | ((looking-at "_?\"") |
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 60807f10742..20673866bc4 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el | |||
| @@ -1304,7 +1304,7 @@ Fill comments, backslashed lines, and variable definitions specially." | |||
| 1304 | (save-restriction | 1304 | (save-restriction |
| 1305 | (narrow-to-region beginning end) | 1305 | (narrow-to-region beginning end) |
| 1306 | (makefile-backslash-region (point-min) (point-max) t) | 1306 | (makefile-backslash-region (point-min) (point-max) t) |
| 1307 | ;; Backslashed newlines are marked as puncutations, so when | 1307 | ;; Backslashed newlines are marked as punctuation, so when |
| 1308 | ;; fill-delete-newlines turns the LF into SPC, we end up with spaces | 1308 | ;; fill-delete-newlines turns the LF into SPC, we end up with spaces |
| 1309 | ;; which back-to-indentation (called via fill-newline -> | 1309 | ;; which back-to-indentation (called via fill-newline -> |
| 1310 | ;; fill-indent-to-left-margin -> indent-line-to) thinks are real code | 1310 | ;; fill-indent-to-left-margin -> indent-line-to) thinks are real code |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2cb108cc316..35c5ba19e33 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2334,7 +2334,7 @@ Argument OUTPUT is a string with the output from the comint process." | |||
| 2334 | ;; encounters an exception, it prints the _entire_ stack | 2334 | ;; encounters an exception, it prints the _entire_ stack |
| 2335 | ;; trace. To handle all of these cases, we want to find | 2335 | ;; trace. To handle all of these cases, we want to find |
| 2336 | ;; the _last_ stack frame printed in the most recent | 2336 | ;; the _last_ stack frame printed in the most recent |
| 2337 | ;; batch of output, then jump to the corrsponding | 2337 | ;; batch of output, then jump to the corresponding |
| 2338 | ;; file/line number. | 2338 | ;; file/line number. |
| 2339 | (goto-char (point-max)) | 2339 | (goto-char (point-max)) |
| 2340 | (when (re-search-backward python-pdbtrack-stacktrace-info-regexp nil t) | 2340 | (when (re-search-backward python-pdbtrack-stacktrace-info-regexp nil t) |
diff --git a/lisp/simple.el b/lisp/simple.el index 3481a736648..d7541f68778 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -802,7 +802,7 @@ other words, it will work just like `just-one-space' command." | |||
| 802 | (unless (= start end) | 802 | (unless (= start end) |
| 803 | (cons orig-pos (buffer-substring start (point))))) | 803 | (cons orig-pos (buffer-substring start (point))))) |
| 804 | ;; If this run causes no change in buffer content, delete all spaces, | 804 | ;; If this run causes no change in buffer content, delete all spaces, |
| 805 | ;; otherwise delete all excees spaces. | 805 | ;; otherwise delete all excess spaces. |
| 806 | (delete-region (if (and (not single-shot) (zerop n) (= mid end)) | 806 | (delete-region (if (and (not single-shot) (zerop n) (= mid end)) |
| 807 | start mid) end) | 807 | start mid) end) |
| 808 | (insert (make-string n ?\s)))) | 808 | (insert (make-string n ?\s)))) |
| @@ -4280,7 +4280,7 @@ fstatat (int fd, char const *name, struct stat *st, int flags) | |||
| 4280 | /* Rely on a hack: an open directory is modeled as file descriptor 0. | 4280 | /* Rely on a hack: an open directory is modeled as file descriptor 0. |
| 4281 | This is good enough for the current usage in Emacs, but is fragile. | 4281 | This is good enough for the current usage in Emacs, but is fragile. |
| 4282 | 4282 | ||
| 4283 | FIXME: Add proper support for fdopendir, fstatatat, readlinkat. | 4283 | FIXME: Add proper support for fdopendir, fstatat, readlinkat. |
| 4284 | Gnulib does this and can serve as a model. */ | 4284 | Gnulib does this and can serve as a model. */ |
| 4285 | char fullname[MAX_PATH]; | 4285 | char fullname[MAX_PATH]; |
| 4286 | 4286 | ||