summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/emacs.texi2
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/international/mule-conf.el2
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--lisp/textmodes/reftex.el2
-rw-r--r--src/ChangeLog2
7 files changed, 10 insertions, 6 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4b51486069c..9a501d38375 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-26 Juanma Barranquero <lekktu@gmail.com>
+
+ * emacs.texi (Top): Fix typo.
+
2011-10-25 Glenn Morris <rgm@gnu.org>
* abbrevs.texi (Saving Abbrevs):
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index b25c09aa29d..55fdb9ec875 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -295,7 +295,7 @@ Help
* Package Keywords:: Finding Lisp libraries by keywords (topics).
* Language Help:: Help relating to international language support.
* Misc Help:: Other help commands.
-* Help Files:: Commands to display auxilliary help files.
+* Help Files:: Commands to display auxiliary help files.
* Help Echo:: Help on active text and tooltips (`balloon help').
The Mark and the Region
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa27ea3f97a..9ba25dc89ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
2011-10-26 Juanma Barranquero <lekktu@gmail.com>
- * term/w32-win.el (w32-default-color-map): Declare obsolete.
+ * term/w32-win.el (w32-default-color-map): Declare obsolete. (Bug#9785)
2011-10-26 Michael Albinus <michael.albinus@gmx.de>
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 9ba95e4d11a..870f2bece28 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -708,7 +708,7 @@
(define-charset-alias 'cp866u 'cp1125)
;; Fixme: C.f. iconv, http://czyborra.com/charsets/codepages.html
-;; shows this as not ASCII comptaible, with various graphics in
+;; shows this as not ASCII compatible, with various graphics in
;; 0x01-0x1F.
(define-charset 'cp437
"CP437 (MS-DOS United States, Australia, New Zealand, South Africa)"
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 9fbeb9f1882..ae150621dc0 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1871,7 +1871,7 @@
* org-list.el (org-list-separating-blank-lines-number): Fix
confusion between point and item beginning. Now, if no
- information is avalaible, truly follow user preference when it
+ information is available, truly follow user preference when it
inserts blank lines manually.
(org-list-insert-item): Send correct argument to the preceding
function.
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 6f6993980db..cef8a3d1548 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1522,7 +1522,7 @@ Valid actions are: readable, restore, read, kill, write."
;;; (while all
;;; (when (and (eq (car (car all)) 'bof)
;;; (not (file-regular-p (nth 1 (car all)))))
-;;; (message "File %s in saved parse info not avalable" (cdr (car all)))
+;;; (message "File %s in saved parse info not available" (cdr (car all)))
;;; (error "File not found"))
;;; (setq all (cdr all))))
)
diff --git a/src/ChangeLog b/src/ChangeLog
index d68225070d7..b3d8d4d10ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,7 +2,7 @@
* w32fns.c (w32_default_color_map): New function,
extracted from Fw32_default_color_map.
- (Fw32_default_color_map, Fx_open_connection): Use it.
+ (Fw32_default_color_map, Fx_open_connection): Use it. (Bug#9785)
2011-10-25 Paul Eggert <eggert@cs.ucla.edu>