diff options
| author | Paul Eggert | 2013-06-30 08:10:33 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-06-30 08:10:33 -0700 |
| commit | adc5dbceb07a589a8ade9338522b15fc99bd520f (patch) | |
| tree | cda35dde0a52d723658b4375dcc4daa8a4443655 | |
| parent | 5d1c328614c3b8165ee3c9e9d3597f1fb0196ede (diff) | |
| download | emacs-adc5dbceb07a589a8ade9338522b15fc99bd520f.tar.gz emacs-adc5dbceb07a589a8ade9338522b15fc99bd520f.zip | |
Spelling fixes.
| -rw-r--r-- | doc/lispref/display.texi | 6 | ||||
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.13 | 2 | ||||
| -rw-r--r-- | lisp/calendar/todo-mode.el | 30 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 | ||||
| -rw-r--r-- | src/conf_post.h | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 | ||||
| -rw-r--r-- | test/automated/flymake-tests.el | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index ecefb684ee6..44fbc66a60e 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -4656,11 +4656,11 @@ aspect ratio may not be preserved. | |||
| 4656 | @item :max-width, :max-height | 4656 | @item :max-width, :max-height |
| 4657 | The @code{:max-width} and @code{:max-height} keywords are used for | 4657 | The @code{:max-width} and @code{:max-height} keywords are used for |
| 4658 | scaling if the size of the image of the image exceeds these values. | 4658 | scaling if the size of the image of the image exceeds these values. |
| 4659 | If @code{:width} is set it will have presedence over @code{max-width}, | 4659 | If @code{:width} is set it will have precedence over @code{max-width}, |
| 4660 | and if @code{:height} is set it will have presedence over | 4660 | and if @code{:height} is set it will have precedence over |
| 4661 | @code{max-height}, but you can otherwise mix these keywords as you | 4661 | @code{max-height}, but you can otherwise mix these keywords as you |
| 4662 | wish. @code{:max-width} and @code{:max-height} will always preserve | 4662 | wish. @code{:max-width} and @code{:max-height} will always preserve |
| 4663 | the aspec ratio. | 4663 | the aspect ratio. |
| 4664 | 4664 | ||
| 4665 | @item :rotation | 4665 | @item :rotation |
| 4666 | Specifies a rotation angle in degrees. | 4666 | Specifies a rotation angle in degrees. |
| @@ -369,7 +369,7 @@ New features include: | |||
| 369 | - support for multiple todo files and archive files of done items; | 369 | - support for multiple todo files and archive files of done items; |
| 370 | - renaming, reordering, moving, merging, and deleting categories; | 370 | - renaming, reordering, moving, merging, and deleting categories; |
| 371 | - sortable tabular summaries of categories and the types of items they contain; | 371 | - sortable tabular summaries of categories and the types of items they contain; |
| 372 | - cross-categorial lists of items filtered by specific criteria; | 372 | - cross-category lists of items filtered by specific criteria; |
| 373 | - more fine-grained interaction with the Emacs diary, by being able to decide | 373 | - more fine-grained interaction with the Emacs diary, by being able to decide |
| 374 | for each todo item whether it appears in the Fancy Diary display; | 374 | for each todo item whether it appears in the Fancy Diary display; |
| 375 | - highly flexible new item insertion and item editing; | 375 | - highly flexible new item insertion and item editing; |
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index ea463fc5ae0..bca8ce361bc 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 | |||
| @@ -12554,7 +12554,7 @@ | |||
| 12554 | 12554 | ||
| 12555 | 2007-08-23 John Wiegley <johnw@newartisans.com> | 12555 | 2007-08-23 John Wiegley <johnw@newartisans.com> |
| 12556 | 12556 | ||
| 12557 | * calendar/cal-bahai.el: Added in the diacriticals that were | 12557 | * calendar/cal-bahai.el: Added in the diacritics that were |
| 12558 | missing for many of the month names. | 12558 | missing for many of the month names. |
| 12559 | 12559 | ||
| 12560 | 2007-08-22 Jason Rumney <jasonr@gnu.org> | 12560 | 2007-08-22 Jason Rumney <jasonr@gnu.org> |
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 15fce457dcf..a497f759e87 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | ;; You can add new todo files and categories, rename categories, move | 40 | ;; You can add new todo files and categories, rename categories, move |
| 41 | ;; them to another file or delete them. You can also display summary | 41 | ;; them to another file or delete them. You can also display summary |
| 42 | ;; tables of the categories in a file and the types of items they | 42 | ;; tables of the categories in a file and the types of items they |
| 43 | ;; contain. And you can build cross-categorial lists of items that | 43 | ;; contain. And you can build cross-category lists of items that |
| 44 | ;; satisfy various criteria. | 44 | ;; satisfy various criteria. |
| 45 | 45 | ||
| 46 | ;; To get started, load this package and type `M-x todo-show'. This | 46 | ;; To get started, load this package and type `M-x todo-show'. This |
| @@ -440,7 +440,7 @@ less than or equal the category's top priority setting." | |||
| 440 | (((class color) (min-colors 16) (background dark)) :foreground "LightSteelBlue") | 440 | (((class color) (min-colors 16) (background dark)) :foreground "LightSteelBlue") |
| 441 | (((class color) (min-colors 8)) :foreground "blue" :weight bold) | 441 | (((class color) (min-colors 8)) :foreground "blue" :weight bold) |
| 442 | (t :weight bold)) | 442 | (t :weight bold)) |
| 443 | "Face for separator string bewteen done and not done todo items." | 443 | "Face for separator string between done and not done todo items." |
| 444 | :group 'todo-faces) | 444 | :group 'todo-faces) |
| 445 | 445 | ||
| 446 | (defface todo-done | 446 | (defface todo-done |
| @@ -1095,7 +1095,7 @@ Noninteractively, return the name of the new file." | |||
| 1095 | This makes the entire file visible and the buffer writeable and | 1095 | This makes the entire file visible and the buffer writeable and |
| 1096 | you can use the self-insertion keys and standard Emacs editing | 1096 | you can use the self-insertion keys and standard Emacs editing |
| 1097 | commands to make changes. To return to Todo mode, type | 1097 | commands to make changes. To return to Todo mode, type |
| 1098 | \\[todo-edit-quit]. This runs a file format check, signalling | 1098 | \\[todo-edit-quit]. This runs a file format check, signaling |
| 1099 | an error if the format has become invalid. However, this check | 1099 | an error if the format has become invalid. However, this check |
| 1100 | cannot tell if the number of items changed, which could result in | 1100 | cannot tell if the number of items changed, which could result in |
| 1101 | the file containing inconsistent information. For this reason | 1101 | the file containing inconsistent information. For this reason |
| @@ -1586,7 +1586,7 @@ marking of the next N items." | |||
| 1586 | (todo-forward-item)))) | 1586 | (todo-forward-item)))) |
| 1587 | 1587 | ||
| 1588 | (defun todo-mark-category () | 1588 | (defun todo-mark-category () |
| 1589 | "Mark all visiblw items in this category with `todo-item-mark'." | 1589 | "Mark all visible items in this category with `todo-item-mark'." |
| 1590 | (interactive) | 1590 | (interactive) |
| 1591 | (let* ((cat (todo-current-category)) | 1591 | (let* ((cat (todo-current-category)) |
| 1592 | (marks (assoc cat todo-categories-with-marks))) | 1592 | (marks (assoc cat todo-categories-with-marks))) |
| @@ -1628,7 +1628,7 @@ marking of the next N items." | |||
| 1628 | This is the function from which the generated Todo mode item | 1628 | This is the function from which the generated Todo mode item |
| 1629 | insertion commands derive. | 1629 | insertion commands derive. |
| 1630 | 1630 | ||
| 1631 | The generated commands have mnenomic key bindings based on the | 1631 | The generated commands have mnemonic key bindings based on the |
| 1632 | arguments' values and their order in the command's argument list, | 1632 | arguments' values and their order in the command's argument list, |
| 1633 | as follows: (1) for DIARY `d', (2) for NONMARKING `k', (3) for | 1633 | as follows: (1) for DIARY `d', (2) for NONMARKING `k', (3) for |
| 1634 | DATE-TYPE either `c' for calendar or `d' for date or `n' for | 1634 | DATE-TYPE either `c' for calendar or `d' for date or `n' for |
| @@ -3288,7 +3288,7 @@ categories display according to priority." | |||
| 3288 | 3288 | ||
| 3289 | In the initial display the categories are numbered, indicating | 3289 | In the initial display the categories are numbered, indicating |
| 3290 | their current order for navigating by \\[todo-forward-category] | 3290 | their current order for navigating by \\[todo-forward-category] |
| 3291 | and \\[todo-backward-category]. You can persistantly change the | 3291 | and \\[todo-backward-category]. You can permanently change the |
| 3292 | order of the category at point by typing | 3292 | order of the category at point by typing |
| 3293 | \\[todo-set-category-number], \\[todo-raise-category] or | 3293 | \\[todo-set-category-number], \\[todo-raise-category] or |
| 3294 | \\[todo-lower-category]. | 3294 | \\[todo-lower-category]. |
| @@ -4019,10 +4019,10 @@ regexp items." | |||
| 4019 | "Buffer type string for `todo-filter-items'.") | 4019 | "Buffer type string for `todo-filter-items'.") |
| 4020 | 4020 | ||
| 4021 | (defun todo-filter-items (filter &optional new multifile) | 4021 | (defun todo-filter-items (filter &optional new multifile) |
| 4022 | "Display a cross-categorial list of items filtered by FILTER. | 4022 | "Display a cross-category list of items filtered by FILTER. |
| 4023 | The values of FILTER can be `top' for top priority items, a cons | 4023 | The values of FILTER can be `top' for top priority items, a cons |
| 4024 | of `top' and a number passed by the caller, `diary' for diary | 4024 | of `top' and a number passed by the caller, `diary' for diary |
| 4025 | items, or `regexp' for items matching a regular expresion entered | 4025 | items, or `regexp' for items matching a regular expression entered |
| 4026 | by the user. The items can be from any categories in the current | 4026 | by the user. The items can be from any categories in the current |
| 4027 | todo file or, with non-nil MULTIFILE, from several files. If NEW | 4027 | todo file or, with non-nil MULTIFILE, from several files. If NEW |
| 4028 | is nil, visit an appropriate file containing the list of filtered | 4028 | is nil, visit an appropriate file containing the list of filtered |
| @@ -5069,7 +5069,7 @@ empty line above the done items separator." | |||
| 5069 | (not (looking-at (regexp-quote todo-nondiary-start)))))) | 5069 | (not (looking-at (regexp-quote todo-nondiary-start)))))) |
| 5070 | 5070 | ||
| 5071 | ;; This duplicates the item locating code from diary-goto-entry, but | 5071 | ;; This duplicates the item locating code from diary-goto-entry, but |
| 5072 | ;; without the marker code, to test whether the latter is dispensible. | 5072 | ;; without the marker code, to test whether the latter is dispensable. |
| 5073 | ;; If it is, diary-goto-entry can be simplified. The code duplication | 5073 | ;; If it is, diary-goto-entry can be simplified. The code duplication |
| 5074 | ;; here can also be eliminated, leaving only the widening and category | 5074 | ;; here can also be eliminated, leaving only the widening and category |
| 5075 | ;; selection, and instead of :override advice :around can be used. | 5075 | ;; selection, and instead of :override advice :around can be used. |
| @@ -5266,10 +5266,10 @@ The elements of ARGLIST may be atoms or lists." | |||
| 5266 | "Generator list for argument lists of item insertion commands.") | 5266 | "Generator list for argument lists of item insertion commands.") |
| 5267 | 5267 | ||
| 5268 | (defvar todo-insertion-commands-args | 5268 | (defvar todo-insertion-commands-args |
| 5269 | (let ((argslist (todo-gen-arglists todo-insertion-commands-args-genlist)) | 5269 | (let ((arglist (todo-gen-arglists todo-insertion-commands-args-genlist)) |
| 5270 | res new) | 5270 | res new) |
| 5271 | (setq res (cl-remove-duplicates | 5271 | (setq res (cl-remove-duplicates |
| 5272 | (apply 'append (mapcar 'todo-powerset argslist)) :test 'equal)) | 5272 | (apply 'append (mapcar 'todo-powerset arglist)) :test 'equal)) |
| 5273 | (dolist (l res) | 5273 | (dolist (l res) |
| 5274 | (unless (= 5 (length l)) | 5274 | (unless (= 5 (length l)) |
| 5275 | (let ((v (make-vector 5 nil)) elt) | 5275 | (let ((v (make-vector 5 nil)) elt) |
| @@ -5524,12 +5524,12 @@ categories from `todo-category-completions-files'." | |||
| 5524 | ;; Default to the current file. | 5524 | ;; Default to the current file. |
| 5525 | (unless file0 (setq file0 todo-current-todo-file)) | 5525 | (unless file0 (setq file0 todo-current-todo-file)) |
| 5526 | ;; First validate only a name passed interactively from | 5526 | ;; First validate only a name passed interactively from |
| 5527 | ;; todo-add-category, which must be of a nonexisting category. | 5527 | ;; todo-add-category, which must be of a nonexistent category. |
| 5528 | (unless (and (assoc cat categories) (not add)) | 5528 | (unless (and (assoc cat categories) (not add)) |
| 5529 | ;; Validate only against completion categories. | 5529 | ;; Validate only against completion categories. |
| 5530 | (let ((todo-categories categories)) | 5530 | (let ((todo-categories categories)) |
| 5531 | (setq cat (todo-validate-name cat 'category))) | 5531 | (setq cat (todo-validate-name cat 'category))) |
| 5532 | ;; When user enters a nonexisting category name by jumping or | 5532 | ;; When user enters a nonexistest category name by jumping or |
| 5533 | ;; moving, confirm that it should be added, then validate. | 5533 | ;; moving, confirm that it should be added, then validate. |
| 5534 | (unless add | 5534 | (unless add |
| 5535 | (if (todo-y-or-n-p (format "Add new category \"%s\" to file \"%s\"? " | 5535 | (if (todo-y-or-n-p (format "Add new category \"%s\" to file \"%s\"? " |
| @@ -5677,7 +5677,7 @@ number of the last the day of the month." | |||
| 5677 | (completing-read "Enter a day name: " | 5677 | (completing-read "Enter a day name: " |
| 5678 | (append calendar-day-name-array nil) | 5678 | (append calendar-day-name-array nil) |
| 5679 | nil t))) | 5679 | nil t))) |
| 5680 | 5680 | ||
| 5681 | (defun todo-read-time () | 5681 | (defun todo-read-time () |
| 5682 | "Prompt for and return a valid clock time as a string. | 5682 | "Prompt for and return a valid clock time as a string. |
| 5683 | 5683 | ||
| @@ -6221,7 +6221,7 @@ Filtered Items mode following todo (not done) items." | |||
| 6221 | ;; )) | 6221 | ;; )) |
| 6222 | 6222 | ||
| 6223 | ;; ----------------------------------------------------------------------------- | 6223 | ;; ----------------------------------------------------------------------------- |
| 6224 | ;;; Hook functions and mode definitions | 6224 | ;;; Hook functions and mode definitions |
| 6225 | ;; ----------------------------------------------------------------------------- | 6225 | ;; ----------------------------------------------------------------------------- |
| 6226 | 6226 | ||
| 6227 | (defun todo-show-current-file () | 6227 | (defun todo-show-current-file () |
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 899216c521a..f0bee06f26d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | (eww-colorize-region): Use `add-face-text-property'. | 80 | (eww-colorize-region): Use `add-face-text-property'. |
| 81 | 81 | ||
| 82 | * shr.el (shr-add-font): Append face data, so that we get the correct | 82 | * shr.el (shr-add-font): Append face data, so that we get the correct |
| 83 | presedence: The innermost value (which is applied first) wins. | 83 | precedence: The innermost value (which is applied first) wins. |
| 84 | (shr-make-overlay): Obsolete function. | 84 | (shr-make-overlay): Obsolete function. |
| 85 | 85 | ||
| 86 | * mm-decode.el (mm-convert-shr-links): New function to convert | 86 | * mm-decode.el (mm-convert-shr-links): New function to convert |
diff --git a/src/conf_post.h b/src/conf_post.h index 32c4341b7a3..b19456749a2 100644 --- a/src/conf_post.h +++ b/src/conf_post.h | |||
| @@ -231,7 +231,7 @@ extern void _DebPrint (const char *fmt, ...); | |||
| 231 | #define FOO_INLINE EXTERN_INLINE | 231 | #define FOO_INLINE EXTERN_INLINE |
| 232 | 232 | ||
| 233 | before including any .h file other than config.h. | 233 | before including any .h file other than config.h. |
| 234 | Other .c files should not define FOO_INILNE. | 234 | Other .c files should not define FOO_INLINE. |
| 235 | 235 | ||
| 236 | C99 compilers compile functions like 'incr' as C99-style extern | 236 | C99 compilers compile functions like 'incr' as C99-style extern |
| 237 | inline functions. Pre-C99 GCCs do something similar with | 237 | inline functions. Pre-C99 GCCs do something similar with |
diff --git a/src/xdisp.c b/src/xdisp.c index 660c6b9130f..89761a0cfdc 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -20387,7 +20387,7 @@ Value is the new character position of point. */) | |||
| 20387 | break; | 20387 | break; |
| 20388 | } | 20388 | } |
| 20389 | /* If we ended up on a composed character inside | 20389 | /* If we ended up on a composed character inside |
| 20390 | bidi-reordered text (e.g., Hebrew text with diacriticals), | 20390 | bidi-reordered text (e.g., Hebrew text with diacritics), |
| 20391 | the iterator gives us the buffer position of the last (in | 20391 | the iterator gives us the buffer position of the last (in |
| 20392 | logical order) character of the composed grapheme cluster, | 20392 | logical order) character of the composed grapheme cluster, |
| 20393 | which is not what we want. So we cheat: we compute the | 20393 | which is not what we want. So we cheat: we compute the |
diff --git a/test/automated/flymake-tests.el b/test/automated/flymake-tests.el index 6b68a956db8..9cc87b608ad 100644 --- a/test/automated/flymake-tests.el +++ b/test/automated/flymake-tests.el | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | (face-at-point)) | 43 | (face-at-point)) |
| 44 | (and buffer (kill-buffer buffer))))) | 44 | (and buffer (kill-buffer buffer))))) |
| 45 | 45 | ||
| 46 | (ert-deftest warnining-predicate-rx-gcc () | 46 | (ert-deftest warning-predicate-rx-gcc () |
| 47 | "Test GCC warning via regexp predicate." | 47 | "Test GCC warning via regexp predicate." |
| 48 | :expected-result (if (executable-find "gcc") :passed :failed) | 48 | :expected-result (if (executable-find "gcc") :passed :failed) |
| 49 | (should (eq 'flymake-warnline | 49 | (should (eq 'flymake-warnline |