Mercurial > emacs
view lisp/nxml/nxml-enc.el @ 110523:a5ad4f188e19
Synch Semantic to CEDET 1.0.
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog.
* semantic.el (semantic-version): Update to 2.0.
(semantic-mode-map): Add "," and "m" bindings.
(navigate-menu): Update.
* semantic/symref.el (semantic-symref-calculate-rootdir):
New function.
(semantic-symref-detect-symref-tool): Use it.
* semantic/symref/grep.el (semantic-symref-grep-shell): New var.
(semantic-symref-perform-search): Use it. Calculate root dir with
semantic-symref-calculate-rootdir.
(semantic-symref-derive-find-filepatterns): Improve error message.
* semantic/symref/list.el
(semantic-symref-results-mode-map): New bindings.
(semantic-symref-auto-expand-results): New option.
(semantic-symref-results-dump): Obey auto-expand.
(semantic-symref-list-expand-all, semantic-symref-regexp)
(semantic-symref-list-contract-all)
(semantic-symref-list-map-open-hits)
(semantic-symref-list-update-open-hits)
(semantic-symref-list-create-macro-on-open-hit)
(semantic-symref-list-call-macro-on-open-hits): New functions.
(semantic-symref-list-menu-entries)
(semantic-symref-list-menu): New vars.
(semantic-symref-list-map-open-hits): Move cursor to beginning of
match before calling the mapped function.
* semantic/doc.el
(semantic-documentation-comment-preceeding-tag): Do nothing if the
mode doesn't provide comment-start-skip.
* semantic/scope.el
(semantic-analyze-scope-nested-tags-default): Strip duplicates.
(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
looking for as part of the scoped tags list.
* semantic/html.el (semantic-default-html-setup): Add
senator-step-at-tag-classes.
* semantic/decorate/include.el
(semantic-decoration-on-unknown-includes): Change light bgcolor.
(semantic-decoration-on-includes-highlight-default): Check that
the include tag has a postion.
* semantic/complete.el (semantic-collector-local-members):
(semantic-complete-read-tag-local-members)
(semantic-complete-jump-local-members): New class and functions.
(semantic-complete-self-insert): Save excursion before completing.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): If no completions
are found, return the raw by-name-only completion list. Add FLAGS
arguments. Add support for 'no-tc (type constraint) and
'no-unique, or no stripping duplicates.
(semantic-analyze-possible-completions-default): Add FLAGS arg.
* semantic/util-modes.el
(semantic-stickyfunc-show-only-functions-p): New option.
(semantic-stickyfunc-fetch-stickyline): Don't show stickytext for
the very first line in a buffer.
* semantic/util.el (semantic-hack-search)
(semantic-recursive-find-nonterminal-by-name)
(semantic-current-tag-interactive): Deleted.
(semantic-describe-buffer): Fix expand-nonterminal. Add
lex-syntax-mods, type relation separator char, and command
separation char.
(semantic-sanity-check): Only message if called interactively.
* semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the
:filename property and the tag position.
* semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
Add recursion limit.
* semantic/imenu.el (semantic-imenu-bucketize-type-members):
Make this buffer local, not the obsoleted variable.
* semantic/idle.el: Add breadcrumbs support.
(semantic-idle-summary-current-symbol-info-default)
(semantic-idle-tag-highlight)
(semantic-idle-completion-list-default): Use
semanticdb-without-unloaded-file-searches for speed, and to
conform to the controls that specify if the idle timer is supposed
to be parsing unparsed includes.
(semantic-idle-symbol-highlight-face)
(semantic-idle-symbol-maybe-highlight): Rename from *-summary-*.
Callers changed.
(semantic-idle-work-parse-neighboring-files-flag): Default to nil.
(semantic-idle-work-update-headers-flag): New var.
(semantic-idle-work-for-one-buffer): Use it.
(semantic-idle-local-symbol-highlight): Rename from
semantic-idle-tag-highlight.
(semantic-idle-truncate-long-summaries): New option.
* semantic/ia.el (semantic-ia-cache)
(semantic-ia-get-completions): Deleted. Callers changed.
(semantic-ia-show-variants): New command.
(semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
(semantic-ia-show-summary): If there isn't anything to show, say so.
* semantic/grammar.el (semantic-grammar-create-package):
Save the buffer even in batch mode.
* semantic/fw.el
(semanticdb-without-unloaded-file-searches): New macro.
* semantic/dep.el (semantic-dependency-find-file-on-path):
Fix case dereferencing ede-object when it is a list.
* semantic/db-typecache.el (semanticdb-expand-nested-tag)
(semanticdb-typecache-faux-namespace): New functions.
(semanticdb-typecache-file-tags)
(semanticdb-typecache-merge-streams): Use them.
(semanticdb-typecache-file-tags): When deriving tags from a file,
give the mode a chance to monkey with the tag copy.
(semanticdb-typecache-find-default): Wrap find in save-excursion.
(semanticdb-typecache-find-by-name-helper): Merge found names down.
* semantic/db-global.el
(semanticdb-enable-gnu-global-in-buffer): Don't show messages if
GNU Global is not available and we don't want to throw an error.
* semantic/db-find.el (semanticdb-find-result-nth-in-buffer):
When trying to normalize the tag to a buffer, don't error if
set-buffer method doesn't exist.
* semantic/db-file.el (semanticdb-save-db): Simplify msg.
* semantic/db.el (semanticdb-refresh-table): If forcing a
refresh on a file not in a buffer, use semantic-find-file-noselect
and delete the buffer after use.
(semanticdb-current-database-list): When calculating root via
hooks, force it through true-filename and skip the list of
possible roots.
* semantic/ctxt.el (semantic-ctxt-imported-packages): New.
* semantic/analyze/debug.el
(semantic-analyzer-debug-insert-tag): Reset standard output to
current buffer.
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype): Change "prefix" to
"symbol" in messages.
* semantic/analyze/refs.el: (semantic-analyze-refs-impl)
(semantic-analyze-refs-proto): When calculating value, make sure
the found tag is 'similar' to the originating tag.
(semantic--analyze-refs-find-tags-with-parent): Attempt to
identify matches via imported symbols of parents.
(semantic--analyze-refs-full-lookup-with-parents): Do a deep
search during the brute search.
* semantic/analyze.el
(semantic-analyze-find-tag-sequence-default): Be robust to
calculated scopes being nil.
* semantic/bovine/c.el (semantic-c-describe-environment): Add
project macro symbol array.
(semantic-c-parse-lexical-token): Add recursion limit.
(semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
New overrides.
(semantic-expand-c-tag-namelist): Split a full type from a typedef
out to its own tag.
(semantic-expand-c-tag-namelist): Do not split out a typedef'd
inline type if it is an anonymous type.
(semantic-c-reconstitute-token): Use the optional initializers as
a clue that some function is probably a constructor. When
defining the type of these constructors, split the parent name,
and use only the class part, if applicable.
* semantic/bovine/c-by.el:
* semantic/wisent/python-wy.el: Regenerate.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 18 Sep 2010 22:49:54 -0400 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; nxml-enc.el --- XML encoding auto-detection ;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: James Clark ;; Keywords: XML ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; User entry points are nxml-start-auto-coding and ;; nxml-stop-auto-coding. This is separate from nxml-mode, because ;; this cannot be autoloaded. It may use ;; `xmltok-get-declared-encoding-position' which can be autoloaded. ;; It's separate from rng-auto.el so it can be byte-compiled, and ;; because it provides independent, useful functionality. ;;; Code: (defvar nxml-file-name-ignore-case (memq system-type '(windows-nt))) (defvar nxml-cached-file-name-auto-coding-regexp nil) (defvar nxml-cached-auto-mode-alist nil) (defun nxml-file-name-auto-coding-regexp () "Return regexp for filenames for which XML auto-coding should be done." (if (eq auto-mode-alist nxml-cached-auto-mode-alist) nxml-cached-file-name-auto-coding-regexp (let ((alist auto-mode-alist) (case-fold-search nxml-file-name-ignore-case) regexps) (setq nxml-cached-auto-mode-alist alist) (while alist (when (eq (cdar alist) 'nxml-mode) (setq regexps (cons (caar alist) regexps))) (setq alist (cdr alist))) (setq nxml-cached-file-name-auto-coding-regexp (if (null (cdr regexps)) (car regexps) (mapconcat (lambda (r) (concat "\\(?:" r "\\)")) regexps "\\|")))))) (defvar nxml-non-xml-set-auto-coding-function nil "The function that `set-auto-coding-function' should call for non-XML files.") (defun nxml-set-auto-coding (file-name size) (if (let ((case-fold-search nxml-file-name-ignore-case) (regexp (nxml-file-name-auto-coding-regexp))) (and regexp (string-match regexp file-name))) (nxml-set-xml-coding file-name size) (and nxml-non-xml-set-auto-coding-function (funcall nxml-non-xml-set-auto-coding-function file-name size)))) (defun nxml-set-xml-coding (file-name size) "Function to use as `set-auto-coding-function' when file is known to be XML." (nxml-detect-coding-system (+ (point) (min size 1024)))) (declare-function xmltok-get-declared-encoding-position "xmltok" (&optional limit)) ; autoloaded (defun nxml-detect-coding-system (limit) (if (< limit (+ (point) 2)) (if (eq (char-after) 0) 'no-conversion 'utf-8) (let ((first-two-chars (list (char-after) (char-after (1+ (point)))))) (cond ((equal first-two-chars '(#xFE #xFF)) (and (coding-system-p 'utf-16-be) 'utf-16-be)) ((equal first-two-chars '(#xFF #xFE)) (and (coding-system-p 'utf-16-le) 'utf-16-le)) ((memq 0 first-two-chars) ;; Certainly not well-formed XML; ;; perhaps UTF-16 without BOM. ;; In any case, we can't handle it. ;; no-conversion gives the user a chance to fix it. 'no-conversion) ;; There are other things we might try here in the future ;; eg UTF-8 BOM, UTF-16 with no BOM ;; translate to EBCDIC (t (let ((enc-pos (xmltok-get-declared-encoding-position limit))) (cond ((consp enc-pos) (or (nxml-mime-charset-coding-system (buffer-substring-no-properties (car enc-pos) (cdr enc-pos))) ;; We have an encoding whose name we don't recognize. ;; What to do? ;; raw-text seems the best bet: since we got ;; the XML decl it must be a superset of ASCII, ;; so we don't need to go to no-conversion 'raw-text)) (enc-pos 'utf-8) ;; invalid XML declaration (t nil)))))))) (defun nxml-mime-charset-coding-system (charset) (let ((charset-sym (intern (downcase charset))) (coding-systems (coding-system-list t)) coding-system ret) (while (and coding-systems (not ret)) (setq coding-system (car coding-systems)) (if (eq (coding-system-get coding-system 'mime-charset) charset-sym) (setq ret coding-system) (setq coding-systems (cdr coding-systems)))) ret)) (defun nxml-start-auto-coding () "Do encoding auto-detection as specified in the XML standard. Applied to any files that `auto-mode-alist' says should be handled by `nxml-mode'." (interactive) (unless (eq set-auto-coding-function 'nxml-set-auto-coding) (let ((inhibit-quit t)) (setq nxml-non-xml-set-auto-coding-function set-auto-coding-function) (setq set-auto-coding-function 'nxml-set-auto-coding)))) (defun nxml-stop-auto-coding () "Stop doing encoding auto-detection as specified in the XML standard." (interactive) (when (eq set-auto-coding-function 'nxml-set-auto-coding) (let ((inhibit-quit t)) (setq set-auto-coding-function nxml-non-xml-set-auto-coding-function) (setq nxml-non-xml-set-auto-coding-function nil)))) ;; Emacs 22 makes us-ascii an alias for iso-safe without ;; giving it a mime-charset property. (unless (coding-system-get 'us-ascii 'mime-charset) (coding-system-put 'us-ascii 'mime-charset 'us-ascii)) (provide 'nxml-enc) ;; arch-tag: c2436247-78f3-418c-8069-85dc5335d083 ;;; nxml-enc.el ends here