aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-04-13 22:10:55 -0700
committerPaul Eggert2012-04-13 22:10:55 -0700
commit5ae255c7e9a2bd1ac594afe99fb24e9a0091d414 (patch)
tree02a5850b735899fb0d8eb33281a1d4fa85f65eea
parentd5e6342ed5e408014019c478ce16a47a2aad418b (diff)
downloademacs-5ae255c7e9a2bd1ac594afe99fb24e9a0091d414.tar.gz
emacs-5ae255c7e9a2bd1ac594afe99fb24e9a0091d414.zip
Spelling fixes.
* lisp/hexl.el (hexl-rulerize): Rename from hexl-rulerise, since Emacs uses American spelling.
-rw-r--r--etc/publicsuffix.txt2
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/hexl.el4
-rw-r--r--src/character.h2
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
36016bone.pl 36016bone.pl
3602art.pl 3602art.pl
3603mbone.pl 3603mbone.pl
3604// Government domains (administred by ippt.gov.pl) 3604// Government domains (administered by ippt.gov.pl)
3605gov.pl 3605gov.pl
3606uw.gov.pl 3606uw.gov.pl
3607um.gov.pl 3607um.gov.pl
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1974a7a5af1..c25fab9b619 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-04-14 Paul Eggert <eggert@cs.ucla.edu>
2
3 Spelling fixes.
4 * hexl.el (hexl-rulerize): Rename from hexl-rulerise, since
5 Emacs uses American spelling.
6
12012-04-14 Juanma Barranquero <lekktu@gmail.com> 72012-04-14 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * emacs-lock.el (emacs-lock-locked-buffer-functions): New hook. 9 * 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."
222 (2 'hexl-ascii-region t t))) 222 (2 'hexl-ascii-region t t)))
223 "Font lock keywords used in `hexl-mode'.") 223 "Font lock keywords used in `hexl-mode'.")
224 224
225(defun hexl-rulerise (string bits) 225(defun hexl-rulerize (string bits)
226 (let ((size (/ bits 4)) (strlen (length string)) (pos 0) (ruler "")) 226 (let ((size (/ bits 4)) (strlen (length string)) (pos 0) (ruler ""))
227 (while (< pos strlen) 227 (while (< pos strlen)
228 (setq ruler (concat ruler " " (substring string pos (+ pos size)))) 228 (setq ruler (concat ruler " " (substring string pos (+ pos size))))
@@ -234,7 +234,7 @@ as that will override any bit grouping options set here."
234 (lambda (bits) 234 (lambda (bits)
235 (cons bits 235 (cons bits
236 (concat " 87654321 " 236 (concat " 87654321 "
237 (hexl-rulerise "00112233445566778899aabbccddeeff" bits) 237 (hexl-rulerize "00112233445566778899aabbccddeeff" bits)
238 " 0123456789abcdef"))) 238 " 0123456789abcdef")))
239 '(8 16 32 64))) 239 '(8 16 32 64)))
240;; routines 240;; 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/>. */
316 Note: This macro returns the actual length of the character's 316 Note: This macro returns the actual length of the character's
317 multibyte sequence as it is stored in a buffer or string. The 317 multibyte sequence as it is stored in a buffer or string. The
318 character it returns might have a different codepoint that has a 318 character it returns might have a different codepoint that has a
319 different multibyte sequence of a different legth, due to possible 319 different multibyte sequence of a different length, due to possible
320 unification of CJK characters inside string_char. Therefore do NOT 320 unification of CJK characters inside string_char. Therefore do NOT
321 assume that the length returned by this macro is identical to the 321 assume that the length returned by this macro is identical to the
322 length of the multibyte sequence of the character it returns. */ 322 length of the multibyte sequence of the character it returns. */