diff options
Diffstat (limited to 'lisp/textmodes')
29 files changed, 96 insertions, 64 deletions
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el index 1c4dacf71d8..856fe735f8e 100644 --- a/lisp/textmodes/bib-mode.el +++ b/lisp/textmodes/bib-mode.el @@ -1,6 +1,6 @@ ;;; bib-mode.el --- major mode for editing bib files -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 9597b136d7d..5cc22443219 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1,7 +1,7 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs -;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de> ;; Bengt Martensson <bengt@mathematik.uni-Bremen.de> diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el index cd1079e0924..841a5bb0830 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -1,6 +1,6 @@ ;;; enriched.el --- read and save files in text/enriched format -;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org> diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index e5b3a64db84..21ee585ec11 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -762,7 +762,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." (list (if current-prefix-arg 'full)))) ;; First try fill-paragraph-function. (or (and (or fill-paragraph-function - (and (window-minibuffer-p (selected-window)) + (and (minibufferp (current-buffer)) (= 1 (point-min)))) (let ((function (or fill-paragraph-function ;; In the minibuffer, don't count the width @@ -838,14 +838,16 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." (commark (comment-string-strip (buffer-substring comstart comin) nil t)) (comment-re - (if (string-match comment-start-skip (concat commark "a")) + ;; `commark' is surrounded with arbitrary text (`\0' and `a') + ;; to make sure it can be used as an optimization of + ;; `comment-start-skip' in the middle of a line. For example, + ;; `commark' can't be used with the "@c" in TeXinfo (hence + ;; the `a') or with the "C" at BOL in Fortran (hence the `\0'). + (if (string-match comment-start-skip (concat "\0" commark "a")) (concat "[ \t]*" (regexp-quote commark) ;; Make sure we only match comments that use ;; the exact same comment marker. "[^" (substring commark -1) "]") - ;; If the commark needs to be followed by some special - ;; set of characters (like @c in TeXinfo), we can't - ;; rely just on `commark'. (concat "[ \t]*\\(?:" comment-start-skip "\\)"))) (comment-fill-prefix ; Compute a fill prefix. (save-excursion diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index a3c110b8f19..7badf21d966 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1,6 +1,6 @@ ;;; flyspell.el --- on-the-fly spell checker -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr> @@ -541,6 +541,11 @@ in your .emacs file. (member (or ispell-local-dictionary ispell-dictionary) flyspell-dictionaries-that-consider-dash-as-word-delimiter))))) +(defun flyspell-hack-local-variables-hook () + ;; When local variables are loaded, see if the dictionary context + ;; has changed. + (flyspell-accept-buffer-local-defs 'force)) + (defun flyspell-kill-ispell-hook () (setq flyspell-last-buffer nil) (dolist (buf (buffer-list)) @@ -579,6 +584,9 @@ in your .emacs file. (add-hook 'pre-command-hook (function flyspell-pre-command-hook) t t) ;; we bound flyspell action to after-change hook (add-hook 'after-change-functions 'flyspell-after-change-function nil t) + ;; we bound flyspell action to hack-local-variables-hook + (add-hook 'hack-local-variables-hook + (function flyspell-hack-local-variables-hook) t t) ;; set flyspell-generic-check-word-predicate based on the major mode (let ((mode-predicate (get major-mode 'flyspell-mode-predicate))) (if mode-predicate @@ -684,6 +692,8 @@ not the very same deplacement command." (remove-hook 'post-command-hook (function flyspell-post-command-hook) t) (remove-hook 'pre-command-hook (function flyspell-pre-command-hook) t) (remove-hook 'after-change-functions 'flyspell-after-change-function t) + (remove-hook 'hack-local-variables-hook + (function flyspell-hack-local-variables-hook) t) ;; we remove all the flyspell hilightings (flyspell-delete-all-overlays) ;; we have to erase pre cache variables diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index 26a47a65e84..f521cc279d0 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -1,6 +1,6 @@ ;;; makeinfo.el --- run makeinfo conveniently -;; Copyright (C) 1991, 1993, 2002, 2003, 2004, +;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Robert J. Chassell diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index d9baad489a3..4cd697af36d 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <dominik at science dot uva dot nl> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/ -;; Version: 4.56b +;; Version: 4.56e ;; ;; This file is part of GNU Emacs. ;; @@ -114,7 +114,7 @@ ;;; Customization variables -(defvar org-version "4.56b" +(defvar org-version "4.56e" "The version number of the file org.el.") (defun org-version () (interactive) @@ -3211,6 +3211,9 @@ The following commands are available: ;; Paragraphs and auto-filling (org-set-autofill-regexps) (org-update-radio-target-regexp) + ;; Make isearch reveal context after success + (org-set-local 'outline-isearch-open-invisible-function + (lambda (&rest ignore) (org-show-context nil t))) (if (and org-insert-mode-line-in-empty-file (interactive-p) @@ -3238,7 +3241,7 @@ The following commands are available: (defsubst org-current-line (&optional pos) (save-excursion (and pos (goto-char pos)) - (+ (if (bolp) 1 0) (count-lines (point-min) (point))))) + (+ (if (bolp) 1 0) (count-lines 1 (point))))) (defun org-current-time () "Current time, possibly rounded to `org-time-stamp-rounding-minutes'." @@ -5691,6 +5694,7 @@ When SIBLINGS is non-nil, show all siblings on each hierarchy level." (save-excursion (and (if heading-p (org-goto-sibling) (outline-next-heading)) (org-flag-heading nil)))) + (when siblings (org-show-siblings)) (when hierarchy-p ;; show all higher headings, possibly with siblings (save-excursion @@ -5699,12 +5703,15 @@ When SIBLINGS is non-nil, show all siblings on each hierarchy level." (error nil)) (not (bobp))) (org-flag-heading nil) - (when siblings - (save-excursion - (while (org-goto-sibling) (org-flag-heading nil))) - (save-excursion - (while (org-goto-sibling 'previous) - (org-flag-heading nil)))))))))) + (when siblings (org-show-siblings)))))))) + +(defun org-show-siblings () + "Show all siblings of the current headline." + (save-excursion + (while (org-goto-sibling) (org-flag-heading nil))) + (save-excursion + (while (org-goto-sibling 'previous) + (org-flag-heading nil)))) (defun org-reveal (&optional siblings) "Show current entry, hierarchy above it, and the following headline. @@ -12375,11 +12382,11 @@ with `org-table-paste-rectangle'." (rpl (if cut " " nil))) (goto-char beg) (org-table-check-inside-data-field) - (setq l01 (count-lines (point-min) (point)) + (setq l01 (org-current-line) c01 (org-table-current-column)) (goto-char end) (org-table-check-inside-data-field) - (setq l02 (count-lines (point-min) (point)) + (setq l02 (org-current-line) c02 (org-table-current-column)) (setq l1 (min l01 l02) l2 (max l01 l02) c1 (min c01 c02) c2 (max c01 c02)) @@ -12410,7 +12417,7 @@ lines." (error "First cut/copy a region to paste!")) (org-table-check-inside-data-field) (let* ((clip org-table-clip) - (line (count-lines (point-min) (point))) + (line (org-current-line)) (col (org-table-current-column)) (org-enable-table-editor t) (org-table-automatic-realign nil) @@ -16278,6 +16285,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]." (define-key org-mode-map [(tab)] 'org-cycle) (define-key org-mode-map [(control tab)] 'org-force-cycle-archived) (define-key org-mode-map [(meta tab)] 'org-complete) +(define-key org-mode-map "\M-\t" 'org-complete) ;; The following line is necessary under Suse GNU/Linux (unless (featurep 'xemacs) (define-key org-mode-map [S-iso-lefttab] 'org-shifttab)) diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index 24282872f67..700a4388f57 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -1,6 +1,6 @@ ;;; page-ext.el --- extended page handling commands -;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell <bob@gnu.org> diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el index 20458491808..f3abe36a26e 100644 --- a/lisp/textmodes/page.el +++ b/lisp/textmodes/page.el @@ -1,6 +1,6 @@ ;;; page.el --- page motion commands for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index ce1dbf8993b..ab070053e07 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -1,6 +1,6 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model -;; Copyright (C) 1985, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index 25613cff8ca..f276fe26458 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -1,6 +1,6 @@ ;;; refbib.el --- convert refer-style references to ones usable by Latex bib -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Henry Kautz <kautz@research.att.com> diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el index ce0f96956df..474b6f7be60 100644 --- a/lisp/textmodes/refer.el +++ b/lisp/textmodes/refer.el @@ -79,19 +79,19 @@ :group 'wp) (defcustom refer-bib-directory nil - "Directory, or list of directories, to search for \\.bib files. Can -be set to 'bibinputs or 'texinputs, in which case the environment + "Directory, or list of directories, to search for \\.bib files. +Can be set to 'bibinputs or 'texinputs, in which case the environment variable BIBINPUTS or TEXINPUTS, respectively, is used to obtain a -list of directories. Useful only if refer-bib-files is set to 'dir or -a list of file names (without directory). A value of nil indicates the +list of directories. Useful only if `refer-bib-files' is set to 'dir or +a list of file names (without directory). A value of nil indicates the current working directory. -If refer-bib-directory is 'bibinputs or 'texinputs, it is setq'd to +If `refer-bib-directory' is 'bibinputs or 'texinputs, it is setq'd to the appropriate list of directories when it is first used. Note that an empty directory is interpreted by BibTeX as indicating -the default search path. Since Refer does not know that default path, -it cannot search it. Include that path explicitly in your BIBINPUTS +the default search path. Since Refer does not know that default path, +it cannot search it. Include that path explicitly in your BIBINPUTS environment if you really want it searched (which is not likely to happen anyway)." :type '(choice (repeat directory) (const bibinputs) (const texinputs)) @@ -102,24 +102,24 @@ happen anyway)." or one of the following special values: nil = prompt for \\.bib file (if visiting a \\.bib file, use it as default) auto = read \\.bib file names from appropriate command in buffer (see - refer-bib-files-regexp) unless the buffer's mode is bibtex-mode, + `refer-bib-files-regexp') unless the buffer's mode is `bibtex-mode', in which case only the buffer is searched -dir = use all \\.bib files in directories referenced by refer-bib-directory. +dir = use all \\.bib files in directories referenced by `refer-bib-directory'. If a specified file doesn't exist and has no extension, a \\.bib extension is automatically tried. -If refer-bib-files is nil, auto or dir, it is setq'd to the appropriate -list of files when it is first used if refer-cache-bib-files is t. If -refer-cache-bib-files is nil, the list of \\.bib files to use is re-read +If `refer-bib-files' is nil, auto or dir, it is setq'd to the appropriate +list of files when it is first used if `refer-cache-bib-files' is t. If +`refer-cache-bib-files' is nil, the list of \\.bib files to use is re-read each time it is needed." :type '(choice (repeat file) (const nil) (const auto) (const dir)) :group 'refer) (defcustom refer-cache-bib-files t - "*Variable determining whether the value of refer-bib-files should be cached. + "*Variable determining whether the value of `refer-bib-files' should be cached. If t, initialize the value of refer-bib-files the first time it is used. If -nil, re-read the list of \\.bib files depending on the value of refer-bib-files +nil, re-read the list of \\.bib files depending on the value of `refer-bib-files' each time it is needed." :type 'boolean :group 'refer) @@ -128,8 +128,8 @@ each time it is needed." "*Regexp matching a bibliography file declaration. The current buffer is expected to contain a line such as \\bibliography{file1,file2,file3} -which is read to set up refer-bib-files. The regexp must specify the command -(such as \\bibliography) that is used to specify the list of bib files. The +which is read to set up `refer-bib-files'. The regexp must specify the command +\(such as \\bibliography) that is used to specify the list of bib files. The command is expected to specify a file name, or a list of comma-separated file names, within curly braces. If a specified file doesn't exist and has no extension, a \\.bib extension @@ -150,8 +150,8 @@ is automatically tried." (defun refer-find-entry (keywords &optional continue) "Find entry in refer-bib-files containing KEYWORDS. If KEYWORDS is nil, prompt user for blank-separated list of keywords. -If CONTINUE is t, or if called interactively with a prefix arg, look for next -entry by continuing search from previous point." +If CONTINUE is non-nil, or if called interactively with a prefix arg, +look for next entry by continuing search from previous point." (interactive (list nil current-prefix-arg)) (or keywords (setq keywords (if continue refer-previous-keywords @@ -160,13 +160,13 @@ entry by continuing search from previous point." (refer-find-entry-internal keywords continue)) (defun refer-find-next-entry () - "Find next occurrence of entry in refer-bib-files. See refer-find-entry." + "Find next occurrence of entry in `refer-bib-files'. See `refer-find-entry'." (interactive) (refer-find-entry-internal refer-previous-keywords t)) (defun refer-yank-key () "Inserts at point in current buffer the \"key\" field of the entry -found on the last refer-find-entry or refer-find-next-entry." +found on the last `refer-find-entry' or `refer-find-next-entry'." (interactive) (let ((old-point (point))) (insert diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el index 28ecd3bb4fe..69eb96491d1 100644 --- a/lisp/textmodes/refill.el +++ b/lisp/textmodes/refill.el @@ -1,6 +1,6 @@ ;;; refill.el --- `auto-fill' by refilling paragraphs on changes -;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 394a0b52b19..aa46553adbe 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -1,5 +1,6 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index a83c790f076..55d1e2f4614 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -1,5 +1,6 @@ ;;; reftex-cite.el --- creating citations with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 1e60b8e663e..bc5f7691bb7 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -1,5 +1,6 @@ ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index b878c288735..b07627c2e95 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -1,5 +1,6 @@ ;;; reftex-global.el --- operations on entire documents with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index 5616d4f454c..15f70895ce3 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1,5 +1,6 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 76eb7c31df8..89aef5bd971 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -1,5 +1,6 @@ ;;; reftex-parse.el --- parser functions for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index a850da3042e..3104152dab6 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -1,5 +1,6 @@ ;;; reftex-ref.el --- code to create labels and references with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index f0e8205024c..1660fe70f40 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -1,5 +1,6 @@ ;;; reftex-sel.el --- the selection modes for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2440, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 0f8a948e363..852af59df45 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1,5 +1,6 @@ ;;; reftex-vars.el --- configuration variables for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 6136d22e432..aa24a724877 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -265,7 +265,10 @@ Any terminating `>' or `/' is not matched.") (1 (if (match-end 2) sgml-namespace-face font-lock-function-name-face)) (2 font-lock-function-name-face nil t)) ;; FIXME: this doesn't cover the variables using a default value. - (,(concat "\\(" sgml-namespace-re "\\)\\(?::\\(" + ;; The first shy-group is an important anchor: it prevents an O(n^2) + ;; pathological case where we otherwise keep retrying a failing match + ;; against a very long word at every possible position within the word. + (,(concat "\\(?:^\\|[ \t]\\)\\(" sgml-namespace-re "\\)\\(?::\\(" sgml-name-re "\\)\\)?=[\"']") (1 (if (match-end 2) sgml-namespace-face font-lock-variable-name-face)) (2 font-lock-variable-name-face nil t)) diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el index ddc6788123d..f68cc6b6010 100644 --- a/lisp/textmodes/spell.el +++ b/lisp/textmodes/spell.el @@ -1,6 +1,6 @@ ;;; spell.el --- spelling correction interface for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 9e78f4b6015..511721d7f67 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,7 +1,7 @@ ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*- ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tex diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 9263c48f18b..873635a3893 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -1,6 +1,6 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1992, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index bf6edac230c..74b2db3ad34 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -1,6 +1,6 @@ ;;; tildify.el --- adding hard spaces into texts -;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 958ef179b26..9de1a078d13 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,6 +1,6 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el index 8e8ef3b399e..4cea84c5a40 100644 --- a/lisp/textmodes/underline.el +++ b/lisp/textmodes/underline.el @@ -1,6 +1,6 @@ ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF |