aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-12-15 15:22:48 +0000
committerJuanma Barranquero2008-12-15 15:22:48 +0000
commitd5c78b09ab3e092d0b170671c3f7641f986f56e8 (patch)
tree42c3c47474ee2b15b3aabe3b7935f0005a1e44e5
parent97a424b85894aa746343787ff064301e4a86094c (diff)
downloademacs-d5c78b09ab3e092d0b170671c3f7641f986f56e8.tar.gz
emacs-d5c78b09ab3e092d0b170671c3f7641f986f56e8.zip
* international/mule.el (find-auto-coding): Fix typo in docstring.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/international/mule.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3310f2ce36..b39aecfc05e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-12-15 Juanma Barranquero <lekktu@gmail.com> 12008-12-15 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * international/mule.el (find-auto-coding): Fix typo in docstring.
4
3 * simple.el (bad-package-check): Fix arguments of `display-warning', 5 * simple.el (bad-package-check): Fix arguments of `display-warning',
4 using the package name as TYPE. Use `string-match-p'. 6 using the package name as TYPE. Use `string-match-p'.
5 7
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 8ae45e8b3cb..9563fa42733 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1688,7 +1688,7 @@ gives a match.
1688If a coding system is specifed, the return value is a cons 1688If a coding system is specifed, the return value is a cons
1689\(CODING . SOURCE), where CODING is the specified coding system and 1689\(CODING . SOURCE), where CODING is the specified coding system and
1690SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist', 1690SOURCE is a symbol `auto-coding-alist', `auto-coding-regexp-alist',
1691`coding:', or `auto-coding-functions' indicating by what CODING is 1691`:coding', or `auto-coding-functions' indicating by what CODING is
1692specified. Note that the validity of CODING is not checked; 1692specified. Note that the validity of CODING is not checked;
1693it's the caller's responsibility to check it. 1693it's the caller's responsibility to check it.
1694 1694