diff options
| -rw-r--r-- | leim/ChangeLog | 11 | ||||
| -rw-r--r-- | leim/quail/cyrillic.el | 2 | ||||
| -rw-r--r-- | leim/quail/ethiopic.el | 2 | ||||
| -rw-r--r-- | lisp/international/ucs-normalize.el | 2 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 2 | ||||
| -rw-r--r-- | lisp/org/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/org/org-agenda.el | 6 | ||||
| -rw-r--r-- | lisp/org/org-icalendar.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-table.el | 2 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/ChangeLog.10 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.8 | 6 | ||||
| -rw-r--r-- | src/buffer.c | 2 | ||||
| -rw-r--r-- | src/character.c | 2 | ||||
| -rw-r--r-- | src/charset.c | 2 | ||||
| -rw-r--r-- | src/editfns.c | 4 |
17 files changed, 32 insertions, 24 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 82edb14ffb..292097559f 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,7 +1,11 @@ +2011-02-23 Juanma Barranquero <[email protected]> + + * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring. + 2010-08-28 Kenichi Handa <[email protected]> - * quail/japanese.el (quail-japanese-update-translation): Fix - handling of invalid key. + * quail/japanese.el (quail-japanese-update-translation): + Fix handling of invalid key. 2010-08-15 Andreas Schwab <[email protected]> @@ -19,8 +23,7 @@ 2010-08-13 Kenichi Handa <[email protected]> - * quail/greek.el ("greek-postfix"): Add rules for Greek style - quotes. + * quail/greek.el ("greek-postfix"): Add rules for Greek style quotes. 2010-08-09 Kenichi Handa <[email protected]> diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el index 8a09083593..4d78a7504a 100644 --- a/leim/quail/cyrillic.el +++ b/leim/quail/cyrillic.el @@ -40,7 +40,7 @@ ;; This was `cyrillic-jcuken'. Alexander Mikhailian ;; <[email protected]> says: "cyrillic-jcuken" is actually ;; russian. It is ok but a bit outdated. This layout has been used -;; in typewriters for ages but it has been superceeded on desktops by +;; in typewriters for ages but it has been superseded on desktops by ;; a variation of this layout, implemented in M$ Windows software. ;; The Windows layout is greatly preferred because of the comma and ;; period being placed more conviniently and, of course, because of diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el index 7a299512d7..b6e2fee2b4 100644 --- a/leim/quail/ethiopic.el +++ b/leim/quail/ethiopic.el @@ -62,7 +62,7 @@ S-SPC or `M-x ethio-insert-ethio-space' C-' or `M-x ethio-gemination' Compose the character before the point with the Ethiopic gemination mark. - If the characater is already composed, decompose it and remove the + If the character is already composed, decompose it and remove the gemination mark." ;; The following keys should work as defined in lisp/language/ethio-util, diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index fc15b57fed..afd6769e65 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -100,7 +100,7 @@ ;; D. Sorting and Composition of Smaller Blocks (`ucs-normalize-block-compose-chars') ;; ;; The block will be split to multiple samller blocks by starter -;; charcters. Each block is sorted, and composed if necessary. +;; characters. Each block is sorted, and composed if necessary. ;; ;; E. Composition of Entire Block (`ucs-normalize-compose-chars') ;; diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 039f8cc9cb..e2bda8fb76 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4297,7 +4297,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "736579c1ea88e1f0e1ec21b8a50bc2a2") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 8019e4cc09..80f63a1ee7 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,7 +1,12 @@ 2011-02-23 Juanma Barranquero <[email protected]> + * org.el (org-maybe-keyword-time-regexp): + * org-icalendar.el (org-icalendar-store-UID): + * org-agenda.el (org-agenda-scheduled-leaders) + (org-agenda-deadline-leaders, org-agenda-filter-preset): * org-table.el (org-table-current-line-types) (org-table-current-begin-line, org-table-current-begin-pos): + (org-table-current-field-formula): Fix typos in docstrings. 2010-10-22 Juanma Barranquero <[email protected]> diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 31cfa8ca17..4ad19b3733 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -1151,7 +1151,7 @@ range, respectively." (function)))) (defcustom org-agenda-scheduled-leaders '("Scheduled: " "Sched.%2dx: ") - "Text preceeding scheduled items in the agenda view. + "Text preceding scheduled items in the agenda view. This is a list with two strings. The first applies when the item is scheduled on the current day. The second applies when it has been scheduled previously, it may contain a %d indicating that this is the nth time that @@ -1164,7 +1164,7 @@ that passed since this item was scheduled first." (string :tag "Scheduled previously"))) (defcustom org-agenda-deadline-leaders '("Deadline: " "In %3d d.: ") - "Text preceeding deadline items in the agenda view. + "Text preceding deadline items in the agenda view. This is a list with two strings. The first applies when the item has its deadline on the current day. The second applies when it is in the past or in the future, it may contain %d to capture how many days away the deadline @@ -2559,7 +2559,7 @@ removed from the entry content. Currently only `planning' is allowed here." (defvar org-agenda-filter nil) (defvar org-agenda-filter-preset nil "A preset of the tags filter used for secondary agenda filtering. -This must be a list of strings, each string must be a single tag preceeded +This must be a list of strings, each string must be a single tag preceded by \"+\" or \"-\". This variable should not be set directly, but agenda custom commands can bind it in the options section.") diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el index 77e64d10a3..749d54341d 100644 --- a/lisp/org/org-icalendar.el +++ b/lisp/org/org-icalendar.el @@ -157,7 +157,7 @@ The iCalendar standard requires that all entries have a unique identifier. Org will create these identifiers as needed. When this variable is non-nil, the created UIDs will be stored in the ID property of the entry. Then the next time this entry is exported, it will be exported with the same UID, -superceding the previous form of it. This is essential for +superseding the previous form of it. This is essential for synchronization services. This variable is not turned on by default because we want to avoid creating a property drawer in every entry if people are only playing with this feature, diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 5bef54a928..7d93a82f84 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -1787,7 +1787,7 @@ If NLAST is a number, only the NLAST fields will actually be summed." "Return the formula active for the current field. Assumes that specials are in place. If KEY is given, return the key to this formula. -Otherwise return the formula preceeded with \"=\" or \":=\"." +Otherwise return the formula preceded with \"=\" or \":=\"." (let* ((name (car (rassoc (list (org-current-line) (org-table-current-column)) org-table-named-field-locations))) diff --git a/lisp/org/org.el b/lisp/org/org.el index 6fe3c96bec..a7984df848 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -3659,7 +3659,7 @@ Also put tags into group 4 if tags are present.") "Matches any of the 3 keywords, together with the time stamp.") (make-variable-buffer-local 'org-keyword-time-not-clock-regexp) (defvar org-maybe-keyword-time-regexp nil - "Matches a timestamp, possibly preceeded by a keyword.") + "Matches a timestamp, possibly preceded by a keyword.") (make-variable-buffer-local 'org-maybe-keyword-time-regexp) (defvar org-planning-or-clock-line-re nil "Matches a line with planning or clock info.") diff --git a/src/ChangeLog b/src/ChangeLog index f9c1581154..0fdc151e54 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -15960,7 +15960,7 @@ * search.c (search_buffer): Give up BM search on case-fold-search if one of a target character has a case-equivalence of different - byte length even if that target charcter is an ASCII. + byte length even if that target character is an ASCII. (simple_search): Fix calculation of byte length of matched text. (boyer_moore): Fix handling of case-equivalent multibyte characters. diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index b62faf1734..e012478447 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -6918,7 +6918,7 @@ * search.c (search_buffer): Give up BM search on case-fold-search if one of a target character has a case-equivalence of different - charset even if that target charcter is an ASCII. + charset even if that target character is an ASCII. * casefiddle.c (casify_object): Fix for the case that case conversion change the byte length. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 7481637671..6a7e11d701 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -13872,10 +13872,10 @@ 1998-08-31 Kenichi Handa <[email protected]> * charset.c (unibyte_char_to_multibyte): - Vnonacii_translation_table will convert a 7-bit charcater. + Vnonacii_translation_table will convert a 7-bit character. (multibyte_char_to_unibyte): Handle the case that - Vnonacii_translation_table converts a multibyte charcater to a - unibyte charcter of less than 128. + Vnonacii_translation_table converts a multibyte character to a + unibyte character of less than 128. (init_charset_once): Initialize nonascii_insert_offset and Vnonacii_translation_table. diff --git a/src/buffer.c b/src/buffer.c index 4744356d1b..9220527313 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2429,7 +2429,7 @@ current buffer is cleared. */) { c = STRING_CHAR_AND_LENGTH (p, bytes); /* Delete all bytes for this 8-bit character but the - last one, and change the last one to the charcter + last one, and change the last one to the character code. */ bytes--; del_range_2 (pos, pos, pos + bytes, pos + bytes, 0); diff --git a/src/character.c b/src/character.c index a240e45d3d..b9ba15d1b0 100644 --- a/src/character.c +++ b/src/character.c @@ -829,7 +829,7 @@ str_as_unibyte (str, bytes) corresponding byte and store in DST. CHARS is the number of characters in SRC. The value is the number of bytes stored in DST. Usually, the value is the same as CHARS, but is less than it if SRC - contains a non-ASCII, non-eight-bit characater. If ACCEPT_LATIN_1 + contains a non-ASCII, non-eight-bit character. If ACCEPT_LATIN_1 is nonzero, a Latin-1 character is accepted and converted to a byte of that character code. Note: Currently the arg ACCEPT_LATIN_1 is not used. */ diff --git a/src/charset.c b/src/charset.c index c349093ad3..9ea1366d73 100644 --- a/src/charset.c +++ b/src/charset.c @@ -438,7 +438,7 @@ load_charset_map (charset, entries, n_entries, control_flag) /* Read a hexadecimal number (preceded by "0x") from the file FP while - paying attention to comment charcter '#'. */ + paying attention to comment character '#'. */ static INLINE unsigned read_hex (fp, eof) diff --git a/src/editfns.c b/src/editfns.c index fe5b039625..a751d6df3b 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3623,12 +3623,12 @@ usage: (format STRING &rest OBJECTS) */) int multibyte = 0; /* When we make a multibyte string, we must pay attention to the byte combining problem, i.e., a byte may be combined with a - multibyte charcter of the previous string. This flag tells if we + multibyte character of the previous string. This flag tells if we must consider such a situation or not. */ int maybe_combine_byte; unsigned char *this_format; /* Precision for each spec, or -1, a flag value meaning no precision - was given in that spec. Element 0, corresonding to the format + was given in that spec. Element 0, corresponding to the format string itself, will not be used. Element NARGS, corresponding to no argument, *will* be assigned to in the case that a `%' and `.' occur after the final format specifier. */ |