diff options
| author | Glenn Morris | 2009-07-19 00:40:04 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-07-19 00:40:04 +0000 |
| commit | da332cfbc589dc7944dd2981149aa1aa72b68b10 (patch) | |
| tree | d8298b1c642997ba4d50f4912f619e12f99ed59f | |
| parent | 1a8d3541018b413c224bba3d6a3d82ac0e166080 (diff) | |
| download | emacs-da332cfbc589dc7944dd2981149aa1aa72b68b10.tar.gz emacs-da332cfbc589dc7944dd2981149aa1aa72b68b10.zip | |
(auto-coding-regexp-alist): Only match BABYL... at the start of
buffer, not of lines. (Bug#3790)
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/international/mule.el | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d8d7162461..4c74d22f737 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2009-07-19 Glenn Morris <rgm@gnu.org> | 1 | 2009-07-19 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * international/mule.el (auto-coding-regexp-alist): Only match | ||
| 4 | BABYL... at the start of buffer, not of lines. (Bug#3790) | ||
| 5 | |||
| 3 | * calendar/cal-menu.el (cal-menu-set-date-title): Handle calls from | 6 | * calendar/cal-menu.el (cal-menu-set-date-title): Handle calls from |
| 4 | non-calendar buffers (Bug#3862). Restore "not on a date" message. | 7 | non-calendar buffers (Bug#3862). Restore "not on a date" message. |
| 5 | (cal-menu-context-mouse-menu): Doc fix. | 8 | (cal-menu-context-mouse-menu): Doc fix. |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index cd0f127a025..9cbec2f024d 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; mule.el --- basic commands for multilingual environment | 1 | ;;; mule.el --- basic commands for multilingual environment |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 3 | ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
| 4 | ;; 2007, 2008, 2009 | ||
| 4 | ;; Free Software Foundation, Inc. | 5 | ;; Free Software Foundation, Inc. |
| 5 | ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 6 | ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 6 | ;; 2005, 2006, 2007, 2008, 2009 | 7 | ;; 2005, 2006, 2007, 2008, 2009 |
| @@ -1646,7 +1647,7 @@ and the contents of `file-coding-system-alist'." | |||
| 1646 | (symbol :tag "Coding system")))) | 1647 | (symbol :tag "Coding system")))) |
| 1647 | 1648 | ||
| 1648 | (defcustom auto-coding-regexp-alist | 1649 | (defcustom auto-coding-regexp-alist |
| 1649 | '(("^BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion) | 1650 | '(("\\`BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion) |
| 1650 | ("\\`\xFE\xFF" . utf-16be-with-signature) | 1651 | ("\\`\xFE\xFF" . utf-16be-with-signature) |
| 1651 | ("\\`\xFF\xFE" . utf-16le-with-signature) | 1652 | ("\\`\xFF\xFE" . utf-16le-with-signature) |
| 1652 | ("\\`\xEF\xBB\xBF" . utf-8-with-signature) | 1653 | ("\\`\xEF\xBB\xBF" . utf-8-with-signature) |