Fix typos.

32 files changed, 88 insertions, 75 deletions

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