Mercurial > emacs
changeset 106803:4abcc08ffba2
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 12 Jan 2010 08:54:18 +0100 |
| parents | 05ac7369b8c2 (current diff) b92c3979701c (diff) |
| children | 65abe959e89a |
| files | |
| diffstat | 38 files changed, 469 insertions(+), 343 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-12 Glenn Morris <rgm@gnu.org> + + * INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug + for bug reports for development versions. + 2010-01-02 Eli Zaretskii <eliz@gnu.org> * .bzrignore: Add more ignored patterns, including for the MS-DOS
--- a/INSTALL.BZR Mon Jan 11 08:37:07 2010 +0100 +++ b/INSTALL.BZR Tue Jan 12 08:54:18 2010 +0100 @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -54,9 +54,8 @@ applicable to those systems as well. Questions, requests, and bug reports about the Bazaar versions of Emacs -should be sent to emacs-pretest-bug@gnu.org rather than gnu.emacs.help -or gnu.emacs.bug. Ideally, use M-x report-emacs-bug RET which will -send it to the proper place. +should be sent to bug-gnu-emacs@gnu.org rather than gnu.emacs.help. +Ideally, use M-x report-emacs-bug RET. Because the Bazaar version of Emacs is a work in progress, it will sometimes fail to build. Please wait a day or so (and check the bug
--- a/README Mon Jan 11 08:37:07 2010 +0100 +++ b/README Tue Jan 12 08:54:18 2010 +0100 @@ -1,5 +1,5 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 - Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -19,10 +19,8 @@ You may encounter bugs in this release. If you do, please report them; your bug reports are valuable contributions to the FSF, since they allow us to notice and fix problems on machines we don't have, or -in code we don't use often. Please send bug reports for released -versions of Emacs sent to the mailing list bug-gnu-emacs@gnu.org. -Please send bug reports for pretest versions of Emacs, and versions -from the Savannah.gnu.org repository, to emacs-pretest-bug@gnu.org. +in code we don't use often. Please send bug reports to the mailing +list bug-gnu-emacs@gnu.org. If possible, use M-x report-emacs-bug. See the "Bugs" section of the Emacs manual for more information on how to report bugs. (The file `BUGS' in this directory explains how you
--- a/admin/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/admin/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-12 Glenn Morris <rgm@gnu.org> + + * emacs-pretesters, make-announcement: Use bug-gnu-emacs rather + than emacs-pretest-bug for bug reports for development versions. + 2009-11-06 Kenichi Handa <handa@m17n.org> * unidata/unidata-gen.el (unidata-gen-table): Fix for the case
--- a/admin/emacs-pretesters Mon Jan 11 08:37:07 2010 +0100 +++ b/admin/emacs-pretesters Tue Jan 12 08:54:18 2010 +0100 @@ -89,8 +89,7 @@ to make Emacs work on your machine. If so, you should follow these recommendations also, for the same reason. -* Send your problem reports to emacs-pretest-bug@gnu.org, not -bug-gnu-emacs. +* Send your problem reports to bug-gnu-emacs@gnu.org. Sometimes we won't know what to do about a system-dependent issue, and we may need people to say what happens if you try a certain thing on a
--- a/admin/make-announcement Mon Jan 11 08:37:07 2010 +0100 +++ b/admin/make-announcement Tue Jan 12 08:54:18 2010 +0100 @@ -1,7 +1,7 @@ #! /bin/bash -## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -## Free Software Foundation, Inc. +## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +## 2010 Free Software Foundation, Inc. ## Author: Francesco Potorti` <pot@gnu.org> @@ -59,7 +59,7 @@ <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz> Please report results from compiling and running the pretest to -<emacs-pretest-bug@gnu.org>. Your feedback is necessary for us +<bug-gnu-emacs@gnu.org>. Your feedback is necessary for us to know on which platforms the pretest has been tried. If you have the tars from the previous pretest, and you have the
--- a/doc/emacs/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/doc/emacs/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-12 Glenn Morris <rgm@gnu.org> + + * trouble.texi (Checklist): Use bug-gnu-emacs rather than + emacs-pretest-bug for bug reports for development versions. + 2010-01-11 Glenn Morris <rgm@gnu.org> * display.texi (Highlight Interactively): `t' does not mean highlight
--- a/doc/emacs/trouble.texi Mon Jan 11 08:37:07 2010 +0100 +++ b/doc/emacs/trouble.texi Tue Jan 12 08:54:18 2010 +0100 @@ -1,6 +1,7 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +@c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Dealing with Common Problems @@ -540,10 +541,8 @@ @cindex reporting bugs The best way to send a bug report is to mail it electronically to the -Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}, or to -@email{emacs-pretest-bug@@gnu.org} if you are pretesting an Emacs beta -release. (If you want to suggest a change as an improvement, use the -same address.) +Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}. (If you want to +suggest a change as an improvement, use the same address.) If you'd like to read the bug reports, you can find them on the newsgroup @samp{gnu.emacs.bug}; keep in mind, however, that as a
--- a/etc/CONTRIBUTE Mon Jan 11 08:37:07 2010 +0100 +++ b/etc/CONTRIBUTE Tue Jan 12 08:54:18 2010 +0100 @@ -1,4 +1,4 @@ -Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. See end for license conditions. @@ -73,7 +73,7 @@ can properly evaluate it. When you have all these pieces, bundle them up in a mail message and -send it to emacs-pretest-bug@gnu.org or emacs-devel@gnu.org. +send it to bug-gnu-emacs@gnu.org or emacs-devel@gnu.org. All subsequent discussion should also be sent to the mailing list. @@ -149,9 +149,7 @@ Discussion about Emacs development takes place on emacs-devel@gnu.org. -Bug reports for released versions are sent to bug-gnu-emacs@gnu.org. - -Bug reports for development versions are sent to emacs-pretest-bug@gnu.org. +Bug reports are sent to bug-gnu-emacs@gnu.org. You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs.
--- a/etc/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/etc/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-12 Glenn Morris <rgm@gnu.org> + + * CONTRIBUTE, NEWS: Use bug-gnu-emacs rather than emacs-pretest-bug + for bug reports for development versions. + 2010-01-01 Juanma Barranquero <lekktu@gmail.com> * NEWS: Fix typos.
--- a/etc/NEWS Mon Jan 11 08:37:07 2010 +0100 +++ b/etc/NEWS Tue Jan 12 08:54:18 2010 +0100 @@ -1,9 +1,9 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. See the end of the file for license conditions. -Please send Emacs bug reports to emacs-pretest-bug@gnu.org. +Please send Emacs bug reports to bug-gnu-emacs@gnu.org. If possible, use M-x report-emacs-bug. This file is about changes in Emacs version 23.
--- a/lib-src/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/lib-src/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,9 @@ +2010-01-11 Glenn Morris <rgm@gnu.org> + + * ebrowse.c (version): + * etags.c (print_version): + * rcs2log (Copyright): Set copyright year to 2010. + 2009-12-09 David Robinow <drobinow@gmail.com> (tiny change) * makefile.w32-in: Use parenthesis for macros for nmake
--- a/lib-src/ebrowse.c Mon Jan 11 08:37:07 2010 +0100 +++ b/lib-src/ebrowse.c Tue Jan 12 08:54:18 2010 +0100 @@ -1,7 +1,7 @@ /* ebrowse.c --- parsing files for the ebrowse C++ browser Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3680,7 +3680,7 @@ version () { /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc."; + char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; printf ("ebrowse %s\n", VERSION); puts (emacs_copyright);
--- a/lib-src/etags.c Mon Jan 11 08:37:07 2010 +0100 +++ b/lib-src/etags.c Tue Jan 12 08:54:18 2010 +0100 @@ -29,7 +29,7 @@ Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. @@ -898,7 +898,7 @@ print_version () { /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc."; + char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); puts (emacs_copyright);
--- a/lib-src/rcs2log Mon Jan 11 08:37:07 2010 +0100 +++ b/lib-src/rcs2log Tue Jan 12 08:54:18 2010 +0100 @@ -3,7 +3,7 @@ # RCS to ChangeLog generator # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009 +# 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. # Author: Paul Eggert <eggert@twinsun.com> @@ -22,7 +22,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -Copyright='Copyright (C) 2009 Free Software Foundation, Inc. +Copyright='Copyright (C) 2010 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License.
--- a/lisp/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,88 @@ +2010-01-12 Glenn Morris <rgm@gnu.org> + + * mail/emacsbug.el (report-emacs-bug-pretest-address): Set + it to bug-gnu-emacs rather than emacs-pretest-bug. + +2010-01-12 Juanma Barranquero <lekktu@gmail.com> + + * cedet/data-debug.el (data-debug): Fix customization group reference. + +2010-01-12 Juanma Barranquero <lekktu@gmail.com> + + * cedet/semantic/analyze.el (semantic-analyze-push-error) + (semantic-analyze-context, semantic-analyze-context-assignment) + (semantic-analyze-find-tag-sequence, semantic-analyze-find-tag): + * cedet/semantic/java.el (java-mode, semantic-tag-include-filename) + (semantic-java-doc-keywords-map): + * cedet/semantic/bovine/c.el (c-mode, semantic-c-member-of-autocast) + (semantic-lex-c-nested-namespace-ignore-second, semantic-parse-region) + (semantic-c-parse-lexical-token, semantic-c-debug-mode-init-pch) + (semantic-c-classname, semantic-format-tag-uml-prototype) + (semantic-c-dereference-namespace, semantic-analyze-type-constants): + * cedet/semantic/bovine/el.el (semantic-elisp-form-to-doc-string) + (semantic-emacs-lisp-obsoleted-doc, semantic-up-context) + (semantic-get-local-variables, semantic-end-of-command) + (semantic-beginning-of-command, semantic-ctxt-current-class-list) + (lisp-mode): + * cedet/semantic/bovine/make.el (makefile-mode): + * cedet/semantic/wisent/python.el (wisent-python-string-re) + (wisent-python-implicit-line-joining-p, wisent-python-forward-string) + (wisent-python-lex-beginning-of-line, wisent-python-lex-end-of-line) + (semantic-lex, semantic-get-local-variables, python-mode): + * cedet/semantic/wisent/python-wy.el (wisent-python-wy--keyword-table): + * cedet/srecode/extract.el (srecode-extract-state-set) + (srecode-extract-method): Fix typos in docstrings. + +2010-01-11 Sam Steingold <sds@gnu.org> + + * imenu.el (imenu-default-create-index-function): Detect infinite + loops caused by imenu-prev-index-position-function. + +2010-01-11 Juanma Barranquero <lekktu@gmail.com> + + * htmlfontify.el (htmlfontify-load-rgb-file) + (htmlfontify-unload-rgb-file, hfy-fallback-colour-values) + (htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer) + (hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn) + (hfy-link-style-fun, hfy-index-file, hfy-instance-file) + (hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks) + (hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map) + (hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties) + (hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class) + (hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap) + (hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq) + (hfy-colour-vals, hfy-default-header, hfy-link-style-string) + (hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec) + (hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int) + (hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name) + (hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at) + (hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer) + (hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer) + (hfy-force-fontification, htmlfontify-buffer, hfy-dirname) + (hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub) + (hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i) + (hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps) + (htmlfontify-run-etags): Fix typos in docstrings and remove superfluous + backslash-quoting from parentheses, etc. + +2010-01-11 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/js.el: Autoload javascript-mode alias. + +2010-01-11 Juanma Barranquero <lekktu@gmail.com> + + * ffap.el (ffap-shell-prompt-regexp, ffap-all-subdirs, ffap-url-p) + (ffap-alist, ffap-tex-path, ffap-url-at-point, ffap-gopher-regexp) + (ffap-gopher-at-point, ffap-file-at-point, ffap-read-file-or-url) + (ffap-read-url-internal, ffap-menu, ffap-at-mouse): + Fix typos in docstrings. + (ffap-url-regexp): Doc fix. + (ffap-at-mouse): Fix typo in message. + +2010-01-11 Glenn Morris <rgm@gnu.org> + + * version.el (emacs-copyright): Set copyright year to 2010. + 2010-01-10 Stefan Monnier <monnier@iro.umontreal.ca> * format.el (format-annotate-function): Only set
--- a/lisp/cedet/data-debug.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/data-debug.el Tue Jan 12 08:54:18 2010 +0100 @@ -842,7 +842,7 @@ ;; (defgroup data-debug nil "data-debug group." - :group 'langauges) + :group 'languages) (defvar data-debug-mode-syntax-table (let ((table (make-syntax-table (standard-syntax-table))))
--- a/lisp/cedet/semantic/analyze.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/analyze.el Tue Jan 12 08:54:18 2010 +0100 @@ -41,7 +41,7 @@ ;; tag - A single entity ;; prefix - The beginning of a symbol, usually used to look up something ;; incomplete. -;; type - The name of a datatype in the langauge. +;; type - The name of a datatype in the language. ;; metatype - If a type is named in a declaration like: ;; struct moose somevariable; ;; that name "moose" can be turned into a concrete type. @@ -83,7 +83,7 @@ (defun semantic-analyze-push-error (err) "Push the error in ERR-DATA onto the error stack. -Argument ERR" +Argument ERR." (push err semantic-analyze-error-stack)) ;;; Analysis Classes @@ -124,7 +124,7 @@ (errors :initarg :errors :documentation "Any errors thrown an caught during analysis.") ) - "Base analysis data for a any context.") + "Base analysis data for any context.") (defclass semantic-analyze-context-assignment (semantic-analyze-context) ((assignee :initarg :assignee @@ -132,7 +132,7 @@ :documentation "A sequence of tags for an assignee. This is a variable into which some value is being placed. The last item in the list is the variable accepting the value. Earlier -tags represent the variables being derefernece to get to the +tags represent the variables being dereferenced to get to the assignee.")) "Analysis class for a value in an assignment.") @@ -235,7 +235,7 @@ it is not found in the global set of tables. Optional argument SCOPE are additional terminals to search which are currently scoped. These are not local variables, but symbols available in a structure -which doesn't need to be dereferneced. +which doesn't need to be dereferenced. Optional argument TYPERETURN is a symbol in which the types of all found will be stored. If nil, that data is thrown away. Optional argument THROWSYM specifies a symbol the throw on non-recoverable error.") @@ -345,8 +345,8 @@ (defun semantic-analyze-find-tag (name &optional tagclass scope) "Return the first tag found with NAME or nil if not found. -Optional argument TAGCLASS specifies the class of tag to return, such -as 'function or 'variable. +Optional argument TAGCLASS specifies the class of tag to return, +such as 'function or 'variable. Optional argument SCOPE specifies a scope object which has additional tags which are in SCOPE and do not need prefixing to find.
--- a/lisp/cedet/semantic/bovine/c.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/bovine/c.el Tue Jan 12 08:54:18 2010 +0100 @@ -74,7 +74,7 @@ (defcustom-mode-local-semantic-dependency-system-include-path c-mode semantic-c-dependency-system-include-path '("/usr/include") - "The system include path used by the C langauge.") + "The system include path used by the C language.") (defcustom semantic-default-c-path nil "Default set of include paths for C code. @@ -207,7 +207,7 @@ ) (defcustom semantic-c-member-of-autocast 't - "Non-nil means classes with a '->' operator will cast to it's return type. + "Non-nil means classes with a '->' operator will cast to its return type. For Examples: @@ -444,7 +444,7 @@ the second namespace in use, then it should not be included. If you are having problems with smart completion and STL templates, -it may that this is set incorrectly. After changing the value +it may be that this is set incorrectly. After changing the value of this flag, you will need to delete any semanticdb cache files that may have been incorrectly parsed." :group 'semantic @@ -620,7 +620,7 @@ (define-mode-local-override semantic-parse-region c-mode (start end &optional nonterminal depth returnonerror) - "Calls 'semantic-parse-region-default', except in a macro expansion. + "Calls `semantic-parse-region-default', except in a macro expansion. MACRO expansion mode is handled through the nature of Emacs's non-lexical binding of variables. START, END, NONTERMINAL, DEPTH, and RETURNONERRORS are the same @@ -713,7 +713,7 @@ (funcall mode) (error (if (y-or-n-p - (format "There was an error initializing %s in buffer \"%s\". Debug your hooks? " + (format "There was an error initializing %s in buffer \"%s\". Debug your hooks? " mode (buffer-name))) (semantic-c-debug-mode-init mode) (message "Macro parsing state may be broken...") @@ -781,9 +781,9 @@ (switch-to-buffer-other-window (get-buffer-create "*MODE HACK TEST*")) (erase-buffer) - (insert "A failure occured while parsing your buffers. + (insert "A failure occurred while parsing your buffers. -The failure occured while attempting to initialize " (symbol-name mm) " in a +The failure occurred while attempting to initialize " (symbol-name mm) " in a buffer not associated with a file. To debug this problem, type M-x semantic-c-debug-mode-init @@ -967,7 +967,7 @@ "At parse time, assign a class or struct name text here. It is picked up by `semantic-c-reconstitute-token' to determine if something is a constructor. Value should be: - ( TYPENAME . TYPEOFTYPE) + (TYPENAME . TYPEOFTYPE) where typename is the name of the type, and typeoftype is \"class\" or \"struct\".") @@ -1258,7 +1258,7 @@ (define-mode-local-override semantic-format-tag-uml-prototype c-mode (token &optional parent color) - "Return an uml string describing TOKEN for C and C++. + "Return an UML string describing TOKEN for C and C++. Optional PARENT and COLOR as specified with `semantic-abbreviate-tag-default'." ;; If we have special template things, append. @@ -1381,7 +1381,7 @@ (defun semantic-c-dereference-namespace (type scope &optional type-declaration) "Dereference namespace which might hold an 'alias' for TYPE. Such an alias can be created through 'using' statements in a -namespace declaration. This function checks the namespaces in +namespace declaration. This function checks the namespaces in SCOPE for such statements." (let ((scopetypes (oref scope scopetypes)) typename currentns tmp usingname result namespaces) @@ -1518,7 +1518,7 @@ (list type type-declaration)) (define-mode-local-override semantic-analyze-type-constants c-mode (type) - "When TYPE is a tag for an enum, return it's parts. + "When TYPE is a tag for an enum, return its parts. These are constants which are of type TYPE." (if (and (eq (semantic-tag-class type) 'type) (string= (semantic-tag-type type) "enum")) @@ -1618,7 +1618,7 @@ (semantic-idle-summary-current-symbol-info-default)))) (defvar-mode-local c-mode semantic-orphaned-member-metaparent-type "struct" - "When lost memberes are found in the class hierarchy generator, use a struct.") + "When lost members are found in the class hierarchy generator, use a struct.") (defvar-mode-local c-mode semantic-symbol->name-assoc-list '((type . "Types") @@ -1644,7 +1644,7 @@ "Separator characters between something of a given type, and a field.") (defvar-mode-local c-mode semantic-command-separation-character ";" - "Commen separation character for C") + "Command separation character for C.") (defvar-mode-local c-mode senator-step-at-tag-classes '(function variable) "Tag classes where senator will stop at the end.")
--- a/lisp/cedet/semantic/bovine/el.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/bovine/el.el Tue Jan 12 08:54:18 2010 +0100 @@ -139,7 +139,7 @@ (nreverse vars))) (defun semantic-elisp-form-to-doc-string (form) - "After reading a form FORM, covert it to a doc string. + "After reading a form FORM, convert it to a doc string. For Emacs Lisp, sometimes that string is non-existent. Sometimes it is a form which is evaluated at compile time, permitting compound strings." @@ -494,7 +494,7 @@ "")) (defun semantic-emacs-lisp-obsoleted-doc (tag) - "Indicate that TAG is a new name that has obsoleted some old name. + "Indicate that TAG is a new name that has obsoleted some old name. Unfortunately, this requires that the tag in question has been loaded into Emacs Lisp's memory." (let ((obsoletethis (intern-soft (semantic-tag-name tag))) @@ -600,7 +600,7 @@ (define-mode-local-override semantic-up-context emacs-lisp-mode (&optional point bounds-type) "Move up one context in an Emacs Lisp function. -A Context in many languages is a block with it's own local variables. +A Context in many languages is a block with its own local variables. In Emacs, we will move up lists and stop when one starts with one of the following context specifiers: `let', `let*', `defun', `with-slots' @@ -664,7 +664,7 @@ (define-mode-local-override semantic-get-local-variables emacs-lisp-mode (&optional point) "Return a list of local variables for POINT. -Scan backwards from point at each successive function. For all occurances +Scan backwards from point at each successive function. For all occurrences of `let' or `let*', grab those variable names." (let* ((vars nil) (fn nil)) @@ -723,7 +723,7 @@ (define-mode-local-override semantic-end-of-command emacs-lisp-mode () "Move cursor to the end of the current command. -In emacs lisp this is easilly defined by parenthisis bounding." +In Emacs Lisp this is easily defined by parenthesis bounding." (condition-case nil (up-list 1) (error nil))) @@ -731,7 +731,7 @@ (define-mode-local-override semantic-beginning-of-command emacs-lisp-mode () "Move cursor to the beginning of the current command. -In emacs lisp this is easilly defined by parenthisis bounding." +In Emacs Lisp this is easily defined by parenthesis bounding." (condition-case nil (progn (up-list -1) @@ -824,8 +824,8 @@ (&optional point) "Return a list of tag classes allowed at POINT. Emacs Lisp knows much more about the class of the tag needed to perform -completion than some langauges. We distincly know if we are to be -a function name, variable name, or any type of symbol. We could identify +completion than some languages. We distincly know if we are to be a +function name, variable name, or any type of symbol. We could identify fields and such to, but that is for some other day." (save-excursion (if point (goto-char point)) @@ -939,7 +939,7 @@ ELisp variables can be pretty long, so track this one too.") (define-child-mode lisp-mode emacs-lisp-mode - "Make `lisp-mode' inherits mode local behavior from `emacs-lisp-mode'.") + "Make `lisp-mode' inherit mode local behavior from `emacs-lisp-mode'.") (defun semantic-default-elisp-setup () "Setup hook function for Emacs Lisp files and Semantic."
--- a/lisp/cedet/semantic/bovine/make.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/bovine/make.el Tue Jan 12 08:54:18 2010 +0100 @@ -204,7 +204,7 @@ (defcustom-mode-local-semantic-dependency-system-include-path makefile-mode semantic-makefile-dependency-system-include-path nil - "The system include path used by Makefiles langauge.") + "The system include path used by Makefiles language.") ;;;###autoload (defun semantic-default-make-setup ()
--- a/lisp/cedet/semantic/java.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/java.el Tue Jan 12 08:54:18 2010 +0100 @@ -149,7 +149,7 @@ java-mode semantic-java-dependency-system-include-path ;; @todo - Use JDEE to get at the include path, or something else? nil - "The system include path used by Java langauge.") + "The system include path used by Java language.") ;; Local context ;; @@ -239,7 +239,7 @@ ;; Thanks Bruce Stephens (define-mode-local-override semantic-tag-include-filename java-mode (tag) - "Return a suitable path for (some) Java imports" + "Return a suitable path for (some) Java imports." (let ((name (semantic-tag-name tag))) (concat (mapconcat 'identity (split-string name "\\.") "/") ".java"))) @@ -371,9 +371,9 @@ (defun semantic-java-doc-keywords-map (fun &optional property) "Run function FUN for each javadoc keyword. Return the list of FUN results. If optional PROPERTY is non nil only -call FUN for javadoc keyword which have a value for PROPERTY. FUN +call FUN for javadoc keywords which have a value for PROPERTY. FUN receives two arguments: the javadoc keyword and its associated -'javadoc property list. It can return any value. Nil values are +'javadoc property list. It can return any value. All nil values are removed from the result list." (delq nil (mapcar
--- a/lisp/cedet/semantic/wisent/python-wy.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/wisent/python-wy.el Tue Jan 12 08:54:18 2010 +0100 @@ -79,16 +79,16 @@ ("global" summary "Declare one or more symbols as global symbols") ("from" summary "Modify behavior of 'import' statement") ("for" summary "Start a 'for' loop") - ("finally" summary "Specify code to be executed after 'try' statements whether or not an exception occured") - ("exec" summary "Dynamically execute python code") + ("finally" summary "Specify code to be executed after 'try' statements whether or not an exception occurred") + ("exec" summary "Dynamically execute Python code") ("except" summary "Specify exception handlers along with 'try' keyword") ("else" summary "Start the 'else' clause following an 'if' statement") ("elif" summary "Shorthand for 'else if' following an 'if' statement") ("del" summary "Delete specified objects, i.e., undo what assignment did") ("def" summary "Define a new function") - ("continue" summary "Skip to the next interation of enclosing for or whilte loop") + ("continue" summary "Skip to the next interation of enclosing 'for' or 'while' loop") ("class" summary "Define a new class") - ("break" summary "Terminate 'for' or 'while loop") + ("break" summary "Terminate 'for' or 'while' loop") ("assert" summary "Raise AssertionError exception if <expr> is false") ("and" summary "Logical AND binary operator ... "))) "Table of language keywords.")
--- a/lisp/cedet/semantic/wisent/python.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/semantic/wisent/python.el Tue Jan 12 08:54:18 2010 +0100 @@ -48,19 +48,19 @@ (defconst wisent-python-string-re (concat (regexp-opt '("r" "u" "ur" "R" "U" "UR" "Ur" "uR") t) "?['\"]") - "Regexp matching beginning of a python string.") + "Regexp matching beginning of a Python string.") (defvar wisent-python-EXPANDING-block nil "Non-nil when expanding a paren block for Python lexical analyzer.") (defun wisent-python-implicit-line-joining-p () "Return non-nil if implicit line joining is active. -That is, if inside an expressions in parentheses, square brackets or +That is, if inside an expression in parentheses, square brackets or curly braces." wisent-python-EXPANDING-block) (defsubst wisent-python-forward-string () - "Move point at the end of the python string at point." + "Move point at the end of the Python string at point." (when (looking-at wisent-python-string-re) ;; skip the prefix (and (match-end 1) (goto-char (match-end 1))) @@ -145,7 +145,7 @@ (defvar wisent-python-indent-stack) (define-lex-analyzer wisent-python-lex-beginning-of-line - "Detect and create python indentation tokens at beginning of line." + "Detect and create Python indentation tokens at beginning of line." (and (bolp) (not (wisent-python-implicit-line-joining-p)) (let ((last-indent (car wisent-python-indent-stack)) @@ -201,7 +201,7 @@ ) (define-lex-regex-analyzer wisent-python-lex-end-of-line - "Detect and create python newline tokens. + "Detect and create Python newline tokens. Just skip the newline character if the following line is an implicit continuation of current line." "\\(\n\\|\\s>\\)" @@ -256,11 +256,11 @@ ;; (define-mode-local-override semantic-lex python-mode (start end &optional depth length) - "Lexically analyze python code in current buffer. + "Lexically analyze Python code in current buffer. See the function `semantic-lex' for the meaning of the START, END, DEPTH and LENGTH arguments. This function calls `wisent-python-lexer' to actually perform the -lexical analysis, then emits the necessary python DEDENT tokens from +lexical analysis, then emits the necessary Python DEDENT tokens from what remains in the `wisent-python-indent-stack'." (let* ((wisent-python-indent-stack (list 0)) (stream (wisent-python-lexer start end depth length)) @@ -272,13 +272,13 @@ (define-mode-local-override semantic-get-local-variables python-mode () "Get the local variables based on point's context. -To be implemented for python! For now just return nil." +To be implemented for Python! For now just return nil." nil) (defcustom-mode-local-semantic-dependency-system-include-path python-mode semantic-python-dependency-system-include-path nil - "The system include path used by Python langauge.") + "The system include path used by Python language.") ;;; Enable Semantic in `python-mode'. ;;
--- a/lisp/cedet/srecode/extract.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/cedet/srecode/extract.el Tue Jan 12 08:54:18 2010 +0100 @@ -56,7 +56,7 @@ "The current extraction state.") (defmethod srecode-extract-state-set ((st srecode-extract-state) ins dict) - "Set onto the extract state ST a new inserter INS and dictinary DICT." + "Set onto the extract state ST a new inserter INS and dictionary DICT." (oset st lastinserter ins) (oset st lastdict dict)) @@ -98,7 +98,7 @@ state) "Extract template ST and store extracted text in DICTIONARY. Optional STARTRETURN is a symbol in which the start of the first -plain-text match occured." +plain-text match occurred." (srecode-extract-code-stream (oref st code) dictionary state)) (defun srecode-extract-code-stream (code dictionary state)
--- a/lisp/ffap.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/ffap.el Tue Jan 12 08:54:18 2010 +0100 @@ -130,7 +130,7 @@ ;; after them. The common root shell prompt (#) is not listed since it ;; also doubles up as a valid URL character. "[$%><]*" - "Paths matching this regexp are stripped off the shell prompt + "Paths matching this regexp are stripped off the shell prompt. If nil, ffap doesn't do shell prompt stripping." :type '(choice (const :tag "Disable" nil) (const :tag "Standard" "[$%><]*") @@ -184,7 +184,7 @@ "\\(ftp\\|https?\\|telnet\\|gopher\\|www\\|wais\\)://" ; needs host "\\)." ; require one more character ) - "Regexp matching URL's. nil to disable URL features in ffap.") + "Regexp matching URLs. Use nil to disable URL features in ffap.") (defcustom ffap-foo-at-bar-prefix "mailto" "Presumed URL prefix type of strings like \"<foo.9z@bar>\". @@ -600,7 +600,7 @@ ret))) (defsubst ffap-url-p (string) - "If STRING looks like an url, return it (maybe improved), else nil." + "If STRING looks like an URL, return it (maybe improved), else nil." (let ((case-fold-search t)) (and ffap-url-regexp (string-match ffap-url-regexp string) ;; I lied, no improvement: @@ -681,7 +681,7 @@ (nreverse ret))) (defun ffap-all-subdirs (dir &optional depth) - "Return list all subdirectories under DIR, starting with itself. + "Return list of all subdirectories under DIR, starting with itself. Directories beginning with \".\" are ignored, and directory symlinks are listed but never searched (to avoid loops). Optional DEPTH limits search depth." @@ -794,12 +794,12 @@ (dired-mode . ffap-dired) ; maybe in a subdirectory ) "Alist of \(KEY . FUNCTION\) pairs parsed by `ffap-file-at-point'. -If string NAME at point (maybe \"\") is not a file or url, these pairs +If string NAME at point (maybe \"\") is not a file or URL, these pairs specify actions to try creating such a string. A pair matches if either KEY is a symbol, and it equals `major-mode', or - KEY is a string, it should matches NAME as a regexp. + KEY is a string, it should match NAME as a regexp. On a match, \(FUNCTION NAME\) is called and should return a file, an -url, or nil. If nil, search the alist for further matches.") +URL, or nil. If nil, search the alist for further matches.") (put 'ffap-alist 'risky-local-variable t) @@ -864,7 +864,7 @@ (defvar ffap-tex-path t ; delayed initialization - "Path where `ffap-tex-mode' looks for tex files. + "Path where `ffap-tex-mode' looks for TeX files. If t, `ffap-tex-init' will initialize this when needed.") (defun ffap-tex-init () @@ -1057,7 +1057,7 @@ (declare-function w3-view-this-url "ext:w3" (&optional no-show)) (defun ffap-url-at-point () - "Return url from around point if it exists, or nil." + "Return URL from around point if it exists, or nil." ;; Could use w3's url-get-url-at-point instead. Both handle "URL:", ;; ignore non-relative links, trim punctuation. The other will ;; actually look back if point is in whitespace, but I would rather @@ -1097,11 +1097,11 @@ (defvar ffap-gopher-regexp "^.*\\<\\(Type\\|Name\\|Path\\|Host\\|Port\\) *= *\\(.*\\) *$" - "Regexp Matching a line in a gopher bookmark (maybe indented). + "Regexp matching a line in a gopher bookmark (maybe indented). The two subexpressions are the KEY and VALUE.") (defun ffap-gopher-at-point () - "If point is inside a gopher bookmark block, return its url." + "If point is inside a gopher bookmark block, return its URL." ;; `gopher-parse-bookmark' from gopher.el is not so robust (save-excursion (beginning-of-line) @@ -1144,7 +1144,7 @@ "Return filename from around point if it exists, or nil. Existence test is skipped for names that look remote. If the filename is not obvious, it also tries `ffap-alist', -which may actually result in an url rather than a filename." +which may actually result in an URL rather than a filename." ;; Note: this function does not need to look for url's, just ;; filenames. On the other hand, it is responsible for converting ;; a pseudo-url "site.com://dir" to an ftp file name @@ -1260,7 +1260,7 @@ ;; contents before attempting to complete filenames. (defun ffap-read-file-or-url (prompt guess) - "Read file or url from minibuffer, with PROMPT and initial GUESS." + "Read file or URL from minibuffer, with PROMPT and initial GUESS." (or guess (setq guess default-directory)) (let (dir) ;; Tricky: guess may have or be a local directory, like "w3/w3.elc" @@ -1302,7 +1302,7 @@ guess)) (defun ffap-read-url-internal (string pred action) - "Complete url's from history, treating given string as valid." + "Complete URLs from history, treating given string as valid." (let ((hist (ffap-symbol-value 'url-global-history-hash-table))) (cond ((not action) @@ -1475,7 +1475,7 @@ ;;;###autoload (defun ffap-menu (&optional rescan) - "Put up a menu of files and urls mentioned in this buffer. + "Put up a menu of files and URLs mentioned in this buffer. Then set mark, jump to choice, and try to fetch it. The menu is cached in `ffap-menu-alist', and rebuilt by `ffap-menu-rescan'. The optional RESCAN argument \(a prefix, interactively\) forces @@ -1601,7 +1601,7 @@ ;;;###autoload (defun ffap-at-mouse (e) - "Find file or url guessed from text around mouse click. + "Find file or URL guessed from text around mouse click. Interactively, calls `ffap-at-mouse-fallback' if no guess is found. Return value: * if a guess string is found, return it (after finding it) @@ -1629,7 +1629,7 @@ ((called-interactively-p 'interactive) (if ffap-at-mouse-fallback (call-interactively ffap-at-mouse-fallback) - (message "No file or url found at mouse click.") + (message "No file or URL found at mouse click.") nil)) ; no fallback, return nil ;; failure: return nil )))
--- a/lisp/htmlfontify.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/htmlfontify.el Tue Jan 12 08:54:18 2010 +0100 @@ -107,19 +107,19 @@ (autoload 'htmlfontify-load-rgb-file "hfy-cmap" - "Load an rgb.txt file for colour name -> rgb translation purposes." + "Load an rgb.txt file for color name -> rgb translation purposes." 'interactive) (autoload 'htmlfontify-unload-rgb-file "hfy-cmap" - "Unload the current colour name -> rgb translation map." + "Unload the current color name -> rgb translation map." 'interactive) (autoload 'hfy-fallback-colour-values "hfy-cmap" - "Use a fallback method for obtaining the rgb values for a colour." + "Use a fallback method for obtaining the rgb values for a color." 'interactive) ) @@ -131,8 +131,8 @@ "The generator meta tag for this version of htmlfontify.") (defconst htmlfontify-manual "Htmlfontify Manual" - "Copy and convert buffers and files to html, adding hyperlinks between files -\(driven by etags\) if requested. + "Copy and convert buffers and files to HTML, adding hyperlinks between files +\(driven by etags) if requested. \nInteractive functions: `htmlfontify-buffer' `htmlfontify-run-etags' @@ -144,50 +144,50 @@ prepare the etags map for a directory: M-x htmlfontify-run-etags copy a directory, fontifying as you go: M-x htmlfontify-copy-and-link-dir\n The following might be useful when running non-windowed or in batch mode: -\(note that they shouldn't be necessary - we have a built in map\)\n +\(note that they shouldn't be necessary - we have a built in map)\n load an X11 style rgb.txt file: M-x htmlfontify-load-rgb-file unload the current rgb.txt file: M-x htmlfontify-unload-rgb-file\n And here's a programmatic example:\n -\(defun rtfm-build-page-header \(file style\) - \(format \"#define TEMPLATE red+black.html +\(defun rtfm-build-page-header (file style) + (format \"#define TEMPLATE red+black.html #define DEBUG 1 #include <build/menu-dirlist|>\\n html-css-url := /css/red+black.css -title := rtfm.etla.org \( %s / src/%s \) +title := rtfm.etla.org ( %s / src/%s ) bodytag := head <=STYLESHEET;\\n %s STYLESHEET main-title := rtfm / %s / src/%s\\n -main-content <=MAIN_CONTENT;\\n\" rtfm-section file style rtfm-section file\)\) +main-content <=MAIN_CONTENT;\\n\" rtfm-section file style rtfm-section file)) -\(defun rtfm-build-page-footer \(file\) \"\\nMAIN_CONTENT\\n\"\) +\(defun rtfm-build-page-footer (file) \"\\nMAIN_CONTENT\\n\") -\(defun rtfm-build-source-docs \(section srcdir destdir\) - \(interactive - \"s section[eg- emacs / p4-blame]:\\nD source-dir: \\nD output-dir: \"\) - \(require 'htmlfontify\) - \(hfy-load-tags-cache srcdir\) - \(let \(\(hfy-page-header 'rtfm-build-page-header\) - \(hfy-page-footer 'rtfm-build-page-footer\) - \(rtfm-section section\) - \(hfy-index-file \"index\"\)\) - \(htmlfontify-run-etags srcdir\) - \(htmlfontify-copy-and-link-dir srcdir destdir \".src\" \".html\"\)\)\)") +\(defun rtfm-build-source-docs (section srcdir destdir) + (interactive + \"s section[eg- emacs / p4-blame]:\\nD source-dir: \\nD output-dir: \") + (require 'htmlfontify) + (hfy-load-tags-cache srcdir) + (let ((hfy-page-header 'rtfm-build-page-header) + (hfy-page-footer 'rtfm-build-page-footer) + (rtfm-section section) + (hfy-index-file \"index\")) + (htmlfontify-run-etags srcdir) + (htmlfontify-copy-and-link-dir srcdir destdir \".src\" \".html\")))") (defgroup htmlfontify nil - "Copy and convert buffers and files to html, adding hyperlinks between -files \(driven by etags\) if requested.\n -See: `htmlfontify-manual'" + "Copy and convert buffers and files to HTML, adding hyperlinks between +files (driven by etags) if requested.\n +See also `htmlfontify-manual'." :group 'applications :prefix "hfy-") (defcustom hfy-page-header 'hfy-default-header - "Function called with two arguments \(the filename relative to the top -level source directory being etag\'d and fontified), and a string containing + "Function called with two arguments (the filename relative to the top +level source directory being etag'd and fontified), and a string containing the <style>...</style> text to embed in the document- the string returned will be used as the header for the htmlfontified version of the source file.\n -See also: `hfy-page-footer'" +See also `hfy-page-footer'." :group 'htmlfontify ;; FIXME: Why place such a :tag everywhere? Isn't it imposing your ;; own Custom preference on your users? --Stef @@ -204,7 +204,7 @@ (defcustom hfy-page-footer 'hfy-default-footer "As `hfy-page-header', but generates the output footer -\(and takes only 1 argument, the filename\)." +\(and takes only one argument, the filename)." :group 'htmlfontify :tag "page-footer" :type '(function)) @@ -216,29 +216,29 @@ :type '(string)) (defcustom hfy-src-doc-link-style "text-decoration: underline;" - "String to add to the \'<style> a\' variant of an htmlfontify css class." + "String to add to the '<style> a' variant of an htmlfontify CSS class." :group 'htmlfontify :tag "src-doc-link-style" :type '(string)) (defcustom hfy-src-doc-link-unstyle " text-decoration: none;" - "Regex to remove from the <style> a variant of an htmlfontify css class." + "Regex to remove from the <style> a variant of an htmlfontify CSS class." :group 'htmlfontify :tag "src-doc-link-unstyle" :type '(string)) (defcustom hfy-link-extn nil - "File extension used for href links - Useful where the htmlfontify -output files are going to be processed again, with a resulting change -in file extension. If nil, then any code using this should fall back -to `hfy-extn'." + "File extension used for href links. +Useful where the htmlfontify output files are going to be processed +again, with a resulting change in file extension. If nil, then any +code using this should fall back to `hfy-extn'." :group 'htmlfontify :tag "link-extension" :type '(choice string (const nil))) (defcustom hfy-link-style-fun 'hfy-link-style-string "Set this to a function, which will be called with one argument -\(a \"{ foo: bar; ...}\" css style-string\) - it should return a copy of +\(a \"{ foo: bar; ...}\" CSS style-string) - it should return a copy of its argument, altered so as to make any changes you want made for text which is a hyperlink, in addition to being in the class to which that style would normally be applied." @@ -246,23 +246,23 @@ :tag "link-style-function" :type '(function)) -(defcustom hfy-index-file "hfy-index" - "Name \(sans extension\) of the tag definition index file produced during +(defcustom hfy-index-file "hfy-index" + "Name (sans extension) of the tag definition index file produced during fontification-and-hyperlinking." :group 'htmlfontify :tag "index-file" :type '(string)) -(defcustom hfy-instance-file "hfy-instance" - "Name \(sans extension\) of the tag usage index file produced during +(defcustom hfy-instance-file "hfy-instance" + "Name (sans extension) of the tag usage index file produced during fontification-and-hyperlinking." :group 'htmlfontify :tag "instance-file" :type '(string)) (defcustom hfy-html-quote-regex "\\(<\\|\"\\|&\\|>\\)" - "Regex to match \(with a single back-reference per match\) strings in HTML -which should be quoted with `hfy-html-quote' \(and `hfy-html-quote-map'\) + "Regex to match (with a single back-reference per match) strings in HTML +which should be quoted with `hfy-html-quote' (and `hfy-html-quote-map') to make them safe." :group 'htmlfontify :tag "html-quote-regex" @@ -271,28 +271,28 @@ (define-obsolete-variable-alias 'hfy-init-kludge-hooks 'hfy-init-kludge-hook "23.2") (defcustom hfy-init-kludge-hook '(hfy-kludge-cperl-mode) - "List of functions to call when starting htmlfontify-buffer to do any -kludging necessary to get highlighting modes to bahave as you want, even + "List of functions to call when starting `htmlfontify-buffer' to do any +kludging necessary to get highlighting modes to behave as you want, even when not running under a window system." :group 'htmlfontify :tag "init-kludge-hooks" :type '(hook)) (defcustom hfy-post-html-hooks nil - "List of functions to call after creating and filling the html buffer. -These functions will be called with the html buffer as the current buffer" + "List of functions to call after creating and filling the HTML buffer. +These functions will be called with the html buffer as the current buffer." :group 'htmlfontify :tag "post-html-hooks" :options '(set-auto-mode) :type '(hook)) (defcustom hfy-default-face-def nil - "Fallback `defface' specification for the face \'default, used when -`hfy-display-class' has been set \(the normal htmlfontify way of extracting -potentially non-current face information doesn\'t necessarily work for -\'default\).\n -Example: I customise this to:\n -\(\(t :background \"black\" :foreground \"white\" :family \"misc-fixed\"\)\)" + "Fallback `defface' specification for the face 'default, used when +`hfy-display-class' has been set (the normal htmlfontify way of extracting +potentially non-current face information doesn't necessarily work for +'default).\n +Example: I customize this to:\n +\((t :background \"black\" :foreground \"white\" :family \"misc-fixed\"))" :group 'htmlfontify :tag "default-face-definition" :type '(alist)) @@ -306,7 +306,7 @@ in order, to:\n 1 - The tag 2 - The line - 3 - The char \(point\) at which the tag occurs." + 3 - The char (point) at which the tag occurs." :group 'htmlfontify :tag "etag-regex" :type '(regexp)) @@ -315,7 +315,7 @@ ("<" "<" ) ("&" "&" ) (">" ">" )) - "Alist of char -> entity mappings used to make the text html-safe." + "Alist of char -> entity mappings used to make the text HTML-safe." :group 'htmlfontify :tag "html-quote-map" :type '(alist :key-type (string))) @@ -358,13 +358,13 @@ (defcustom hfy-etags-cmd-alist hfy-etags-cmd-alist-default "Alist of possible shell commands that will generate etags output that -`htmlfontify' can use. \'%s\' will be replaced by `hfy-etags-bin'." +`htmlfontify' can use. '%s' will be replaced by `hfy-etags-bin'." :group 'htmlfontify :tag "etags-cmd-alist" :type '(alist :key-type (string) :value-type (string)) )) (defcustom hfy-etags-bin "etags" - "Location of etags binary (we begin by assuming it\'s in your path).\n + "Location of etags binary (we begin by assuming it's in your path).\n Note that if etags is not in your path, you will need to alter the shell commands in `hfy-etags-cmd-alist'." :group 'htmlfontify @@ -377,20 +377,20 @@ :tag "shell-file-name" :type '(file)) -(defcustom hfy-ignored-properties '(read-only +(defcustom hfy-ignored-properties '(read-only intangible modification-hooks insert-in-front-hooks insert-behind-hooks point-entered point-left) - "Properties to omit when copying a fontified buffer for html transformation." + "Properties to omit when copying a fontified buffer for HTML transformation." :group 'htmlfontify :tag "ignored-properties" :type '(repeat symbol)) (defun hfy-which-etags () - "Return a string indicating which flavour of etags we are using." + "Return a string indicating which flavour of etags we are using." (let ((v (shell-command-to-string (concat hfy-etags-bin " --version")))) (cond ((string-match "exube" v) "exuberant ctags") ((string-match "GNU E" v) "emacs etags" )) )) @@ -400,8 +400,8 @@ "The etags equivalent command to run in a source directory to generate a tags file for the whole source tree from there on down. The command should emit the etags output on stdout.\n -Two canned commands are provided - they drive Emacs\' etags and -exuberant-ctags\' etags respectively." +Two canned commands are provided - they drive Emacs' etags and +exuberant-ctags' etags respectively." :group 'htmlfontify :tag "etags-command" :type (eval-and-compile @@ -412,8 +412,8 @@ (defcustom hfy-istext-command "file %s | sed -e 's@^[^:]*:[ \t]*@@'" "Command to run with the name of a file, to see whether it is a text file -or not. The command should emit a string containing the word \'text\' if -the file is a text file, and a string not containing \'text\' otherwise." +or not. The command should emit a string containing the word 'text' if +the file is a text file, and a string not containing 'text' otherwise." :group 'htmlfontify :tag "istext-command" :type '(string)) @@ -427,27 +427,27 @@ (defcustom hfy-display-class nil "Display class to use to determine which display class to use when -calculating a face\'s attributes. This is useful when, for example, you +calculating a face's attributes. This is useful when, for example, you are running Emacs on a tty or in batch mode, and want htmlfontify to have access to the face spec you would use if you were connected to an X display.\n Some valid class specification elements are:\n - \'\(class color\) - \'\(class grayscale\) - \'\(background dark\) - \'\(background light\) - \'\(type x-toolkit\) - \'\(type tty\) - \'\(type motif\) - \'\(type lucid\) + '(class color) + '(class grayscale) + '(background dark) + '(background light) + '(type x-toolkit) + '(type tty) + '(type motif) + '(type lucid) Multiple values for a tag may be combined, to indicate that any one or more of these values in the specification key constitutes a match, eg:\n -\'\(\(class color grayscale\) \(type tty\)\) would match any of:\n - \'\(\(class color\)\) - \'\(\(class grayscale\)\) - \'\(\(class color grayscale\)\)\) - \'\(\(class color foo\)\) - \'\(\(type tty\)\) - \'\(\(type tty\) \(class color\)\)\n +'((class color grayscale) (type tty)) would match any of:\n + '((class color)) + '((class grayscale)) + '((class color grayscale)) + '((class color foo)) + '((type tty)) + '((type tty) (class color))\n and so on." :type '(alist :key-type (symbol) :value-type (symbol)) :group 'htmlfontify @@ -464,7 +464,7 @@ (const :tag "Bright" light ))) )) (defcustom hfy-optimisations (list 'keep-overlays) - "Optimisations to turn on: So far, the following have been implemented:\n + "Optimizations to turn on: So far, the following have been implemented:\n merge-adjacent-tags: If two (or more) span tags are adjacent, identical and separated by nothing more than whitespace, they will be merged into one span. @@ -472,15 +472,15 @@ zap-string-links : Suppress hyperlinking of tags found in strings. div-wrapper : Add <div class=\"default\"> </div> tags around the output. - keep-overlays : More of a bell \(or possibly whistle\) than an - optimisation - If on, preserve overlay highlighting - \(cf ediff or goo-font-lock\) as well as basic faces\n + keep-overlays : More of a bell (or possibly whistle) than an + optimization - If on, preserve overlay highlighting + (cf ediff or goo-font-lock) as well as basic faces.\n And the following are planned but not yet available:\n kill-context-leak : Suppress hyperlinking between files highlighted by different modes.\n -Note: like compiler optimisations, these optimise the _output_ of the code, +Note: like compiler optimizations, these optimize the _output_ of the code, not the processing of the source itself, and are therefore likely to slow -htmlfontify down, at least a little. Except for skip-refontification, +htmlfontify down, at least a little. Except for skip-refontification, which can never slow you down, but may result in incomplete fontification." :type '(set (const :tag "merge-adjacent-tags" merge-adjacent-tags ) (const :tag "zap-comment-links" zap-comment-links ) @@ -490,86 +490,86 @@ (const :tag "div-wrapper" div-wrapper ) (const :tag "keep-overlays" keep-overlays )) :group 'htmlfontify - :tag "optimisations") + :tag "optimizations") -(defvar hfy-tags-cache nil +(defvar hfy-tags-cache nil "Alist of the form:\n -\(\(\"/src/dir/0\" . tag-hash0\) \(\"/src/dir/1\" tag-hash1\) ...\)\n -Each tag hash entry then contains entries of the form:\n +\((\"/src/dir/0\" . tag-hash0) (\"/src/dir/1\" tag-hash1) ...)\n +Each tag hash entry then contains entries of the form:\n \"tag_string\" => ((\"file/name.ext\" line char) ... )\n -ie an alist mapping \(relative\) file paths to line and character offsets.\n -See `hfy-load-tags-cache'.") +ie an alist mapping (relative) file paths to line and character offsets.\n +See also `hfy-load-tags-cache'.") -(defvar hfy-tags-sortl nil - "Alist of the form \(\(\"/src/dir\" . (tag0 tag1 tag2)\) ... \)\n -Where the tags are stored in descending order of length.\n -See `hfy-load-tags-cache'.") +(defvar hfy-tags-sortl nil + "Alist of the form ((\"/src/dir\" . (tag0 tag1 tag2)) ... )\n +where the tags are stored in descending order of length.\n +See also `hfy-load-tags-cache'.") -(defvar hfy-tags-rmap nil - "Alist of the form \(\(\"/src/dir\" . tag-rmap-hash\)\)\n -Where tag-rmap-hash has entries of the form: +(defvar hfy-tags-rmap nil + "Alist of the form ((\"/src/dir\" . tag-rmap-hash))\n +where tag-rmap-hash has entries of the form: \"tag_string\" => ( \"file/name.ext\" line char ) Unlike `hfy-tags-cache' these are the locations of occurrences of tagged items, not the locations of their definitions.") (defvar hfy-style-assoc 'please-ignore-this-line "An assoc representing/describing an Emacs face. -Properties may be repeated, In which case later properties should be -treated as if they were inherited from a \'parent\' font. +Properties may be repeated, in which case later properties should be +treated as if they were inherited from a 'parent' font. \(For some properties, only the first encountered value is of any importance, for others the values might be cumulative, and for others they might be -cumulative in a complex way).\n +cumulative in a complex way.)\n Some examples:\n -\(hfy-face-to-style 'default\) => - \(\(\"background\" . \"rgb\(0, 0, 0\)\"\) - \(\"color\" . \"rgb\(255, 255, 255\)\"\) - \(\"font-style\" . \"normal\"\) - \(\"font-weight\" . \"500\"\) - \(\"font-stretch\" . \"normal\"\) - \(\"font-family\" . \"misc-fixed\"\) - \(\"font-size\" . \"13pt\"\) - \(\"text-decoration\" . \"none\"\)\)\n -\(hfy-face-to-style 'Info-title-3-face\) => - \(\(\"font-weight\" . \"700\"\) - \(\"font-family\" . \"helv\"\) - \(\"font-size\" . \"120%\"\) - \(\"text-decoration\" . \"none\"\)\)\n") +\(hfy-face-to-style 'default) => + ((\"background\" . \"rgb(0, 0, 0)\") + (\"color\" . \"rgb(255, 255, 255)\") + (\"font-style\" . \"normal\") + (\"font-weight\" . \"500\") + (\"font-stretch\" . \"normal\") + (\"font-family\" . \"misc-fixed\") + (\"font-size\" . \"13pt\") + (\"text-decoration\" . \"none\"))\n +\(hfy-face-to-style 'Info-title-3-face) => + ((\"font-weight\" . \"700\") + (\"font-family\" . \"helv\") + (\"font-size\" . \"120%\") + (\"text-decoration\" . \"none\"))\n") (defvar hfy-sheet-assoc 'please-ignore-this-line - "An assoc with elements of the form (face-name style-name . stlye-string):\n -'\(\(default \"default\" . \"{background: black;color: white}\"\) - \(font-lock-string-face \"string\" . \"{color: rgb\(64,224,208\)}\"\)\)" ) + "An assoc with elements of the form (face-name style-name . style-string):\n +'((default \"default\" . \"{background: black; color: white}\") + (font-lock-string-face \"string\" . \"{color: rgb(64,224,208)}\"))" ) (defvar hfy-facemap-assoc 'please-ignore-this-line - "An assoc of \(point . FACE-SYMBOL\) or \(point . DEFFACE-LIST\) + "An assoc of (point . FACE-SYMBOL) or (point . DEFFACE-LIST) and (point . 'end) elements, in descending order of point value -\(ie from the file's end to its beginning\).\n -The map is in reverse order because inserting a <style> tag \(or any other -string) at POINT invalidates the map for all entries with a greater value of -point. By traversing the map from greatest to least POINT, we still invalidate -the map as we go, but only those points we have already dealt with \( and -therefore no longer care about \) will be invalid at any time.\n -'\(\(64820 . end\) - \(64744 . font-lock-comment-face\) - \(64736 . end\) - \(64722 . font-lock-string-face\) - \(64630 . end\) - \(64623 . font-lock-string-face\) - \(64449 . end\) - \(64446 . font-lock-keyword-face\) - \(64406 . end\) - \(64395 . font-lock-constant-face\) - \(64393 . end\) - \(64386 . font-lock-keyword-face\) - \(64379 . end\) +\(ie from the file's end to its beginning).\n +The map is in reverse order because inserting a <style> tag (or any other +string) at `point' invalidates the map for all entries with a greater value of +point. By traversing the map from greatest to least point, we still invalidate +the map as we go, but only those points we have already dealt with (and +therefore no longer care about) will be invalid at any time.\n +'((64820 . end) + (64744 . font-lock-comment-face) + (64736 . end) + (64722 . font-lock-string-face) + (64630 . end) + (64623 . font-lock-string-face) + (64449 . end) + (64446 . font-lock-keyword-face) + (64406 . end) + (64395 . font-lock-constant-face) + (64393 . end) + (64386 . font-lock-keyword-face) + (64379 . end) ;; big similar section elided. You get the idea. - \(4285 . font-lock-constant-face\) - \(4285 . end\) - \(4221 . font-lock-comment-face\) - \(4221 . end\) - \(4197 . font-lock-constant-face\) - \(4197 . end\) - \(1 . font-lock-comment-face\)\)") + (4285 . font-lock-constant-face) + (4285 . end) + (4221 . font-lock-comment-face) + (4221 . end) + (4197 . font-lock-constant-face) + (4197 . end) + (1 . font-lock-comment-face))") (defvar hfy-tmpfont-stack nil "An alist of derived fonts resulting from overlays.") @@ -583,7 +583,7 @@ "\\(" hfy-hex-regex hfy-hex-regex "\\)")) (defun hfy-interq (set-a set-b) - "Return the intersection \(using `eq'\) of 2 lists SET-A and SET-B." + "Return the intersection (using `eq') of two lists SET-A and SET-B." (let ((sa set-a) (interq nil) (elt nil)) (while sa (setq elt (car sa) @@ -591,8 +591,8 @@ (if (memq elt set-b) (setq interq (cons elt interq)))) interq)) (defun hfy-colour-vals (colour) - "Where COLOUR is a colour name or #XXXXXX style triplet, return a -list of 3 (16 bit) rgb values for said colour.\n + "Where COLOUR is a color name or #XXXXXX style triplet, return a +list of three (16 bit) rgb values for said color.\n If a window system is unavailable, calls `hfy-fallback-colour-values'." (if (string-match hfy-triplet-regex colour) (mapcar @@ -653,7 +653,7 @@ // whether the current row is odd or even var even = false; - // if arguments are provided to specify the colours + // if arguments are provided to specify the colors // of the even & odd rows, then use the them; // otherwise use the following defaults: var evenColor = arguments[1] ? arguments[1] : \"#fff\"; @@ -739,7 +739,7 @@ "\n </body>\n</html>\n") (defun hfy-link-style-string (style-string) - "Replace the end of a css style declaration STYLE-STRING with the contents + "Replace the end of a CSS style declaration STYLE-STRING with the contents of the variable `hfy-src-doc-link-style', removing text matching the regex `hfy-src-doc-link-unstyle' first, if necessary." ;;(message "hfy-colour-vals");;DBUG @@ -755,11 +755,11 @@ ;; utility functions - cast emacs style specification values into their ;; css2 equivalents: (defun hfy-triplet (colour) - "Takes a COLOUR name \(string\) and return a CSS rgb(R, G, B) triplet string. + "Takes a COLOUR name (string) and return a CSS rgb(R, G, B) triplet string. Uses the definition of \"white\" to map the numbers to the 0-255 range, so -if you\'ve redefined white, \(esp if you've redefined it to have a triplet -member lower than that of the colour you are processing, strange things -may happen\)." +if you've redefined white, (esp. if you've redefined it to have a triplet +member lower than that of the color you are processing) strange things +may happen." ;;(message "hfy-colour-vals");;DBUG (let ((white (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals "white"))) (rgb16 (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals colour)))) @@ -782,7 +782,7 @@ :type 'float :group 'htmlfontify) -(defun hfy-size (height) +(defun hfy-size (height) "Derive a CSS font-size specifier from an Emacs font :height attribute HEIGHT. Does not cope with the case where height is a function to be applied to the height of the underlying font." @@ -794,8 +794,8 @@ ((integerp height) (cons "font-size" (format "%dpt" (/ (* hfy-font-zoom height) 10 )))) )) ) -(defun hfy-slant (slant) - "Derive a font-style css specifier from the Emacs :slant attribute SLANT: +(defun hfy-slant (slant) + "Derive a font-style CSS specifier from the Emacs :slant attribute SLANT: CSS does not define the reverse-* styles, so just maps those to the regular specifiers." (list (cons "font-style" @@ -806,7 +806,7 @@ "normal")))) (defun hfy-weight (weight) - "Derive a font-weight css specifier from an Emacs weight spec symbol WEIGHT." + "Derive a font-weight CSS specifier from an Emacs weight spec symbol WEIGHT." (list (cons "font-weight" (cdr (assq weight '((ultra-bold . "900") (extra-bold . "800") (bold . "700") @@ -816,7 +816,7 @@ (light . "300") (extra-light . "200") (ultra-light . "100"))))))) - + (defun hfy-box-to-border-assoc (spec) (if spec (let ((tag (car spec)) @@ -866,7 +866,7 @@ (defun hfy-combined-face-spec (face) "Return a `defface' style alist of possible specifications for FACE. -Entries resulting from customisation \(`custom-set-faces'\) will take +Entries resulting from customization (`custom-set-faces') will take precedence." (let ((spec nil)) (setq spec (append (or (get face 'saved-face) (list)) @@ -876,19 +876,19 @@ (defun hfy-face-attr-for-class (face &optional class) "Return the face attributes for FACE. -If CLASS is set, it must be a `defface' alist key \[see below\], +If CLASS is set, it must be a `defface' alist key [see below], in which case the first face specification returned by `hfy-combined-face-spec' -which *doesn\'t* clash with CLASS is returned.\n +which *doesn't* clash with CLASS is returned.\n \(A specification with a class of t is considered to match any class you -specify - this matches Emacs\' behaviour when deciding on which face attributes -to use, to the best of my understanding\).\n +specify - this matches Emacs' behavior when deciding on which face attributes +to use, to the best of my understanding).\n If CLASS is nil, then you just get get whatever `face-attr-construct' returns, ie the current specification in effect for FACE.\n -*NOTE* This function forces any face that is not \'default and which has -no :inherit property to inherit from \'default \( this is because \'default +*NOTE*: This function forces any face that is not 'default and which has +no :inherit property to inherit from 'default (this is because 'default is magical in that Emacs' fonts behave as if they inherit implicitly from -\'default, but no such behaviour exists in HTML/CSS \).\n -See `hfy-display-class' for details of valid values for CLASS." +'default, but no such behavior exists in HTML/CSS).\n +See also `hfy-display-class' for details of valid values for CLASS." (let ((face-spec (if class (let ((face-props (hfy-combined-face-spec face)) @@ -975,9 +975,9 @@ ;; :height 98 :width normal :family "outline-courier new") (defun hfy-face-to-style-i (fn) "The guts of `hfy-face-to-style': FN should be a `defface' font spec, -as returned by `face-attr-construct' or `hfy-face-attr-for-class'. Note -that this function does not get font-sizes right if they are based on -inherited modifiers \(via the :inherit\) attribute, and any other +as returned by `face-attr-construct' or `hfy-face-attr-for-class'. +Note that this function does not get font-sizes right if they are based +on inherited modifiers (via the :inherit) attribute, and any other modifiers that are cumulative if they appear multiple times need to be merged by the user - `hfy-flatten-style' should do this." ;;(message "hfy-face-to-style-i");;DBUG @@ -1026,8 +1026,8 @@ (nconc this that parent))) ) (defun hfy-size-to-int (spec) - "Convert SPEC, a css font-size specifier, back to an Emacs :height attribute -value. Used while merging multiple font-size attributes." + "Convert SPEC, a CSS font-size specifier, to an Emacs :height attribute value. +Used while merging multiple font-size attributes." ;;(message "hfy-size-to-int");;DBUG (list (if (string-match "\\([0-9]+\\)\\(%\\|pt\\)" spec) @@ -1044,7 +1044,7 @@ "Take STYLE (see `hfy-face-to-style-i', `hfy-face-to-style') and merge any multiple attributes appropriately. Currently only font-size is merged down to a single occurrence - others may need special handling, but I -haven\'t encountered them yet. Returns a `hfy-style-assoc'." +haven't encountered them yet. Returns a `hfy-style-assoc'." ;;(message "(hfy-flatten-style %S)" style) ;;DBUG (let ((n 0) (m (list 1)) @@ -1062,9 +1062,9 @@ (defun hfy-face-to-style (fn) "Take FN, a font or `defface' style font specification, -\(as returned by `face-attr-construct' or `hfy-face-attr-for-class'\) +\(as returned by `face-attr-construct' or `hfy-face-attr-for-class') and return a `hfy-style-assoc'.\n -See also: `hfy-face-to-style-i', `hfy-flatten-style'." +See also `hfy-face-to-style-i', `hfy-flatten-style'." ;;(message "hfy-face-to-style");;DBUG (let ((face-def (if (facep fn) (hfy-face-attr-for-class fn hfy-display-class) fn)) @@ -1086,7 +1086,7 @@ ;; also handle ephemeral fonts created by overlays, which don't actually ;; have names: (defun hfy-face-or-def-to-name (fn) - "Render a font symbol or `defface' font spec FN into a name \(string\)." + "Render a font symbol or `defface' font spec FN into a name (string)." ;;(message "generating name for %s" fn) (if (not (listp fn)) (format "%s" fn) @@ -1119,9 +1119,9 @@ ;; construct an assoc of (stripped-name . "{ css-stuff-here }") pairs ;; from a face: (defun hfy-face-to-css (fn) - "Take FN, a font or `defface' specification \(cf `face-attr-construct'\) + "Take FN, a font or `defface' specification (cf `face-attr-construct') and return a CSS style specification.\n -See also: `hfy-face-to-style'" +See also `hfy-face-to-style'." ;;(message "hfy-face-to-css");;DBUG (let ((css-list nil) (css-text nil) @@ -1140,7 +1140,7 @@ ;; extract a face from a list of char properties, if there is one: (defun hfy-p-to-face (props) - "Given PROPS, a list of text-properties, return the value of the face + "Given PROPS, a list of text properties, return the value of the face property, or nil." (if props (if (string= (car props) "face") @@ -1152,7 +1152,7 @@ nil)) (defun hfy-p-to-face-lennart (props) - "Given PROPS, a list of text-properties, return the value of the face + "Given PROPS, a list of text properties, return the value of the face property, or nil." (when props (let ((face (plist-get props 'face)) @@ -1230,8 +1230,8 @@ ;; -- v (defun hfy-face-at (p) "Find face in effect at point P. -If overlays are to be considered \(see `hfy-optimisations'\) then this may -return a defface style list of face properties instead of a face symbol." +If overlays are to be considered (see `hfy-optimisations') then this may +return a `defface' style list of face properties instead of a face symbol." ;;(message "hfy-face-at");;DBUG ;; Fix-me: clean up, remove face-name etc ;; not sure why we'd want to remove face-name? -- v @@ -1385,7 +1385,7 @@ (push (cons 'default (hfy-face-to-css 'default)) style))) (defun hfy-fontified-p () - "`font-lock' doesn't like to say it\'s been fontified when in batch + "`font-lock' doesn't like to say it's been fontified when in batch mode, but we want to know if we should fontify or raw copy, so in batch mode we check for non-default face properties. Otherwise we test variable `font-lock-mode' and variable `font-lock-fontified' for truth." @@ -1412,7 +1412,7 @@ this function merges adjacent style blocks which are of the same value and are separated by nothing more interesting than whitespace.\n <span class=\"foo\">narf</span> <span class=\"foo\">brain</span>\n -\(as interpreted from FACE-MAP\) would become:\n +\(as interpreted from FACE-MAP) would become:\n <span class=\"foo\">narf brain</span>\n Returns a modified copy of FACE-MAP." (let ((tmp-map face-map) @@ -1485,8 +1485,8 @@ (if (hfy-opt 'merge-adjacent-tags) (hfy-merge-adjacent-spans map) map))) (defun hfy-buffer () - "Generate a buffer to hold the html output. -The filename of this buffer is derived from the source \(current\) buffer\'s + "Generate a buffer to hold the HTML output. +The filename of this buffer is derived from the source (current) buffer's variable `buffer-file-name', if it is set, plus `hfy-extn'. Otherwise a plausible filename is constructed from `default-directory', `buffer-name' and `hfy-extn'." @@ -1536,7 +1536,7 @@ ;; tag all the dangerous characters we want to escape ;; (ie any "<> chars we _didn't_ put there explicitly for css markup) (defun hfy-html-enkludge-buffer () - "Mark dangerous [\"\<\>] characters with the \'hfy-quoteme property.\n + "Mark dangerous [\"<>] characters with the `hfy-quoteme' property.\n See also `hfy-html-dekludge-buffer'." ;;(message "hfy-html-enkludge-buffer");;DBUG (save-excursion @@ -1546,7 +1546,7 @@ ;; dangerous char -> &entity; (defun hfy-html-quote (char-string) - "Map CHAR-STRING to an html safe string (entity) if need be." + "Map CHAR-STRING to an HTML safe string (entity) if need be." ;;(message "hfy-html-quote");;DBUG (or (cadr (assoc char-string hfy-html-quote-map)) char-string) ) @@ -1556,8 +1556,8 @@ ;; enter any other text before we do this, we'd have to track another ;; map of offsets, which would be tedious... (defun hfy-html-dekludge-buffer () - "Transform all dangerous characters marked with the \'hfy-quoteme property -using `hfy-html-quote'\n + "Transform all dangerous characters marked with the `hfy-quoteme' property +using `hfy-html-quote'.\n See also `hfy-html-enkludge-buffer'." ;;(message "hfy-html-dekludge-buffer");;DBUG (save-excursion @@ -1774,7 +1774,7 @@ html-buffer)) (defun hfy-force-fontification () - "Try to force font-locking even when it is optimised away." + "Try to force font-locking even when it is optimized away." (run-hooks 'hfy-init-kludge-hook) (eval-and-compile (require 'font-lock)) (if (boundp 'font-lock-cache-position) @@ -1793,19 +1793,19 @@ (defun htmlfontify-buffer (&optional srcdir file) "Create a new buffer, named for the current buffer + a .html extension, -containing an inline css-stylesheet and formatted css-markup html +containing an inline CSS-stylesheet and formatted CSS-markup HTML that reproduces the look of the current Emacs buffer as closely as possible. -Dangerous characters in the existing buffer are turned into html -entities, so you should even be able to do html-within-html +Dangerous characters in the existing buffer are turned into HTML +entities, so you should even be able to do HTML-within-HTML fontified display. You should, however, note that random control or eight-bit characters such as ^L (\x0c) or ยค (\xa4) won't get mapped yet. If the SRCDIR and FILE arguments are set, lookup etags derived -entries in the `hfy-tags-cache' and add html anchors and +entries in the `hfy-tags-cache' and add HTML anchors and hyperlinks as appropriate." (interactive) ;; pick up the file name in case we didn't receive it @@ -1836,22 +1836,22 @@ ;; fed pretty carefully, so it should be Ok: (defun hfy-dirname (file) "Return everything preceding the last \"/\" from a relative filename FILE, -on the assumption that this will produce a relative directory name. Hardly -bombproof, but good enough in the context in which it is being used." +on the assumption that this will produce a relative directory name. +Hardly bombproof, but good enough in the context in which it is being used." ;;(message "hfy-dirname");;DBUG (let ((f (directory-file-name file))) (and (string-match "^\\(.*\\)/" f) (match-string 1 f)))) ;; create a directory, cf mkdir -p (defun hfy-make-directory (dir) - "Approx equivalent of mkdir -p DIR." + "Approx. equivalent of mkdir -p DIR." ;;(message "hfy-make-directory");;DBUG (if (file-exists-p dir) (if (file-directory-p dir) t) (make-directory dir t))) (defun hfy-text-p (srcdir file) - "Is SRCDIR/FILE text? Uses `hfy-istext-command' to determine this." + "Is SRCDIR/FILE text? Uses `hfy-istext-command' to determine this." (let* ((cmd (format hfy-istext-command (expand-file-name file srcdir))) (rsp (shell-command-to-string cmd))) (if (string-match "text" rsp) t nil))) @@ -1903,7 +1903,7 @@ ;; mark the tags native to this file for anchors (defun hfy-mark-tag-names (srcdir file) - "Mark tags in FILE (lookup SRCDIR in `hfy-tags-cache') with the \'hfy-anchor + "Mark tags in FILE (lookup SRCDIR in `hfy-tags-cache') with the `hfy-anchor' property, with a value of \"tag.line-number\"." ;;(message "(hfy-mark-tag-names %s %s)" srcdir file);;DBUG (let ((cache-entry (assoc srcdir hfy-tags-cache)) @@ -1925,7 +1925,7 @@ (defun hfy-relstub (file &optional start) "Return a \"../\" stub of the appropriate length for the current source -tree depth \(as determined from FILE \(a filename\)\). +tree depth, as determined from FILE (a filename). START is the offset at which to start looking for the / character in FILE." ;;(message "hfy-relstub");;DBUG (let ((c "")) @@ -1933,8 +1933,8 @@ (setq start (1+ start)) (setq c (concat c "../"))) c)) (defun hfy-href-stub (this-file def-files tag) - "Return an href stub for a tag href i THIS-FILE: -If DEF-FILES \(list of files containing definitions for the tag in question\) + "Return an href stub for a tag href in THIS-FILE. +If DEF-FILES (list of files containing definitions for the tag in question) contains only one entry, the href should link straight to that file. Otherwise, the link should be to the index file.\n We are not yet concerned with the file extensions/tag line number and so on at @@ -1942,7 +1942,7 @@ If `hfy-split-index' is set, and the href wil be to an index file rather than a source file, append a .X to `hfy-index-file', where X is the uppercased first character of TAG.\n -See also: `hfy-relstub', `hfy-index-file'`'." +See also `hfy-relstub', `hfy-index-file'." ;;(message "hfy-href-stub");;DBUG ;; FIXME: Why not use something like ;; (file-relative-name (if ...) (file-name-directory this-file)) ? --Stef @@ -1957,7 +1957,7 @@ THIS-FILE `hfy-link-extn' `hfy-extn' DEF-FILES TAG and TAG-MAP\n THIS-FILE is the current source file DEF-FILES is a list of file containing possible link endpoints for TAG -TAG is the TAG in question +TAG is the tag in question TAG-MAP is the entry in `hfy-tags-cache'." ;;(message "hfy-href");;DBUG (concat @@ -1975,8 +1975,8 @@ ;; mark all tags for hyperlinking, except the tags at ;; their own points of definition, iyswim: (defun hfy-mark-tag-hrefs (srcdir file) - "Mark href start points with the \'hfy-link prop \(value: href string\)\n -Mark href end points with the \'hfy-endl prop \(value t\)\n + "Mark href start points with the `hfy-link' prop (value: href string).\n +Mark href end points with the `hfy-endl' prop (value t).\n Avoid overlapping links, and mark links in descending length of tag name in order to prevent subtags from usurping supertags, \(eg \"term\" for \"terminal\"). @@ -2134,7 +2134,7 @@ `hfy-tags-cache' must already have an entry for SRCDIR for this to work. `hfy-page-header', `hfy-page-footer', `hfy-link-extn' and `hfy-extn' all play a part here.\n -If STUB is set, prepare an \(appropriately named\) index buffer +If STUB is set, prepare an (appropriately named) index buffer specifically for entries beginning with STUB.\n If MAP is set, use that instead of `hfy-tags-cache'. FILENAME is the name of the file being indexed. @@ -2184,7 +2184,7 @@ index-buf) )) (defun hfy-prepare-index (srcdir dstdir) - "Return a list of index buffer\(s\), as determined by `hfy-split-index'. + "Return a list of index buffer(s), as determined by `hfy-split-index'. SRCDIR and DSTDIR are the source and output directories respectively." (if (not hfy-split-index) (list (hfy-prepare-index-i srcdir dstdir hfy-index-file nil)) @@ -2207,12 +2207,11 @@ index-list)) ))) cache-hash) ) index-list))) (defun hfy-prepare-tag-map (srcdir dstdir) - "Prepare the counterpart\(s\) to the index buffer\(s\) - a list of buffers -with the same structure, but listing \( and linking to \) instances of tags -\( as opposed to their definitions \).\n + "Prepare the counterpart(s) to the index buffer(s) - a list of buffers +with the same structure, but listing (and linking to) instances of tags +\(as opposed to their definitions).\n SRCDIR and DSTDIR are the source and output directories respectively. -See: `hfy-prepare-index' - `hfy-split-index'." +See also `hfy-prepare-index', `hfy-split-index'." (if (not hfy-split-index) (list (hfy-prepare-index-i srcdir dstdir @@ -2242,7 +2241,7 @@ (defun hfy-subtract-maps (srcdir) "Internal function - strips definitions of tags from the instance map. SRCDIR is the directory being \"published\". -See: `hfy-tags-cache' and `hfy-tags-rmap'" +See also `hfy-tags-cache', `hfy-tags-rmap'." (let ((new-list nil) (old-list nil) (def-list nil) @@ -2262,7 +2261,7 @@ (defun htmlfontify-run-etags (srcdir) "Load the etags cache for SRCDIR. -See `hfy-load-tags-cache'." +See also `hfy-load-tags-cache'." (interactive "D source directory: ") (setq srcdir (directory-file-name srcdir)) (hfy-load-tags-cache srcdir))
--- a/lisp/imenu.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/imenu.el Tue Jan 12 08:54:18 2010 +0100 @@ -596,7 +596,7 @@ ;;; Find all markers in alist and makes ;;; them point nowhere. ;;; The top-level call uses nil as the argument; -;;; non-nil arguments are in recursivecalls. +;;; non-nil arguments are in recursive calls. (defvar imenu--cleanup-seen) (defun imenu--cleanup (&optional alist) @@ -684,12 +684,15 @@ ;; in these major modes. But save that change for later. (cond ((and imenu-prev-index-position-function imenu-extract-index-name-function) - (let ((index-alist '()) + (let ((index-alist '()) (pos (point)) prev-pos name) (goto-char (point-max)) (imenu-progress-message prev-pos 0 t) ;; Search for the function (while (funcall imenu-prev-index-position-function) + (when (= pos (point)) + (error "Infinite loop at %s:%d: imenu-prev-index-position-function does not move point" (buffer-name) pos)) + (setq pos (point)) (imenu-progress-message prev-pos nil t) (save-excursion (setq name (funcall imenu-extract-index-name-function)))
--- a/lisp/mail/emacsbug.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/mail/emacsbug.el Tue Jan 12 08:54:18 2010 +0100 @@ -1,7 +1,8 @@ ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list ;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF @@ -41,10 +42,11 @@ :group 'emacsbug :type 'string) -(defcustom report-emacs-bug-pretest-address "emacs-pretest-bug@gnu.org" +(defcustom report-emacs-bug-pretest-address "bug-gnu-emacs@gnu.org" "Address of mailing list for GNU Emacs pretest bugs." :group 'emacsbug - :type 'string) + :type 'string + :version "23.2") ; emacs-pretest-bug -> bug-gnu-emacs (defcustom report-emacs-bug-no-confirmation nil "If non-nil, suppress the confirmations asked for the sake of novice users."
--- a/lisp/progmodes/js.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/progmodes/js.el Tue Jan 12 08:54:18 2010 +0100 @@ -3320,6 +3320,7 @@ (let (font-lock-keywords) ; leaves syntactic keywords intact (font-lock-fontify-buffer))) +;;;###autoload (defalias 'javascript-mode 'js-mode) (eval-after-load 'folding
--- a/lisp/version.el Mon Jan 11 08:37:07 2010 +0100 +++ b/lisp/version.el Tue Jan 12 08:54:18 2010 +0100 @@ -1,7 +1,7 @@ ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009 +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -29,7 +29,7 @@ ;;; Code: -(defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc." "\ +(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") (defconst emacs-version "23.1.91" "\
--- a/nextstep/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/nextstep/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,10 @@ +2010-01-11 Glenn Morris <rgm@gnu.org> + + * Cocoa/Emacs.base/Contents/Info.plist: + * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Set copyright year to 2010. + 2009-09-23 Adrian Robert <Adrian.B.Robert@gmail.com> * README: Note GNUstep support is now Startup 0.23 or later.
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist Mon Jan 11 08:37:07 2010 +0100 +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist Tue Jan 12 08:54:18 2010 +0100 @@ -553,7 +553,7 @@ <key>CFBundleExecutable</key> <string>Emacs</string> <key>CFBundleGetInfoString</key> - <string>Emacs 23.1.91 Copyright (C) 2009 Free Software Foundation, Inc.</string> + <string>Emacs 23.1.91 Copyright (C) 2010 Free Software Foundation, Inc.</string> <key>CFBundleIconFile</key> <string>Emacs.icns</string> <key>CFBundleIdentifier</key>
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Mon Jan 11 08:37:07 2010 +0100 +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Tue Jan 12 08:54:18 2010 +0100 @@ -3,4 +3,4 @@ CFBundleName = "Emacs"; CFBundleShortVersionString = "Version 23.1.91"; CFBundleGetInfoString = "Emacs version 23.1.91, NS Windowing"; -NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc."; +NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist Mon Jan 11 08:37:07 2010 +0100 +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist Tue Jan 12 08:54:18 2010 +0100 @@ -11,7 +11,7 @@ "Carl Edman (NeXTStep)", "..see http://emacs-app.sf.net/authorship.html" ); - Copyright = "Copyright (C) 2009 Free Software Foundation, Inc."; + Copyright = "Copyright (C) 2010 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; FullVersionID = "Emacs 23.1.91, NS Windowing"; NSExecutable = Emacs;
--- a/src/ChangeLog Mon Jan 11 08:37:07 2010 +0100 +++ b/src/ChangeLog Tue Jan 12 08:54:18 2010 +0100 @@ -1,3 +1,13 @@ +2010-01-12 Glenn Morris <rgm@gnu.org> + + * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to + bug-gnu-emacs rather than emacs-pretest-bug. + +2010-01-11 Chong Yidong <cyd@stupidchicken.com> + + * nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before + initializing the Lisp variables that depend on them. + 2010-01-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xfns.c (x_set_menu_bar_lines) [!USE_X_TOOLKIT && !USE_GTK]:
--- a/src/emacs.c Mon Jan 11 08:37:07 2010 +0100 +++ b/src/emacs.c Tue Jan 12 08:54:18 2010 +0100 @@ -1,7 +1,7 @@ /* Fully extensible Emacs, running on Unix, intended for GNU. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 - Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -747,7 +747,7 @@ #define REPORT_EMACS_BUG_ADDRESS "bug-gnu-emacs@gnu.org" -#define REPORT_EMACS_BUG_PRETEST_ADDRESS "emacs-pretest-bug@gnu.org" +#define REPORT_EMACS_BUG_PRETEST_ADDRESS "bug-gnu-emacs@gnu.org" /* This function is used to determine an address to which bug report should be sent. */
--- a/src/nsterm.m Mon Jan 11 08:37:07 2010 +0100 +++ b/src/nsterm.m Tue Jan 12 08:54:18 2010 +0100 @@ -6144,6 +6144,19 @@ ns_antialias_threshold = 10.0; + /* from 23+ we need to tell emacs what modifiers there are.. */ + DEFSYM (Qmodifier_value, "modifier-value"); + DEFSYM (Qalt, "alt"); + DEFSYM (Qhyper, "hyper"); + DEFSYM (Qmeta, "meta"); + DEFSYM (Qsuper, "super"); + DEFSYM (Qcontrol, "control"); + Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); + Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); + Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); + Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); + Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier)); + DEFVAR_LISP ("ns-input-file", &ns_input_file, "The file specified in the last NS event."); ns_input_file =Qnil; @@ -6218,19 +6231,6 @@ staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil; - /* from 23+ we need to tell emacs what modifiers there are.. */ - Qmodifier_value = intern ("modifier-value"); - Qalt = intern ("alt"); - Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); - Qhyper = intern ("hyper"); - Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); - Qmeta = intern ("meta"); - Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); - Qsuper = intern ("super"); - Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); - Qcontrol = intern ("control"); - Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier)); - /* TODO: move to common code */ DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, doc: /* If not nil, Emacs uses toolkit scroll bars. */);