diff options
| author | Glenn Morris | 2007-09-21 03:21:39 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-09-21 03:21:39 +0000 |
| commit | ef44317c7cd6f5758d45ad8eaa14784682b5744a (patch) | |
| tree | 272c39fe1b39c5c38d27fd2aed81323f72703b16 | |
| parent | 41a633fff6730292a31383c094b6167a335ba094 (diff) | |
| download | emacs-ef44317c7cd6f5758d45ad8eaa14784682b5744a.tar.gz emacs-ef44317c7cd6f5758d45ad8eaa14784682b5744a.zip | |
Kevin Ryde <user42 at zip.com.au>
(sgml-html-meta-auto-coding-function): Bind `case-fold-search' to t.
| -rw-r--r-- | admin/FOR-RELEASE | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule.el | 39 |
3 files changed, 28 insertions, 19 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 70aa0c22922..c9b8c92c1a1 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE | |||
| @@ -87,6 +87,9 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00020.html | |||
| 87 | ** Bug/Patch view.el | 87 | ** Bug/Patch view.el |
| 88 | http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00073.html | 88 | http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00073.html |
| 89 | 89 | ||
| 90 | ** ses-mode runs unsafe functions even if you say "n" when prompted | ||
| 91 | http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00109.html | ||
| 92 | |||
| 90 | * FIXES FOR EMACS 22.3 | 93 | * FIXES FOR EMACS 22.3 |
| 91 | 94 | ||
| 92 | Here we list any small fixes that arrived too late for Emacs 22.2, but | 95 | Here we list any small fixes that arrived too late for Emacs 22.2, but |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19f28e89f1a..c3909c0de09 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-09-21 Kevin Ryde <user42@zip.com.au> | ||
| 2 | |||
| 3 | * international/mule.el (sgml-html-meta-auto-coding-function): | ||
| 4 | Bind `case-fold-search' to t. | ||
| 5 | |||
| 1 | 2007-09-20 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-09-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * wid-edit.el (widget-image-insert): Don't merge mouse-face with | 8 | * wid-edit.el (widget-image-insert): Don't merge mouse-face with |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index a7b97b16d20..2d6a0ce5e88 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -2302,25 +2302,26 @@ This function is intended to be added to `auto-coding-functions'." | |||
| 2302 | (defun sgml-html-meta-auto-coding-function (size) | 2302 | (defun sgml-html-meta-auto-coding-function (size) |
| 2303 | "If the buffer has an HTML meta tag, use it to determine encoding. | 2303 | "If the buffer has an HTML meta tag, use it to determine encoding. |
| 2304 | This function is intended to be added to `auto-coding-functions'." | 2304 | This function is intended to be added to `auto-coding-functions'." |
| 2305 | (setq size (min (+ (point) size) | 2305 | (let ((case-fold-search t)) |
| 2306 | (save-excursion | 2306 | (setq size (min (+ (point) size) |
| 2307 | ;; Limit the search by the end of the HTML header. | 2307 | (save-excursion |
| 2308 | (or (search-forward "</head>" size t) | 2308 | ;; Limit the search by the end of the HTML header. |
| 2309 | ;; In case of no header, search only 10 lines. | 2309 | (or (search-forward "</head>" size t) |
| 2310 | (forward-line 10)) | 2310 | ;; In case of no header, search only 10 lines. |
| 2311 | (point)))) | 2311 | (forward-line 10)) |
| 2312 | ;; Make sure that the buffer really contains an HTML document, by | 2312 | (point)))) |
| 2313 | ;; checking that it starts with a doctype or a <HTML> start tag | 2313 | ;; Make sure that the buffer really contains an HTML document, by |
| 2314 | ;; (allowing for whitespace at bob). Note: 'DOCTYPE NETSCAPE' is | 2314 | ;; checking that it starts with a doctype or a <HTML> start tag |
| 2315 | ;; useful for Mozilla bookmark files. | 2315 | ;; (allowing for whitespace at bob). Note: 'DOCTYPE NETSCAPE' is |
| 2316 | (when (and (re-search-forward "\\`[[:space:]\n]*\\(<!doctype[[:space:]\n]+\\(html\\|netscape\\)\\|<html\\)" size t) | 2316 | ;; useful for Mozilla bookmark files. |
| 2317 | (re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t)) | 2317 | (when (and (re-search-forward "\\`[[:space:]\n]*\\(<!doctype[[:space:]\n]+\\(html\\|netscape\\)\\|<html\\)" size t) |
| 2318 | (let* ((match (match-string 1)) | 2318 | (re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t)) |
| 2319 | (sym (intern (downcase match)))) | 2319 | (let* ((match (match-string 1)) |
| 2320 | (if (coding-system-p sym) | 2320 | (sym (intern (downcase match)))) |
| 2321 | sym | 2321 | (if (coding-system-p sym) |
| 2322 | (message "Warning: unknown coding system \"%s\"" match) | 2322 | sym |
| 2323 | nil)))) | 2323 | (message "Warning: unknown coding system \"%s\"" match) |
| 2324 | nil))))) | ||
| 2324 | 2325 | ||
| 2325 | ;;; | 2326 | ;;; |
| 2326 | (provide 'mule) | 2327 | (provide 'mule) |