diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-11-20 20:35:27 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-11-20 20:35:27 +0100 |
| commit | fe7a3057a38e896a9c4ad12c831fb84a5d808691 (patch) | |
| tree | bcb23e440925fde576409d960a71ee6df320331a | |
| parent | 09f5d05492b6c78421c71858d0d5c4434218b8fc (diff) | |
| download | emacs-fe7a3057a38e896a9c4ad12c831fb84a5d808691.tar.gz | |
Fix typos.
64 files changed, 174 insertions, 147 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index f72f1d881c6..aa815c552b4 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -402,7 +402,7 @@ 2009-06-24 Kenichi Handa <handa@m17n.org> - * charsets/mapconv: For the UNICODE format files, do reverse sort + * charsets/mapconv: For the Unicode format files, do reverse sort and don't compact the map. This is to prefer the first one in the duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0). diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index 99d2b9df81d..f4b2f1f1f49 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy @@ -740,7 +740,7 @@ It ignores whitespaces, newlines and comments." wisent-java-tags-wy--<symbol>-regexp-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer wisent-java-tags-wy--<block>-block-analyzer - ;; In theory, unicode chars should be turned into normal chars + ;; In theory, Unicode chars should be turned into normal chars ;; and then combined into regular ascii keywords and text. This ;; analyzer just keeps these things from making the lexer go boom. wisent-java-tags-wy--<unicode>-regexp-analyzer diff --git a/admin/notes/nextstep b/admin/notes/nextstep index cf0ebbc11aa..a2e5ce2c9b0 100644 --- a/admin/notes/nextstep +++ b/admin/notes/nextstep @@ -83,7 +83,7 @@ original NeXT Display PostScript (DPS) APIs are available and used. Under Cocoa, these were removed and Quartz drawing functions replaced them. In both cases, font glyphs are accessed through UTF8 character -representations. It would be preferable to use unicode indices, but prior +representations. It would be preferable to use Unicode indices, but prior attempts at this have failed. Multi-script fontsets are auto-created in nsfont_make_fontset_for_font() using diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b796acd8b39..761be847da2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero <lekktu@gmail.com> + + * msdog.texi (Windows Fonts): Fix typo. + 2011-11-17 Glenn Morris <rgm@gnu.org> * regs.texi (Bookmarks): Small fixes related to saving. (Bug#10058) diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index bbaf31ade85..e3c9b8d4fc2 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -914,7 +914,7 @@ as a fallback with the font family left unspecified. @vindex w32-charset-info-alist @item registry Specifies the character set registry that the font is -expected to cover. Most TrueType and OpenType fonts will be unicode fonts +expected to cover. Most TrueType and OpenType fonts will be Unicode fonts that cover several national character sets, but you can narrow down the selection of fonts to those that support a particular character set by using a specific registry from @code{w32-charset-info-alist} here. @@ -936,9 +936,9 @@ Options specific to @code{GDI} fonts: @table @code @cindex font scripts (MS Windows) -@cindex font unicode subranges (MS Windows) +@cindex font Unicode subranges (MS Windows) @item script -Specifies a unicode subrange the font should support. +Specifies a Unicode subrange the font should support. The following scripts are recognized on Windows: @code{latin}, @code{greek}, @code{coptic}, @code{cyrillic}, @code{armenian}, @code{hebrew}, @code{arabic}, diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e8eaa00e0fa..a1c6472c3fa 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -2255,7 +2255,7 @@ (Future Local Variables): Node deleted. * objects.texi (General Escape Syntax): Update explanation of - unicode escape syntax. + Unicode escape syntax. 2009-02-23 Chong Yidong <cyd@stupidchicken.com> diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 78282d7c577..8b2d57c8628 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -5,7 +5,9 @@ * ede.texi (ede-compilation-program, ede-compiler, ede-linker): * eieio.texi (Customizing): - * gnus-news.texi: Fix typos. + * gnus.texi (Article Washing): + * gnus-news.texi: + * sem-user.texi (Smart Jump): Fix typos. 2011-11-16 Juanma Barranquero <lekktu@gmail.com> diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 327fb392242..679e2ecd53b 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -8992,7 +8992,7 @@ apostrophe or quotation mark, then try this wash. Translate many non-@acronym{ASCII} characters into their @acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}). This is mostly useful if you're on a terminal that has a limited font -and does't show accented characters, ``advanced'' punctuation, and the +and doesn't show accented characters, ``advanced'' punctuation, and the like. For instance, @samp{} is tranlated into @samp{>>}, and so on. @item W Y f diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index 7a363523aa6..28d1cdb6eb8 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -880,7 +880,7 @@ command, like this: @end example @end defun -These commands are often more accurate than than the @code{find-tag} +These commands are often more accurate than the @code{find-tag} command (@pxref{Tags,,,emacs,Emacs manual}), because the Semantic Analyzer is context-sensitive. diff --git a/etc/ChangeLog b/etc/ChangeLog index 48b1acacbf9..acb30af0373 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1413,7 +1413,7 @@ 2008-02-01 Kenichi Handa <handa@m17n.org> - * HELLO: Remove non-unicode character from Tibetan text. + * HELLO: Remove non-Unicode character from Tibetan text. 2008-02-01 Miles Bader <miles@gnu.org> diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 8cf0cdee879..5e95e40b04c 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -1275,7 +1275,7 @@ coding system. of a file. *** New command `ucs-insert' inserts a character specified by its -unicode. +Unicode code point or character name. *** New command quail-show-key shows what key (or key sequence) to type in the current input method to input a character at point. diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 3a222d50d4c..9b8909d794a 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -843,7 +843,7 @@ shared with older Emacsen. *** There is a new charset implementation with many new charsets. See M-x list-character-sets. New charsets can be defined conveniently -as tables of unicodes. +as tables of Unicode code points. *** There are new language environments for Chinese-GBK, Chinese-GB18030, Khmer, Bengali, Punjabi, Gujarati, Oriya, Telugu, @@ -1837,7 +1837,7 @@ for the list of extra keys that are available. ** BDF fonts no longer supported on MS-Windows. The font backend was completely rewritten for this release. The focus -on Windows has been getting acceptable performance and full unicode +on Windows has been getting acceptable performance and full Unicode support, including complex script shaping for native Windows fonts. A rewrite of the BDF font support has not happened due to lack of time and developers. If demand still exists for such a backend even with @@ -205,7 +205,7 @@ of the scroll bar itself. That depends on to what extent toolkit scroll bars are extensible. ** Provide user-friendly ways to list all available font families, - list fonts, display a font as a sample, etc. [fx is looking at + list fonts, display a font as a sample, etc. [fx is looking at multilingual font selection for the Unicode branch of Emacs.] ** Provide a convenient way to select a color with the mouse. @@ -635,7 +635,7 @@ up on top of all others *** Other / Low Priority: -**** Better recognition of unicode scripts / Greek / composition. +**** Better recognition of Unicode scripts / Greek / composition. **** Undo for color-drag face customization. diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit index 8c67c3bdfac..97dfe89f1a1 100644 --- a/leim/CXTERM-DIC/CCDOSPY.tit +++ b/leim/CXTERM-DIC/CCDOSPY.tit @@ -2,7 +2,7 @@ # Header added for Emacs # # This file is included in the directory contrib/clients/cxterm of the -# distribution of X11R6. As the file itself does't contain copyright +# distribution of X11R6. As the file itself doesn't contain copyright # and license notices, the following statements in the section 6 of # the file .../cxterm/README covers it. # diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit index 72c20fe70ca..7a8d68aa755 100644 --- a/leim/CXTERM-DIC/PY-b5.tit +++ b/leim/CXTERM-DIC/PY-b5.tit @@ -2,7 +2,7 @@ # Header added for Emacs # # This file is included in the directory contrib/clients/cxterm of the -# distribution of X11R6. As the file itself does't contain copyright +# distribution of X11R6. As the file itself doesn't contain copyright # and license notices, the following statements in the section 6 of # the file .../cxterm/README covers it. # diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit index a30dcf01090..5e8fadfba42 100644 --- a/leim/CXTERM-DIC/SW.tit +++ b/leim/CXTERM-DIC/SW.tit @@ -2,7 +2,7 @@ # Header added for Emacs # # This file is included in the directory contrib/clients/cxterm of the -# distribution of X11R6. As the file itself does't contain copyright +# distribution of X11R6. As the file itself doesn't contain copyright # and license notices, the following statements in the section 6 of # the file .../cxterm/README covers it. # diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit index 4b97ce8f0b1..ddba1d378d1 100644 --- a/leim/CXTERM-DIC/TONEPY.tit +++ b/leim/CXTERM-DIC/TONEPY.tit @@ -2,7 +2,7 @@ # Header added for Emacs # # This file is included in the directory contrib/clients/cxterm of the -# distribution of X11R6. As the file itself does't contain copyright +# distribution of X11R6. As the file itself doesn't contain copyright # and license notices, the following statements in the section 6 of # the file .../cxterm/README covers it. # diff --git a/leim/ChangeLog b/leim/ChangeLog index 75dde2bcd18..ed8aec0b16d 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero <lekktu@gmail.com> + + * quail/hangul.el (hangul-character): Fix typo. + 2011-09-27 Jambunathan K <kjambunathan@gmail.com> * quail/indian.el (quail-tamil-itrans-misc-table): Delete it. diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el index 660e7763626..d3071d628e0 100644 --- a/leim/quail/hangul.el +++ b/leim/quail/hangul.el @@ -112,7 +112,7 @@ (defun hangul-character (cho jung jong) "Convert CHO, JUNG, JONG to the precomposed `Hangul Syllables' character. -CHO, JUNG, JONG are relative indices in `Hangul Compatibility Jamo' of unicode. +CHO, JUNG, JONG are relative indices in `Hangul Compatibility Jamo' of Unicode. Return a zero-length string if the conversion fails." (or (decode-char diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db79fdc3b56..53cf4b8685d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-11-20 Juanma Barranquero <lekktu@gmail.com> + + * descr-text.el (describe-char-unicode-data): + * json.el (json-string-escape): + * mail/footnote.el (footnote-unicode-string, footnote-unicode-regexp) + (Footnote-unicode, Footnote-style-p): + * net/ntlm.el (ntlm-get-password-hashes): Fix typos. + 2011-11-20 Chong Yidong <cyd@gnu.org> * window.el (replace-buffer-in-windows): Restore interactive spec. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index b67cc2f67bc..cb1d1af577b 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -2016,7 +2016,7 @@ 2003-05-28 Andreas Schwab <schwab@suse.de> * descr-text.el (describe-char): Use `char' instead of - `(char-after)'. Fix display of unicode. + `(char-after)'. Fix display of Unicode. 2003-05-28 Nick Roberts <nick@nick.uklinux.net> @@ -2429,8 +2429,8 @@ 2003-05-21 Dave Love <fx@gnu.org> * descr-text.el (unicodedata-file): New. - (unicode-data): New (adapted from unicode branch). - (describe-char): Use it. Print char's unicode differently. + (unicode-data): New (adapted from Unicode branch). + (describe-char): Use it. Print char's Unicode code point differently. Avoid elements with null cadr when formatting list. Clarify error message when used in Help buffer. (button): Require when compiling. @@ -17991,7 +17991,7 @@ * international/ucs-tables.el (ucs-unify-8859, ucs-fragment-8859): Use unify-8859-on-decoding-mode. (unify-8859-on-decoding-mode): Also set translation-table-for-input. - (ucs-insert): Give an error if the unicode char can't be created. + (ucs-insert): Give an error if the Unicode char can't be created. * pcvs-parse.el (cvs-parse-table): Be a bit more lenient. (cvs-parse-status): Handle the "used to have a conflict" marker. @@ -19206,7 +19206,7 @@ * language/cyril-util.el (cyrillic-encode-koi8-r-char) (cyrillic-encode-alternativnyj-char): Get translation tables from symbol properties, not as variables. - (standard-display-cyrillic-translit): Include unicodes. + (standard-display-cyrillic-translit): Include Unicode characters. 2002-02-06 Kim F. Storm <storm@cua.dk> diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index 08bd70926b4..c80091e4657 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 @@ -6884,7 +6884,7 @@ 2004-05-22 Richard M. Stallman <rms@gnu.org> - * textmodes/paragraphs.el (sentence-end): Match unicode curly quotes + * textmodes/paragraphs.el (sentence-end): Match Unicode curly quotes as a close quote. * textmodes/bibtex.el: Use assoc-string, not assoc-ignore-case. @@ -7074,7 +7074,7 @@ 2004-05-14 Stefan Monnier <monnier@iro.umontreal.ca> * descr-text.el (describe-char-unicode-data) - (describe-char-unicodedata-file): Re-enable the unicode code now that + (describe-char-unicodedata-file): Re-enable the Unicode code now that the licensing issues have been cleared in the unicode-4 license. (describe-text-properties-1): Remove unused `overlay' var. (describe-char): Remove unused var `buffer'. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 7df356b52d8..1660009aba7 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -1741,8 +1741,8 @@ * outline.el (hide-sublevels): Keep empty last line, if available. - * buff-menu.el (list-buffers-noselect): Use explicit unicode code - rather than the corresponding unicode char, to make the code + * buff-menu.el (list-buffers-noselect): Use explicit Unicode code + rather than the corresponding Unicode char, to make the code more readable. 2007-02-19 Juanma Barranquero <lekktu@gmail.com> diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 9f7c26c5d4b..bfe0f4a7a51 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -315,7 +315,7 @@ * language/ethio-util.el: * international/characters.el: Use utf-8 rather than utf-8-emacs since it works as well and has the advantage of working with - non-unicode versions of Emacs. + non-Unicode versions of Emacs. * international/encoded-kb.el (encoded-kbd-setup-display): Use the new multi-tty code, which includes the previous local change. @@ -1171,7 +1171,7 @@ * international/encoded-kb.el (encoded-kbd-self-insert-charset) (encoded-kbd-self-insert-utf-8, encoded-kbd-setup-keymap) - (encoded-kbd-mode): Adjust code merged from trunk for unicode branch. + (encoded-kbd-mode): Adjust code merged from trunk for Unicode branch. 2008-02-01 Kenichi Handa <handa@m17n.org> @@ -1668,7 +1668,7 @@ 2008-02-01 Kenichi Handa <handa@m17n.org> * international/fontset.el: Enable the default fontset to use - unicode fonts for ASCII characters. + Unicode fonts for ASCII characters. (x-decompose-font-name): Don't try to resolve PATTERN by x-resolve-font-name. (x-complement-fontset-spec): Never prepend an ASCII font. @@ -2331,9 +2331,9 @@ New coding systems. ("Chinese-GBK"): New environment. - * language/thai-util.el: Remove redundant unicodes in category-setting. - - * language/lao-util.el: Remove redundant unicodes in category-setting. + * language/thai-util.el: + * language/lao-util.el: Remove redundant Unicode characters + in category-setting. * international/mule-conf.el (japanese-jisx0213-1) (japanese-jisx0213-2): Add unify-map. @@ -2358,7 +2358,8 @@ * language/cyril-util.el (cyrillic-encode-koi8-r-char) (cyrillic-encode-alternativnyj-char): Fix. - (standard-display-cyrillic-translit): Remove redundant unicodes. + (standard-display-cyrillic-translit): + Remove redundant Unicode characters. 2008-02-01 Dave Love <fx@gnu.org> @@ -2417,7 +2418,7 @@ lengths of the pair. * international/characters.el: Add Vietnamese category to - equivalent unicodes. + equivalent Unicode characters. 2008-02-01 Dave Love <fx@gnu.org> @@ -2518,7 +2519,7 @@ (print-designation): Partial re-write. (describe-coding-system): Deal with iso-2022 designations, flags. Fix shift_jis case. - (describe-char-after): Use characterp. Print explicit unicode. + (describe-char-after): Use characterp. Print explicit Unicode code point. Remove some obsolete code. (print-coding-system-briefly): Fix printing aliases. (print-coding-system): Use coding-system-aliases. @@ -2587,7 +2588,7 @@ * Makefile.in: Cancel the 2008-02-01 change of mine. - * international/fontset.el: Add setting for unicode font at the + * international/fontset.el: Add setting for Unicode font at the end of the default fontset. 2008-02-01 Dave Love <fx@gnu.org> @@ -2742,7 +2743,7 @@ * international/ja-dic-utl.el (skkdic-jisx0208-hiragana-block): Fix the initial value to specify character range of - japanese-jisx0208, not unicode. + japanese-jisx0208, not Unicode. * international/characters.el: Set syntax/category for japanese-jisx0208. @@ -6265,7 +6266,7 @@ delete .elc files. * nxml/char-name/unicode: Move to etc/nxml/. - * nxml/nxml-uchnm.el (top-level): Adapt for moved unicode files. + * nxml/nxml-uchnm.el (top-level): Adapt for moved Unicode files. * nxml/nxml-enc.el (xmltok-get-declared-encoding-position): Declare as a function. @@ -15910,7 +15911,7 @@ 2007-06-08 Stefan Monnier <monnier@iro.umontreal.ca> * textmodes/css-mode.el (css-navigation-syntax-table): - Use set-char-table-range so it also works in the unicode branch. + Use set-char-table-range so it also works in the Unicode branch. 2007-06-08 Nick Roberts <nickrob@snap.net.nz> diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index ce2253bcfe6..0348a0141a2 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -30,7 +30,7 @@ 2009-06-19 Kenichi Handa <handa@m17n.org> * international/fontset.el (setup-default-fontset): Add a spec of - non-OTF unicode font for Thai. + non-OTF Unicode font for Thai. * fringe.el: Add coding: utf-8 cookie. @@ -8483,7 +8483,7 @@ 2008-07-31 Chong Yidong <cyd@stupidchicken.com> - * Makefile.in: Avoid maintainer warning for autogenerated unicode + * Makefile.in: Avoid maintainer warning for autogenerated Unicode files. * apropos.el (apropos-symbol): Don't set button skip by default. @@ -16095,10 +16095,10 @@ covering IPA (previously Latin), Phonetic Extensions and Phonetic Extensions Supplement (both previously unassigned). - * international/fontset.el (setup-default-fontset): Use unicode fonts + * international/fontset.el (setup-default-fontset): Use Unicode fonts that cover bopomofo script for bopomofo. Likewise for braille and mathematical. - Use unicode scripts that cover the phonetic script for IPA. + Use Unicode scripts that cover the phonetic script for IPA. 2008-04-01 Johan Bockgård <bojohan@gnu.org> diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index b749be79fc1..b536f7f1b66 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -475,8 +475,8 @@ * viper.el (vip-put-back, vip-Put-back): Now emulate Vi's behavior more closely. - * viper.el (vip-line): No longer not bombs out. - (vip-exec-shift) now preserves the point. + * viper.el (vip-line): No longer bombs out. + (vip-exec-shift): Now preserves the point. * viper.el: Fixed the behavior of the Vi commands M, L, G, yw, dg, etc. @@ -2880,7 +2880,7 @@ 1995-03-02 Simon Marshall <simon@duality.gnu.ai.mit.edu> - * font-lock.el (font-lock-maximum-decoration) New variable. + * font-lock.el (font-lock-maximum-decoration): New variable. (font-lock-after-fontify-buffer-hook): New variable. (font-lock-fontify-buffer): Run it after fontifying. (font-lock-thing-lock-cleanup): New function to turn things off. @@ -4133,7 +4133,7 @@ * startup.el (command-line-1): Handle -f with kbd macro. - * msb.el (mouse-select-buffer) Handle an aborted selection. + * msb.el (mouse-select-buffer): Handle an aborted selection. 1995-01-11 Richard Stallman <rms@mole.gnu.ai.mit.edu> @@ -4522,7 +4522,7 @@ * gud.el (gdb): Correct tbreak doc string. (gud-mode): Define a Gud menu. (gdb): Set debugger-specific menu entries. - (sdb) (dbx) (xdb): Likewise. + (sdb, dbx, xdb): Likewise. 1994-12-22 Richard Stallman <rms@mole.gnu.ai.mit.edu> @@ -6861,7 +6861,7 @@ (Man-mode-map): Changed the meanings of ",", ".", "q". Added new keys ">", "<", "k". (Man-page-mode-string): Function deleted. - (Man-init-defvars): New function used for initialising the system + (Man-init-defvars): New function used for initializing the system and environment dependent variables Man-fontify-manpage-flag, Man-uses-untabify, Man-sed-script, Man-filter-list. (Man-delete-trailing-newlines): Function deleted. @@ -8114,9 +8114,9 @@ Modified to work with remote and compressed files. * ediff.el (ediff-read-file-name, ediff-buffers): Better defaults. - (ediff-read-file-name) Handle OS/2. + (ediff-read-file-name): Handle OS/2. - * ediff.el (ediff-forward-word-function) New function. + * ediff.el (ediff-forward-word-function): New function. (ediff-wordify-function): Variable deleted. (ediff-toggle-regexp-match, ediff-hide-regexp-matches): New functions. (ediff-focus-on-regexp-matches): New function. @@ -8813,7 +8813,7 @@ (gnus-uu-ask-to-save-file): New function. * gnus-uu.el (gnus-uu-interactive-set-up-windows): New function. - (gnus-uu-interactive-scan-directory) New function. + (gnus-uu-interactive-scan-directory): New function. (gnus-uu-interactive-rescan-directory): New function. (gnus-uu-ignore-files-by-name, gnus-uu-ignore-files-by-type): New vars. (gnus-uu-interactive-execute): Change directory to work dir before diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 35aef5d16ef..4d5d8f35f51 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -675,7 +675,7 @@ Included databases are filtered based on `semanticdb-find-default-throttle'." ;; ;; NOTE: Not used if EDE is active! ((and (semanticdb-find-throttle-active-p 'project) - ;; And dont do this if it is a system include. Not supported by all languages, + ;; And don't do this if it is a system include. Not supported by all languages, ;; but when it is, this is a nice fast way to skip this step. (not (semantic-tag-include-system-p includetag)) ;; Don't do this if we have an EDE project. diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el index 38c19387440..4470b87a1f1 100644 --- a/lisp/cedet/semantic/wisent/javat-wy.el +++ b/lisp/cedet/semantic/wisent/javat-wy.el @@ -669,7 +669,7 @@ It ignores whitespaces, newlines and comments." wisent-java-tags-wy--<symbol>-regexp-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer wisent-java-tags-wy--<block>-block-analyzer - ;; In theory, unicode chars should be turned into normal chars + ;; In theory, Unicode chars should be turned into normal chars ;; and then combined into regular ascii keywords and text. This ;; analyzer just keeps these things from making the lexer go boom. wisent-java-tags-wy--<unicode>-regexp-analyzer diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el index 1f52e9eb3b6..c73033ce0ac 100644 --- a/lisp/cedet/semantic/wisent/python.el +++ b/lisp/cedet/semantic/wisent/python.el @@ -43,7 +43,7 @@ ;; The 'r' prefix means raw, i.e., normal backslash substitutions are ;; to be suppressed. For example, r"01\n34" is a string with six ;; characters 0, 1, \, n, 3 and 4. The 'u' prefix means the following -;; string is a unicode. +;; string is Unicode. (defconst wisent-python-string-re (concat (regexp-opt '("r" "u" "ur" "R" "U" "UR" "Ur" "uR") t) "?['\"]") diff --git a/lisp/descr-text.el b/lisp/descr-text.el index c175bd7c3c7..8b7fa89a19b 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -221,7 +221,7 @@ At the time of writing it is at the URL file)) (defun describe-char-unicode-data (char) - "Return a list of Unicode data for unicode CHAR. + "Return a list of Unicode data for Unicode CHAR. Each element is a list of a property description and the property value. The list is null if CHAR isn't found in `describe-char-unicodedata-file'. This function is semi-obsolete. Use `get-char-code-property'." diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index e16970c6804..32ec2bbf7ee 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -146,7 +146,7 @@ If ADVANCE is non-nil, move forward by one line afterwards." (defvar tabulated-list-glyphless-char-display (let ((table (make-char-table 'glyphless-char-display nil))) (set-char-table-parent table glyphless-char-display) - ;; Some text terminals can't display the unicode arrows; be safe. + ;; Some text terminals can't display the Unicode arrows; be safe. (aset table 9650 (cons nil "^")) (aset table 9660 (cons nil "v")) table) diff --git a/lisp/follow.el b/lisp/follow.el index 852944a8061..72a091e8ce2 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -154,7 +154,7 @@ ;; follow-delete-other-windows-and-split C-c . 1 ;; Maximize the visible area of the current buffer, ;; and enter Follow mode. This is a very convenient -;; way to start Follow mode, hence we recomend that +;; way to start Follow mode, hence we recommend that ;; this command be added to the global keymap. ;; ;; follow-recenter C-c . C-l diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index d7defec1a78..e519ce340c2 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -8170,7 +8170,7 @@ 2002-09-03 Simon Josefsson <jas@extundo.com> - * nntp.el (nntp-wait-for-string): Dont infloop if process died. + * nntp.el (nntp-wait-for-string): Don't infloop if process died. * gnus-agent.el (gnus-agent-batch): Add doc. diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 88fd4fe1ff6..78d2478b4fb 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -1269,7 +1269,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." ;; nnir-search failure reason is in this buffer, show it if ;; the user wants it. (when (> gnus-verbose 6) - (display-buffer nnir-tmp-buffer)))) ;; FIXME: Dont clear buffer ! + (display-buffer nnir-tmp-buffer)))) ;; FIXME: Don't clear buffer ! (message "Doing hyrex-search query \"%s\"...done" qstring) (sit-for 0) ;; nnir-search returns: diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index 90af71404ef..3c1f75f3dc9 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el @@ -99,7 +99,7 @@ ;; ;; I would include pointers to introductory text on concepts used in ;; this library here, but the material I've read are so horrible I -;; don't want to recomend them. +;; don't want to recommend them. ;; ;; Why can't someone write a simple introduction to all this stuff? ;; Until then, much of this resemble security by obscurity. diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 870f2bece28..e27424b2328 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -218,7 +218,7 @@ (fmakunbound 'define-iso-single-byte-charset) ;; Can this be shared with 8859-11? -;; N.b. not all of these are defined unicodes. +;; N.b. not all of these are defined in Unicode. (define-charset 'thai-tis620 "TIS620.2533" :short-name "TIS620.2533" @@ -865,7 +865,7 @@ ;; Lao script. ;; Codes 0x21..0x7E are mapped to Unicode U+0E81..U+0EDF. -;; Not all of them are defined unicodes. +;; Not all of them are defined in Unicode. (define-charset 'lao "Lao characters (ISO10646 0E81..0EDF)" :short-name "Lao" diff --git a/lisp/json.el b/lisp/json.el index 33e985abbee..2debd46c842 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -166,7 +166,7 @@ this around your call to `json-read' instead of `setq'ing it.") (put 'json-number-format 'error-conditions '(json-number-format json-error error)) -(put 'json-string-escape 'error-message "Bad unicode escape") +(put 'json-string-escape 'error-message "Bad Unicode escape") (put 'json-string-escape 'error-conditions '(json-string-escape json-error error)) diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 0f1669562de..342d6c16b6e 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -294,14 +294,14 @@ Use a range of Latin-1 non-ASCII characters for footnoting." ;; Unicode (defconst footnote-unicode-string "⁰¹²³⁴⁵⁶⁷⁸⁹" - "String of unicode footnoting characters.") + "String of Unicode footnoting characters.") (defconst footnote-unicode-regexp (concat "[" footnote-unicode-string "]+") - "Regexp for unicode footnoting characters.") + "Regexp for Unicode footnoting characters.") (defun Footnote-unicode (n) "Unicode footnote style. -Use unicode characters for footnoting." +Use Unicode characters for footnoting." (let (modulus result done) (while (not done) (setq modulus (mod n 10) @@ -348,7 +348,7 @@ buffer use the command `Footnote-set-style'." ;;; Style utilities & functions (defun Footnote-style-p (style) - "Return non-nil if style is a valid style known to footnote-mode." + "Return non-nil if style is a valid style known to `footnote-mode'." (assq style footnote-style-alist)) (defun Footnote-index-to-string (index) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 802f2fab74f..71686eb294c 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -352,7 +352,7 @@ 2008-06-20 Stephen Eglen <stephen@gnu.org> - * mh-show.el (mh-defun-show-buffer): Use `...' rather than than + * mh-show.el (mh-defun-show-buffer): Use `...' rather than "..." in generated docstrings. 2008-06-12 Glenn Morris <rgm@gnu.org> diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 00a03c87ed9..327d8ad7040 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -488,7 +488,7 @@ no effect." ;; The car of folder is the name, and the cdr is either t or some ;; sort of count that I do not understand. It's too small to be the ;; number of messages in the sub-folders and too large to be the -;; number of sub-folders. XXX" +;; number of sub-folders. XXX `(if (cdr ,folder) t nil)) diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el index 25e7a7b43de..9af148e8faa 100644 --- a/lisp/net/ntlm.el +++ b/lisp/net/ntlm.el @@ -102,8 +102,8 @@ is not given." (md4-pack-int16 ld) ;domain field, count field (md4-pack-int16 ld) ;domain field, max count field (md4-pack-int32 (cons 0 off-d)) ;domain field, offset field - user ;bufer field - domain ;bufer field + user ;buffer field + domain ;buffer field ))) (eval-when-compile @@ -207,16 +207,16 @@ by PASSWORD-HASHES. PASSWORD-HASHES should be a return value of ;; buffer field lmRespData ;lmResponse, 24 bytes ntRespData ;ntResponse, 24 bytes - (ntlm-ascii2unicode domain ;unicode domain string, 2*ld bytes + (ntlm-ascii2unicode domain ;Unicode domain string, 2*ld bytes (length domain)) ; - (ntlm-ascii2unicode user ;unicode user string, 2*lu bytes + (ntlm-ascii2unicode user ;Unicode user string, 2*lu bytes (length user)) ; - (ntlm-ascii2unicode user ;unicode user string, 2*lu bytes + (ntlm-ascii2unicode user ;Unicode user string, 2*lu bytes (length user)) ; ))) (defun ntlm-get-password-hashes (password) - "Return a pair of SMB hash and NT MD4 hash of the given password PASSWORD" + "Return a pair of SMB hash and NT MD4 hash of the given password PASSWORD." (list (ntlm-smb-passwd-hash password) (ntlm-md4hash password))) @@ -526,7 +526,7 @@ into a Unicode string. PASSWD is truncated to 128 bytes if longer." (setq len (length passwd)) (if (> len 128) (setq len 128)) - ;; Password must be converted to NT unicode + ;; Password must be converted to NT Unicode (setq wpwd (ntlm-ascii2unicode passwd len)) ;; Calculate length in bytes (setq len (* len 2)) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index f6981aeabd9..7d069a0f306 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -659,7 +659,7 @@ Functions are called with PROCESS and SENTINEL arguments.") (defun rcirc-disconnect-buffer (&optional buffer) (with-current-buffer (or buffer (current-buffer)) ;; set rcirc-target to nil for each channel so cleanup - ;; doesnt happen when we reconnect + ;; doesn't happen when we reconnect (setq rcirc-target nil) (setq mode-line-process ":disconnected"))) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index d9831a9186b..1cdb0a6f574 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero <lekktu@gmail.com> + + * org.el (org-link-unescape, org-link-unescape-compound): Fix typos. + 2011-11-20 Andreas Schwab <schwab@linux-m68k.org> * org-list.el (org-list-send-item): Use sort instead of sort*. @@ -4173,7 +4177,7 @@ 2011-07-28 David Maus <dmaus@ictsoc.de> - * org.el (org-link-escape): New unicode aware percent encoding + * org.el (org-link-escape): New Unicode aware percent encoding algorithm. 2011-07-28 Sebastian Rose <sebastian_rose@gmx.de> @@ -4181,7 +4185,7 @@ * org-protocol.el (org-protocol-unhex-single-byte-sequence): New function. Decode hex-encoded singly byte sequences. (org-protocol-unhex-compound): Use new function if decoding sequence - as unicode character failed. + as Unicode character failed. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -14394,7 +14398,7 @@ 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-edit-src-code, org-edit-fixed-width-region): Use a - better bufer-generating mechanism. + better buffer-generating mechanism. (org-edit-src-find-buffer): New function. * org-icalendar.el (org-print-icalendar-entries): Don't check for diff --git a/lisp/org/org.el b/lisp/org/org.el index 25bfb8a78e8..afd4ea6b4c3 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -8775,8 +8775,8 @@ If optional argument MERGE is set, merge TABLE into (char-to-string char))) text ""))) (defun org-link-unescape (str) - "Unhex hexified unicode strings as returned from the JavaScript function -encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'." + "Unhex hexified Unicode strings as returned from the JavaScript function +encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'." (unless (and (null str) (string= "" str)) (let ((pos 0) (case-fold-search t) unhexed) (while (setq pos (string-match "\\(%[0-9a-f][0-9a-f]\\)+" str pos)) @@ -8786,7 +8786,7 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'." str) (defun org-link-unescape-compound (hex) - "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ö'. + "Unhexify Unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ö'. Note: this function also decodes single byte encodings like `%E1' (\"á\") if not followed by another `%[A-F0-9]{2}' group." (save-match-data diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index a3ca87ec94a..a1a41bd0b1b 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -74,7 +74,7 @@ ;; GDB in Emacs on Mac OSX works best with FSF GDB as Apple have made ;; some changes to the version that they include as part of Mac OSX. ;; This requires GDB version 7.0 or later (estimated release date Aug 2009) -;; as earlier versions don not compile on Mac OSX. +;; as earlier versions do not compile on Mac OSX. ;;; Known Bugs: @@ -3578,7 +3578,7 @@ member." (gud-basic-call (concat "-gdb-set variable " var " = " value))))) -;; Dont display values of arrays or structures. +;; Don't display values of arrays or structures. ;; These can be expanded using gud-watch. (defun gdb-locals-handler-custom () (let ((locals-list (bindat-get-field (gdb-json-partial-output) 'locals)) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 6bc4db60596..fbf7c3c42f7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1549,7 +1549,7 @@ behavior, change `python-remove-cwd-from-path' to nil." (if path (concat path path-separator)) data-directory) process-environment)) - ;; If we use a pipe, unicode characters are not printed + ;; If we use a pipe, Unicode characters are not printed ;; correctly (Bug#5794) and IPython does not work at ;; all (Bug#5390). (process-connection-type t)) diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index db826f1db8a..10c1c19e0c4 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -662,7 +662,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (defvar ns-reg-to-script) ; nsfont.m ;; This maps font registries (not exposed by NS APIs for font selection) to -;; unicode scripts (which can be mapped to unicode character ranges which are). +;; Unicode scripts (which can be mapped to Unicode character ranges which are). ;; See ../international/fontset.el (setq ns-reg-to-script '(("iso8859-1" . latin) diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index e7f2e3f1396..232d42efc94 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1985,7 +1985,7 @@ Also updates the variables `artist-draw-min-y' and `artist-draw-max-y'." "Retrieve a replacement for character C from `artist-replacement-table'. The replacement is used to convert tabs and new-lines to spaces." ;; Characters may be outside the range of the `artist-replacement-table', - ;; for example if they are unicode code points >= 256. + ;; for example if they are Unicode code points >= 256. ;; Check so we don't attempt to access the array out of its bounds, ;; assuming no such character needs to be replaced. (if (< c (length artist-replacement-table)) diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 20c83429ced..85ec49885bd 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -1292,7 +1292,7 @@ delimiter regions")) Used for splitting difference regions into individual words.") (make-variable-buffer-local 'ediff-forward-word-function) -;; \240 is unicode symbol for nonbreakable whitespace +;; \240 is Unicode symbol for nonbreakable whitespace (defvar ediff-whitespace " \n\t\f\r\240" "*Characters constituting white space. These characters are ignored when differing regions are split into words.") diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index df6a7e938af..5d7d2451422 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -452,7 +452,7 @@ to invocation.") (if ediff-3way-job (ediff-with-current-buffer ediff-buffer-C (ediff-nuke-selective-display) - ;; the merge bufer should never be narrowed + ;; the merge buffer should never be narrowed ;; (it can happen if it is on rmail-mode or similar) (if (ediff-with-current-buffer control-buffer ediff-merge-job) (widen)) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index cb21d4b08c0..20361d32450 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -381,7 +381,7 @@ bit output with no translation." (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000) (w32-add-charset-info "iso10646-1" 'w32-charset-default t) -;; ;; If unicode windows charset is not defined, use ansi fonts. +;; ;; If Unicode Windows charset is not defined, use ansi fonts. ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) ;; Prefered names diff --git a/src/ChangeLog b/src/ChangeLog index 94a02e6e9ba..d0d3363d522 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Juanma Barranquero <lekktu@gmail.com> + + * nsfont.m (syms_of_nsfont) <ns-reg-to-script>: Fix typo. + 2011-11-20 Martin Rudalics <rudalics@gmx.at> * window.c (Fset_window_combination_limit): Rename argument diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index efe77648458..7fef45f36da 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -2237,7 +2237,7 @@ * data.c (Fset): If Vautoload_queue non-nil, record function and old definition - by consing onto Vautoload_qeueue. + by consing onto Vautoload_queue. * fns.c (Fprovide): If Vautoload_queue is non-nil, record old value of Vfeatures. diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 1992ef96e0a..99ab02577d5 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -18755,7 +18755,7 @@ 2003-05-21 Dave Love <fx@gnu.org> - [Merged from unicode branch.] + [Merged from Unicode branch.] * xfns.c (x_window, x_window): Use use_xim. diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 896f08916b3..07d4f4ec116 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -4839,7 +4839,7 @@ 2010-08-13 Jason Rumney <jasonr@gnu.org> - * w32menu.c (simple_dialog_show): Use unicode message box if available. + * w32menu.c (simple_dialog_show): Use Unicode message box if available. (MessageBoxW_Proc): New function typedef. (unicode-message-box): New function pointer. (globals_of_w32menu): Import it from user32.dll. (Bug#5629) @@ -8991,8 +8991,8 @@ 2010-04-13 Jan Djärv <jan.h.d@swipnet.se> * gtkutil.c (xg_set_geometry): Set geometry for PPosition also. - (x_wm_set_size_hint): Dont set position flags, gtk_window_parse_geometry - does that. + (x_wm_set_size_hint): Don't set position flags, + gtk_window_parse_geometry does that. * xfns.c (Fx_create_frame, x_create_tip_frame): Set default border width to zero. @@ -9864,8 +9864,8 @@ 2010-01-27 Jason Rumney <jasonr@gnu.org> - * w32inevt.c (w32_kbd_patch_key): Save the unicode character. - (key_event): Use unicode for characters 128 and higher (Bug#4567). + * w32inevt.c (w32_kbd_patch_key): Save the Unicode character. + (key_event): Use Unicode for characters 128 and higher (Bug#4567). 2010-01-27 Kenichi Handa <handa@m17n.org> @@ -11541,7 +11541,7 @@ (syms_of_nsfont): Declare it. (ns_registry_to_script): New function. (ns_get_req_script): Call it. - (ns_findfonts): Don't give up on non-unicode registry. + (ns_findfonts): Don't give up on non-Unicode registry. * font.c (DEFAULT_ENCODING) [HAVE_NS]: Remove special case. @@ -17147,10 +17147,10 @@ 2008-07-30 Jason Rumney <jasonr@gnu.org> - * w32font.h (struct w32font_info): Use unicode version of textmetrics. + * w32font.h (struct w32font_info): Use Unicode version of textmetrics. - * w32font.c (w32font_encode_char): Leave as unicode if in range. - (w32font_open_internal): Get unicode version of textmetrics. + * w32font.c (w32font_encode_char): Leave as Unicode if in range. + (w32font_open_internal): Get Unicode version of textmetrics. Don't enable or disable glyph indices here. (w32font_open): Disable use of glyph indices. @@ -19178,7 +19178,7 @@ 2008-06-10 Jason Rumney <jasonr@gnu.org> * w32uniscribe.c (add_opentype_font_name_to_list): - Skip non unicode fonts. + Skip non Unicode fonts. 2008-06-10 Chong Yidong <cyd@stupidchicken.com> @@ -19647,7 +19647,7 @@ `raster' specified. (add_font_entity_to_list): Allow non-opentype truetype fonts back in the uniscribe backend, but disallow any font that has no - unicode subrange support. + Unicode subrange support. 2008-05-29 Juanma Barranquero <lekktu@gmail.com> @@ -21813,8 +21813,8 @@ 2008-03-06 Jason Rumney <jasonr@gnu.org> * w32font.c (w32_registry): Take font_type argument. Use ANSI - when charset not specified. Only translate ANSI to unicode when - font_type is truetype. + when charset not specified. Only translate ANSI to Unicode when + font_type is TrueType. (w32font_coverage_ok): New function. (add_font_entity_to_list): Use it to filter unsuitable fonts. @@ -23463,10 +23463,10 @@ (w32font_list, w32font_match): Use it. (w32font_open): Don't populate subranges. (w32font_has_char): Use script Lisp symbols, not subrange bitmask. - (w32font_encode_char): Always return unicode code-point as-is. + (w32font_encode_char): Always return Unicode code-point as-is. (w32font_text_extents): Supply a transformation matrix to GetGlyphOutline. Never look up by glyph index. Avoid looping - twice. Use unicode version of GetTexExtentPoint32 instead of + twice. Use Unicode version of GetTexExtentPoint32 instead of glyph index version. (set_fonts_frame): Remove. (w32_enumfont_pattern_entity): Add frame parameter, use it to @@ -25425,16 +25425,16 @@ (pfnGetFontUnicodeRanges): New dynamically loaded function. (w32_initialize): Try to load it. (x_get_font_repertory): Use it if available. - (w32_encode_char): Add shortcut for unicode output. + (w32_encode_char): Add shortcut for Unicode output. * w32fns.c (w32_load_system_font): Default charset to -1. - (x_to_w32_charset): Match all fonts for unicode. + (x_to_w32_charset): Match all fonts for Unicode. (w32_to_x_charset): New parameter matching. Don't return partial or wildcard charsets. (w32_to_all_x_charsets): Don't return partial or wildcard charsets. - (w32_codepage_for_font): Return CP_UNICODE for unicode. + (w32_codepage_for_font): Return CP_UNICODE for Unicode. (w32_to_x_font): Match charset to real charset. - (enum_font_cb2): Always list unicode versions. + (enum_font_cb2): Always list Unicode versions. * makefile.w32-in (temacs): Increase EMHEAP. @@ -25458,7 +25458,7 @@ * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version of x_new_fontset. - (w32_load_system_font): Initialize charset as unicode. + (w32_load_system_font): Initialize charset as Unicode. font_info.encoding becomes encoding_type. (w32_to_x_font): Use decode_coding_c_string in place of decode_coding. (x_to_w32_font): Use encode_coding_object in place of encode_coding. @@ -27685,7 +27685,7 @@ * xterm.c (handle_one_xevent): Revert to counting chars not bytes. * w32term.c (w32_read_socket) <WM_CHAR>: Decode characters outside - the unicode range available in MULE by locale-coding-system. + the Unicode range available in MULE by locale-coding-system. Improve dbcs lead byte detection. Set event timestamp and modifiers earlier. @@ -30873,7 +30873,7 @@ 2007-06-17 Jason Rumney <jasonr@gnu.org> * w32menu.c (add_menu_item): Don't use multibyte string functions on - unicode strings. + Unicode strings. 2007-06-16 Juanma Barranquero <lekktu@gmail.com> diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index 9e7bd24f792..6f007992bef 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -5150,7 +5150,7 @@ 2000-11-27 Jason Rumney <jasonr@gnu.org> * w32fns.c (w32_load_system_font): Always mark font as double byte - if codepage is unicode. + if codepage is Unicode. 2000-11-27 Gerd Moellmann <gerd@gnu.org> diff --git a/src/keyboard.c b/src/keyboard.c index 80873fcb57a..9b4ba427c24 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4813,7 +4813,7 @@ const char *const lispy_function_keys[] = "ico-00", /* VK_ICO_00 0xE4 */ 0, /* VK_PROCESSKEY 0xE5 - used by IME */ "ico-clear", /* VK_ICO_CLEAR 0xE6 */ - 0, /* VK_PACKET 0xE7 - used to pass unicode chars */ + 0, /* VK_PACKET 0xE7 - used to pass Unicode chars */ 0, /* 0xE8 */ "reset", /* VK_OEM_RESET 0xE9 */ "jump", /* VK_OEM_JUMP 0xEA */ diff --git a/src/nsfont.m b/src/nsfont.m index c4d9123faef..7d691ced6e1 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -256,7 +256,7 @@ ns_char_width (NSFont *sfont, int c) /* Return whether set1 covers set2 to a reasonable extent given by pct. - We check, out of each 16 unicode char range containing chars in set2, + We check, out of each 16 Unicode char range containing chars in set2, whether at least one character is present in set1. This must be true for pct of the pairs to consider it covering. */ static BOOL @@ -297,7 +297,7 @@ static NSString /* Convert OTF 4-letter script code to emacs script name. (Why can't - everyone just use some standard unicode names for these?) */ + everyone just use some standard Unicode names for these?) */ static NSString *ns_otf_to_script (Lisp_Object otf) { @@ -329,7 +329,7 @@ static NSString /* Searches the :script, :lang, and :otf extra-bundle properties of the spec, plus registry regular property, for something that can be mapped to a - unicode script. Empty string returned if no script spec found. */ + Unicode script. Empty string returned if no script spec found. */ static NSString *ns_get_req_script (Lisp_Object font_spec) { @@ -385,7 +385,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) } -/* Use the unicode range information in Vchar_script_table to convert a script +/* Use the Unicode range information in Vchar_script_table to convert a script name into an NSCharacterSet. */ static NSCharacterSet *ns_script_to_charset (NSString *scriptName) @@ -426,7 +426,7 @@ static NSCharacterSet If none are found, we reduce the percentage and try again, until 5%. This provides a font with at least some characters if such can be found. We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and - (b) need approximate match as fonts covering full unicode ranges are rare. */ + (b) need approximate match as fonts covering full Unicode ranges are rare. */ static NSSet *ns_get_covering_families (NSString *script, float pct) { @@ -1292,7 +1292,7 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block) if (!unichars || !(font_info->glyphs[block])) abort (); - /* create a string containing all unicode characters in this block */ + /* create a string containing all Unicode characters in this block */ for (idx = block<<8, i =0; i<0x100; idx++, i++) if (idx < 0xD800 || idx > 0xDFFF) unichars[i] = idx; @@ -1487,5 +1487,5 @@ syms_of_nsfont (void) DEFSYM (Qroman, "roman"); DEFSYM (Qmedium, "medium"); DEFVAR_LISP ("ns-reg-to-script", Vns_reg_to_script, - doc: /* Internal use: maps font registry to unicode script. */); + doc: /* Internal use: maps font registry to Unicode script. */); } diff --git a/src/nsterm.h b/src/nsterm.h index 574d31c962a..52246caac84 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -470,7 +470,7 @@ struct nsfont_info XCharStruct max_bounds; /* we compute glyph codes and metrics on-demand in blocks of 256 indexed by hibyte, lobyte */ - unsigned short **glyphs; /* map unicode index to glyph */ + unsigned short **glyphs; /* map Unicode index to glyph */ struct font_metrics **metrics; }; diff --git a/src/w32fns.c b/src/w32fns.c index 5b936195aa5..434861320a5 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2943,7 +2943,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_IME_CHAR: - /* If we can't get the IME result as unicode, use default processing, + /* If we can't get the IME result as Unicode, use default processing, which will at least allow characters decodable in the system locale get through. */ if (!get_composition_string_fn) diff --git a/src/w32font.c b/src/w32font.c index bd58e7e757b..5cc37c0e74f 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -462,7 +462,7 @@ w32font_has_char (Lisp_Object entity, int c) Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. - For speed, the gdi backend uses unicode (Emacs calls encode_char + For speed, the gdi backend uses Unicode (Emacs calls encode_char far too often for it to be efficient). But we still need to detect which characters are not supported by the font. */ @@ -620,7 +620,7 @@ w32font_text_extents (struct font *font, unsigned *code, total_width = size.cx; } - /* On 95/98/ME, only some unicode functions are available, so fallback + /* On 95/98/ME, only some Unicode functions are available, so fallback on doing a dummy draw to find the total width. */ if (!total_width) { @@ -1153,7 +1153,7 @@ w32_enumfont_pattern_entity (Lisp_Object frame, else ASET (entity, FONT_SIZE_INDEX, make_number (0)); - /* Cache unicode codepoints covered by this font, as there is no other way + /* Cache Unicode codepoints covered by this font, as there is no other way of getting this information easily. */ if (font_type & TRUETYPE_FONTTYPE) { @@ -1514,7 +1514,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, /* Skip non matching fonts. */ /* For uniscribe backend, consider only truetype or opentype fonts - that have some unicode coverage. */ + that have some Unicode coverage. */ if (match_data->opentype_only && ((!(physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE) && !(font_type & TRUETYPE_FONTTYPE)) @@ -1557,7 +1557,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, Lisp_Object spec_charset = AREF (match_data->orig_font_spec, FONT_REGISTRY_INDEX); - /* iso10646-1 fonts must contain unicode mapping tables. */ + /* iso10646-1 fonts must contain Unicode mapping tables. */ if (EQ (spec_charset, Qiso10646_1)) { if (!is_unicode) @@ -1572,7 +1572,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, && !(physical_font->ntmFontSig.fsUsb[0] & 0x007F001F)) return 1; } - /* unicode-sip fonts must contain characters in unicode plane 2. + /* unicode-sip fonts must contain characters in Unicode plane 2. so look for bit 57 (surrogates) in the Unicode subranges, plus the bits for CJK ranges that include those characters. */ else if (EQ (spec_charset, Qunicode_sip)) @@ -1597,7 +1597,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, ASET (entity, FONT_REGISTRY_INDEX, spec_charset); } /* Otherwise if using the uniscribe backend, report ANSI and DEFAULT - fonts as unicode and skip other charsets. */ + fonts as Unicode and skip other charsets. */ else if (match_data->opentype_only) { if (logical_font->elfLogFont.lfCharSet == ANSI_CHARSET @@ -1640,7 +1640,7 @@ x_to_w32_charset (char * lpcs) if (strncmp (lpcs, "*-#", 3) == 0) return atoi (lpcs + 3); - /* All Windows fonts qualify as unicode. */ + /* All Windows fonts qualify as Unicode. */ if (!strncmp (lpcs, "iso10646", 8)) return DEFAULT_CHARSET; @@ -1925,7 +1925,7 @@ w32_registry (LONG w32_charset, DWORD font_type) { char *charset; - /* If charset is defaulted, charset is unicode or unknown, depending on + /* If charset is defaulted, charset is Unicode or unknown, depending on font type. */ if (w32_charset == DEFAULT_CHARSET) return font_type == TRUETYPE_FONTTYPE ? Qiso10646_1 : Qunknown; @@ -2080,7 +2080,7 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec) { Lisp_Object key, val; key = XCAR (tmp), val = XCDR (tmp); - /* Only use QCscript if charset is not provided, or is unicode + /* Only use QCscript if charset is not provided, or is Unicode and a single script is specified. This is rather crude, and is only used to narrow down the fonts returned where there is a definite match. Some scripts, such as latin, han, diff --git a/src/w32menu.c b/src/w32menu.c index 39d101e7bd5..9b2d014cd58 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1219,7 +1219,7 @@ simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header) is_simple_dialog, we don't need to worry about checking contents to see what type of dialog to use. */ - /* Use unicode if possible, so any language can be displayed. */ + /* Use Unicode if possible, so any language can be displayed. */ if (unicode_message_box) { WCHAR *text, *title; @@ -1476,7 +1476,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) utf16_string); if (!return_value) { - /* On W9x/ME, unicode menus are not supported, though AppendMenuW + /* On W9x/ME, Unicode menus are not supported, though AppendMenuW apparently does exist at least in some cases and appears to be stubbed out to do nothing. out_string is UTF-8, but since our standard menus are in English and this is only going to @@ -1486,7 +1486,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) AppendMenu (menu, fuFlags, item != NULL ? (UINT) item: (UINT) wv->call_data, out_string); - /* Don't use unicode menus in future. */ + /* Don't use Unicode menus in future. */ unicode_append_menu = NULL; } diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 36197b3b28a..63da3b9e962 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -469,7 +469,7 @@ uniscribe_encode_char (struct font *font, int c) /* Non BMP characters must be handled by the uniscribe shaping engine as GDI functions (except blindly displaying lines of - unicode text) and the promising looking ScriptGetCMap do not + Unicode text) and the promising looking ScriptGetCMap do not convert surrogate pairs to glyph indexes correctly. */ { items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1); @@ -581,7 +581,7 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font, && font_type != TRUETYPE_FONTTYPE) return 1; - /* Skip fonts that have no unicode coverage. */ + /* Skip fonts that have no Unicode coverage. */ if (!physical_font->ntmFontSig.fsUsb[3] && !physical_font->ntmFontSig.fsUsb[2] && !physical_font->ntmFontSig.fsUsb[1] diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el index b50f75df996..ff62040129d 100644 --- a/test/cedet/semantic-utest.el +++ b/test/cedet/semantic-utest.el @@ -622,7 +622,7 @@ INSERTME is the text to be inserted after the deletion." ) ;look at http://mfgames.com/linux/csharp-mode -(defun semantic-utest-Csharp() ;; hmm i dont even know how to edit a scharp file. need a csharp mode implementation i suppose +(defun semantic-utest-Csharp() ;; hmm i don't even know how to edit a scharp file. need a csharp mode implementation i suppose (interactive) (if (fboundp 'csharp-mode) (semantic-utest-generic "C#" (semantic-utest-fname "csharptest.cs") semantic-utest-Csharp-buffer-contents semantic-utest-Csharp-name-contents '("fun2") "//1" "//deleted line") |