# HG changeset patch # User Jan D. # Date 1263282858 -3600 # Node ID 4abcc08ffba21260a3b33e395a55972894476f5b # Parent 05ac7369b8c2881c2bf729f69f5d1e278ae0db40# Parent b92c3979701c37ff03e40593f2d04e6059c78bc7 Merge from trunk diff -r 05ac7369b8c2 -r 4abcc08ffba2 ChangeLog --- 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 + + * INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug + for bug reports for development versions. + 2010-01-02 Eli Zaretskii * .bzrignore: Add more ignored patterns, including for the MS-DOS diff -r 05ac7369b8c2 -r 4abcc08ffba2 INSTALL.BZR --- 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 diff -r 05ac7369b8c2 -r 4abcc08ffba2 README --- 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 diff -r 05ac7369b8c2 -r 4abcc08ffba2 admin/ChangeLog --- 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 + + * emacs-pretesters, make-announcement: Use bug-gnu-emacs rather + than emacs-pretest-bug for bug reports for development versions. + 2009-11-06 Kenichi Handa * unidata/unidata-gen.el (unidata-gen-table): Fix for the case diff -r 05ac7369b8c2 -r 4abcc08ffba2 admin/emacs-pretesters --- 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 diff -r 05ac7369b8c2 -r 4abcc08ffba2 admin/make-announcement --- 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` @@ -59,7 +59,7 @@ Please report results from compiling and running the pretest to -. Your feedback is necessary for us +. 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 diff -r 05ac7369b8c2 -r 4abcc08ffba2 doc/emacs/ChangeLog --- 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 + + * trouble.texi (Checklist): Use bug-gnu-emacs rather than + emacs-pretest-bug for bug reports for development versions. + 2010-01-11 Glenn Morris * display.texi (Highlight Interactively): `t' does not mean highlight diff -r 05ac7369b8c2 -r 4abcc08ffba2 doc/emacs/trouble.texi --- 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 diff -r 05ac7369b8c2 -r 4abcc08ffba2 etc/CONTRIBUTE --- 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. diff -r 05ac7369b8c2 -r 4abcc08ffba2 etc/ChangeLog --- 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 + + * CONTRIBUTE, NEWS: Use bug-gnu-emacs rather than emacs-pretest-bug + for bug reports for development versions. + 2010-01-01 Juanma Barranquero * NEWS: Fix typos. diff -r 05ac7369b8c2 -r 4abcc08ffba2 etc/NEWS --- 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. diff -r 05ac7369b8c2 -r 4abcc08ffba2 lib-src/ChangeLog --- 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 + + * ebrowse.c (version): + * etags.c (print_version): + * rcs2log (Copyright): Set copyright year to 2010. + 2009-12-09 David Robinow (tiny change) * makefile.w32-in: Use parenthesis for macros for nmake diff -r 05ac7369b8c2 -r 4abcc08ffba2 lib-src/ebrowse.c --- 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); diff -r 05ac7369b8c2 -r 4abcc08ffba2 lib-src/etags.c --- 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); diff -r 05ac7369b8c2 -r 4abcc08ffba2 lib-src/rcs2log --- 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 @@ -22,7 +22,7 @@ # along with this program. If not, see . -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. diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/ChangeLog --- 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 + + * mail/emacsbug.el (report-emacs-bug-pretest-address): Set + it to bug-gnu-emacs rather than emacs-pretest-bug. + +2010-01-12 Juanma Barranquero + + * cedet/data-debug.el (data-debug): Fix customization group reference. + +2010-01-12 Juanma Barranquero + + * 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 + + * imenu.el (imenu-default-create-index-function): Detect infinite + loops caused by imenu-prev-index-position-function. + +2010-01-11 Juanma Barranquero + + * 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 + + * progmodes/js.el: Autoload javascript-mode alias. + +2010-01-11 Juanma Barranquero + + * 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 + + * version.el (emacs-copyright): Set copyright year to 2010. + 2010-01-10 Stefan Monnier * format.el (format-annotate-function): Only set diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/data-debug.el --- 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)))) diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/analyze.el --- 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. diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/bovine/c.el --- 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.") diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/bovine/el.el --- 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." diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/bovine/make.el --- 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 () diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/java.el --- 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 diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/wisent/python-wy.el --- 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 is false") ("and" summary "Logical AND binary operator ... "))) "Table of language keywords.") diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/semantic/wisent/python.el --- 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'. ;; diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/cedet/srecode/extract.el --- 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) diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/ffap.el --- 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 \"\". @@ -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 ))) diff -r 05ac7369b8c2 -r 4abcc08ffba2 lisp/htmlfontify.el --- 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 \\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 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 \'