diff options
| -rw-r--r-- | etc/publicsuffix.txt | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/hexl.el | 4 | ||||
| -rw-r--r-- | src/character.h | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt index 3eeddef13f0..45cd95aca30 100644 --- a/etc/publicsuffix.txt +++ b/etc/publicsuffix.txt @@ -3601,7 +3601,7 @@ turystyka.pl 6bone.pl art.pl mbone.pl -// Government domains (administred by ippt.gov.pl) +// Government domains (administered by ippt.gov.pl) gov.pl uw.gov.pl um.gov.pl diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1974a7a5af1..c25fab9b619 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-04-14 Paul Eggert <eggert@cs.ucla.edu> + + Spelling fixes. + * hexl.el (hexl-rulerize): Rename from hexl-rulerise, since + Emacs uses American spelling. + 2012-04-14 Juanma Barranquero <lekktu@gmail.com> * emacs-lock.el (emacs-lock-locked-buffer-functions): New hook. diff --git a/lisp/hexl.el b/lisp/hexl.el index 6c4d8d6dc34..bedcc6b10b9 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -222,7 +222,7 @@ as that will override any bit grouping options set here." (2 'hexl-ascii-region t t))) "Font lock keywords used in `hexl-mode'.") -(defun hexl-rulerise (string bits) +(defun hexl-rulerize (string bits) (let ((size (/ bits 4)) (strlen (length string)) (pos 0) (ruler "")) (while (< pos strlen) (setq ruler (concat ruler " " (substring string pos (+ pos size)))) @@ -234,7 +234,7 @@ as that will override any bit grouping options set here." (lambda (bits) (cons bits (concat " 87654321 " - (hexl-rulerise "00112233445566778899aabbccddeeff" bits) + (hexl-rulerize "00112233445566778899aabbccddeeff" bits) " 0123456789abcdef"))) '(8 16 32 64))) ;; routines diff --git a/src/character.h b/src/character.h index a829def428d..88de343b228 100644 --- a/src/character.h +++ b/src/character.h @@ -316,7 +316,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ Note: This macro returns the actual length of the character's multibyte sequence as it is stored in a buffer or string. The character it returns might have a different codepoint that has a - different multibyte sequence of a different legth, due to possible + different multibyte sequence of a different length, due to possible unification of CJK characters inside string_char. Therefore do NOT assume that the length returned by this macro is identical to the length of the multibyte sequence of the character it returns. */ |