Mercurial > emacs
changeset 108397:c5b62c5789d8
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 15 Jan 2010 14:21:59 +0000 |
| parents | 842d29bdc9a5 (current diff) 2643225473f7 (diff) |
| children | 1789ed4b257e |
| files | |
| diffstat | 76 files changed, 644 insertions(+), 217 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/notes/bugtracker Wed Jan 13 14:05:08 2010 +0000 +++ b/admin/notes/bugtracker Fri Jan 15 14:21:59 2010 +0000 @@ -88,9 +88,8 @@ The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases. -They also have: +A new report also has: -Reply-To: bug submitter, 123@debbugs.gnu.org Mail-Followup-To: bug submitter, 123@debbugs.gnu.org ** To not get acknowledgement mail from the tracker, @@ -174,13 +173,23 @@ *** Bugs can be tagged in various ways (eg wontfix, patch, etc). The available tags are: patch wontfix moreinfo unreproducible fixed notabug -Note that the list at http://debbugs.gnu.org/Developer#tags -is incorrect, at least for Emacs. +See http://debbugs.gnu.org/Developer#tags The list of tags can be prefixed with +, - or =, meaning to add (the default), remove, or reset the tags. E.g.: tags 123 + wontfix +** URL shortcuts + +http://debbugs.gnu.org/... + +123 # given bug number +123;mbox=yes # mbox version of given bug +package # bugs in given package (don't use "emacs" - too many bugs!) +from:submitter@email.address +severity:severity # all bugs of given severity +tag:tag # all bugs with given tag + ** Usertags See <http://wiki.debian.org/bugs.debian.org/usertags> @@ -335,19 +344,10 @@ It's a function of the number of displayed bugs. You can speed things up by only looking at the newest 100 bugs: - http://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs -The above page is accessible from the "Options" section at the end of -the "main list of bugs" page. Select bugs "in package" = emacs; -"newest bugs" = 100. (I have no idea how you get to that Options -section without having to go through the bug list page first...) - -** Mails to the bug tracker disappear - -Apparently it has some kind of spam filter that sometimes silently -discards valid mails. Adding a subject (pointless in control messages) -may help. +Or use the static index: +http://debbugs.gnu.org/db/ix/full.html ** ChangeLog issues
--- a/doc/emacs/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/doc/emacs/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -6735,8 +6735,8 @@ 1998-04-06 Andreas Schwab <schwab@gnu.org> - * Makefile.in (ENVADD): Enviroment vars to pass to texi2dvi. Use - it in dvi targets. + * Makefile.in (ENVADD): Environment vars to pass to texi2dvi. + Use it in dvi targets. 1997-09-23 Paul Eggert <eggert@twinsun.com>
--- a/doc/misc/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/doc/misc/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -6180,8 +6180,8 @@ 1998-04-06 Andreas Schwab <schwab@gnu.org> - * Makefile.in (ENVADD): Enviroment vars to pass to texi2dvi. Use - it in dvi targets. + * Makefile.in (ENVADD): Environment vars to pass to texi2dvi. + Use it in dvi targets. (../etc/GNU): Change to $(srcdir) first. 1998-03-11 Carsten Dominik <cd@delysid.gnu.org>
--- a/etc/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/etc/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -1,3 +1,25 @@ +2010-01-14 Nick Roberts <nickrob@snap.net.nz> + + * etc/images/gud/recstart.xpm, etc/images/gud/recstop.xpm: + * etc/images/gud/rcont.xpm, etc/images/gud/rnext.xpm: + * etc/images/gud/rfinish.xpm, etc/images/gud/rnexti.xpm: + * etc/images/gud/rstep.xpm, etc/images/gud/rstepi.xpm: + New icons for reverse debugging. + +2010-01-14 Juanma Barranquero <lekktu@gmail.com> + + * srecode/doc-cpp.srt (function-comment, variable-same-line-comment) + (group-comment-start, group-comment-end): + * srecode/doc-default.srt (section-comment, function-comment) + (variable-same-line-comment, group-comment-start, group-comment-end): + * srecode/doc-java.srt (function-comment, variable-same-line-comment) + (group-comment-start, gropu-comment-end): + Fix typos in template docstrings. + +2010-01-14 Kenichi Handa <handa@m17n.org> + + * NEWS: Describe the change of auto-composition-mode. + 2010-01-12 Glenn Morris <rgm@gnu.org> * CONTRIBUTE, NEWS: Use bug-gnu-emacs rather than emacs-pretest-bug @@ -272,7 +294,7 @@ 2009-06-12 Kenichi Handa <handa@m17n.org> - * HELLO: Use "/" instead of "," to seperate independent words. + * HELLO: Use "/" instead of "," to separate independent words. * charsets/*.map: All re-generated.
--- a/etc/ERC-NEWS Wed Jan 13 14:05:08 2010 +0000 +++ b/etc/ERC-NEWS Fri Jan 15 14:21:59 2010 +0000 @@ -1312,9 +1312,8 @@ ** erc is switching to global-minor-modes for activation of submodules. This allows you to customize such a mode and get automatic loading of -the module. No longer putting a lot of require statments in .emacs. -At least this is the long-term plan, not all modules are converted -yet. +the module. No longer putting a lot of require statements in .emacs. +At least this is the long-term plan, not all modules are converted yet. ** The most important user visible change is that you now need to activate erc-completion-mode, to get TAB completion. The new completion code
--- a/etc/NEWS Wed Jan 13 14:05:08 2010 +0000 +++ b/etc/NEWS Fri Jan 15 14:21:59 2010 +0000 @@ -122,6 +122,11 @@ ** Function arguments in *Help* buffers are now shown in upper-case. Customize `help-downcase-arguments' to t to show them in lower-case. +** Delete Auto Composition Mode. Now the variable +`auto-composition-mode' is simply a buffer local variable. The +commands `auto-composition-mode' and `global-auto-composition-mode' +still works as before. + * Editing Changes in Emacs 23.2 @@ -2150,7 +2155,6 @@ **** `coding-system-from-name' returns a coding system matching with the argument name. - ** There is a new input method, Robin, different from Quail. It has three functionalities: i) a simple input method (converts an ASCII sequence into a string).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/rcont.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,33 @@ +/* XPM */ +static char * reverse_continue_xpm[] = { +"24 24 6 1", +" c None", +". c #D99FAA", +"+ c #CC0033", +"@ c #616161", +"# c #2A1F55", +"$ c #AA9FAA", +" ", +" ", +" ", +" ", +" .+ ", +" .++. ", +" @# #@ +++++++ ", +" @#$ $#@ .++. ", +" ## ## .+ ", +" ## ## ", +" ## ## ", +" #@ @# ", +" ## ## ", +" #@ @# ", +" ## ## ", +" ## ## ", +" ## ## ", +" @#$ $#@ ", +" @# #@ ", +" ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/recstart.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,29 @@ +/* XPM */ +static char * break_xpm[] = { +"24 24 2 1", +" c None", +". c #cc0033", +" ", +" ", +" ", +" ", +" .... ", +" ........ ", +" .......... ", +" ............ ", +" .............. ", +" .............. ", +" ................ ", +" ................ ", +" ................ ", +" ................ ", +" .............. ", +" .............. ", +" ............ ", +" .......... ", +" ........ ", +" .... ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/recstop.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,29 @@ +/* XPM */ +static char * break_xpm[] = { +"24 24 2 1", +" c None", +". c #cc0033", +" ", +" ", +" ", +" ", +" .... ", +" ........ ", +" .......... ", +" ............ ", +" .............. ", +" .............. ", +" ................ ", +" ................ ", +" ................ ", +" ................ ", +" .............. ", +" .............. ", +" ............ ", +" .......... ", +" ........ ", +" .... ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/rfinish.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,33 @@ +/* XPM */ +static char * reverse_step_xpm[] = { +"24 24 6 1", +" c None", +". c #D40000", +"+ c #616161", +"@ c #2A1F55", +"# c #ADADAD", +"$ c #CC9999", +" ", +" ", +" ", +" ", +" ..... ", +" . . ", +" . . ", +" +@ . @+ . ", +" +@# . #@+ . ", +" @@ .$.$. @@ . ", +" @@ $...$ @@ ", +" @@ ... @@ ", +" @+ $.$ +@ ", +" @@ . @@ ", +" @+ +@ ", +" @@ @@ ", +" @@ @@ ", +" @@ @@ ", +" +@# #@+ ", +" +@ @+ ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/rnext.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,34 @@ +/* XPM */ +static char * reverse_next_xpm[] = { +"24 24 7 1", +" c None", +". c #CC0033", +"+ c #616161", +"@ c #2A1F55", +"# c #ADADAD", +"$ c #D40000", +"% c #CC9999", +" ", +" ", +" ", +" ", +" .......... ", +" . . ", +" . . ", +" . +@ @+ . ", +" . +@# #@+ . ", +" $%.%$ @@ @@ . ", +" %...% @@ @@ ", +" ... @@ @@ ", +" %.% @+ +@ ", +" . @@ @@ ", +" @+ +@ ", +" @@ @@ ", +" @@ @@ ", +" @@ @@ ", +" +@# #@+ ", +" +@ @+ ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/rnexti.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,33 @@ +/* XPM */ +static char * reverse_nexti_xpm[] = { +"24 24 6 1", +" c None", +". c #CC0033", +"+ c #D40000", +"@ c #CC9999", +"# c #616161", +"$ c #2A1F55", +" ", +" ", +" ", +" ", +" .......... ", +" . . ", +" . . ", +" . . ", +" . . ", +" +@.@+ # # . ", +" @...@ #$ $# ", +" ... #$ $# ", +" @.@ #$ $# ", +" . #$ $# ", +" $# #$ ", +" $# #$ ", +" $# #$ ", +" $# #$ ", +" $ $ ", +" ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/rstep.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,34 @@ +/* XPM */ +static char * reverse_finish_xpm[] = { +"24 24 7 1", +" c None", +". c #CC0033", +"+ c #616161", +"@ c #2A1F55", +"# c #ADADAD", +"$ c #D40000", +"% c #CC9999", +" ", +" ", +" ", +" ", +" ..... ", +" . . ", +" . . ", +" . +@ . @+ ", +" . +@# . #@+ ", +" $%.%$ @@ . @@ ", +" %...% @@ @@ ", +" ... @@ @@ ", +" %.% @+ +@ ", +" . @@ @@ ", +" @+ +@ ", +" @@ @@ ", +" @@ @@ ", +" @@ @@ ", +" +@# #@+ ", +" +@ @+ ", +" ", +" ", +" ", +" "};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/images/gud/rstepi.xpm Fri Jan 15 14:21:59 2010 +0000 @@ -0,0 +1,32 @@ +/* XPM */ +static char * reverse_stepi_xpm[] = { +"24 24 5 1", +" c None", +". c #D40000", +"+ c #616161", +"@ c #2A1F55", +"# c #CC9999", +" ", +" ", +" ", +" ", +" ..... ", +" . . ", +" . . ", +" . . ", +" + . + . ", +" +@ .#.#. @+ . ", +" +@ #...# @+ ", +" +@ ... @+ ", +" +@ #.# @+ ", +" @+ . +@ ", +" @+ +@ ", +" @+ +@ ", +" @+ +@ ", +" @ @ ", +" ", +" ", +" ", +" ", +" ", +" "};
--- a/etc/srecode/doc-cpp.srt Wed Jan 13 14:05:08 2010 +0000 +++ b/etc/srecode/doc-cpp.srt Fri Jan 15 14:21:59 2010 +0000 @@ -36,14 +36,14 @@ ---- template function-comment :tag :indent :blank -"A comment occuring in front of a function. +"A comment occurring in front of a function. Recycle doxygen comment code from the more general template set." ---- {{>:declaration:doxygen-function}} ---- template variable-same-line-comment :tag -"A comment occuring after a veriable declaration. +"A comment occurring after a veriable declaration. Recycle doxygen comment code from the more general template set." ---- {{>:declaration:doxygen-variable-same-line}} @@ -51,14 +51,14 @@ ;; These happen to be the same as in a classdecl. template group-comment-start :blank :indent -"A comment occuring in front of a group of declarations. +"A comment occurring in front of a group of declarations. Recycle doxygen comment code from the more general template set." ---- {{>:classdecl:doxygen-function-group-start}} ---- template group-comment-end :blank :indent -"A comment occuring at the end of a a group of declarations. +"A comment occurring at the end of a a group of declarations. Recycle doxygen comment code from the more general template set." ---- {{>:classdecl:doxygen-function-group-end}} @@ -68,14 +68,14 @@ context classdecl template group-comment-start :blank :indent -"A comment occuring in front of a group of declarations. +"A comment occurring in front of a group of declarations. Recycle doxygen comment code from the more general template set." ---- {{>:classdecl:doxygen-function-group-start}} ---- template group-comment-end :blank :indent -"A comment occuring at the end of a a group of declarations. +"A comment occurring at the end of a a group of declarations. Recycle doxygen comment code from the more general template set." ---- {{>:classdecl:doxygen-function-group-end}}
--- a/etc/srecode/doc-default.srt Wed Jan 13 14:05:08 2010 +0000 +++ b/etc/srecode/doc-default.srt Fri Jan 15 14:21:59 2010 +0000 @@ -26,7 +26,7 @@ context declaration template section-comment :blank :indent -"A comment occuring in front of a group of declarations." +"A comment occurring in front of a group of declarations." ---- {{comment_start}} {{?TITLE}} {{comment_prefix}} @@ -35,7 +35,7 @@ ---- template function-comment :tag :indent :blank -"A comment occuring in front of a function." +"A comment occurring in front of a function." ---- {{comment_start}} {{?NAME}} -- {{DOC:srecode-comment-prefix}} @@ -43,21 +43,21 @@ ---- template variable-same-line-comment :tag -"A comment occuring after a veriable declaration." +"A comment occurring after a veriable declaration." ---- {{comment_start}} {{?DOC}} {{comment_end}} ---- ;; These happen to be the same as in a classdecl. template group-comment-start :blank :indent -"A comment occuring in front of a group of declarations." +"A comment occurring in front of a group of declarations." ---- {{comment_start}} {{?GROUPNAME}} -- {{comment_end}} ---- template group-comment-end :indent -"A comment occuring at the end of a a group of declarations." +"A comment occurring at the end of a a group of declarations." ---- {{comment_start}} End {{?GROUPNAME}} {{comment_end}} ---- @@ -66,13 +66,13 @@ context classdecl template group-comment-start :blank :indent -"A comment occuring in front of a group of declarations." +"A comment occurring in front of a group of declarations." ---- {{>:declaration:group-comment-start}} ---- template group-comment-end :indent -"A comment occuring at the end of a a group of declarations." +"A comment occurring at the end of a a group of declarations." ---- {{>:declaration:group-comment-end}} ----
--- a/etc/srecode/doc-java.srt Wed Jan 13 14:05:08 2010 +0000 +++ b/etc/srecode/doc-java.srt Fri Jan 15 14:21:59 2010 +0000 @@ -37,14 +37,14 @@ ---- template function-comment :tag :indent :blank -"A comment occuring in front of a function. +"A comment occurring in front of a function. Recycle javadoc comment code from the more general template set." ---- {{>:declaration:javadoc-function}} ---- template variable-same-line-comment :tag -"A comment occuring after a veriable declaration. +"A comment occurring after a veriable declaration. Recycle javadoc comment code from the more general template set." ---- {{>:declaration:javadoc-variable-same-line}} @@ -52,14 +52,14 @@ ;; These happen to be the same as in a classdecl. template group-comment-start :blank :indent -"A comment occuring in front of a group of declarations. +"A comment occurring in front of a group of declarations. Recycle javadoc comment code from the more general template set." ---- {{>:classdecl:javadoc-function-group-start}} ---- template group-comment-end :blank :indent -"A comment occuring at the end of a a group of declarations. +"A comment occurring at the end of a a group of declarations. Recycle javadoc comment code from the more general template set." ---- {{>:classdecl:javadoc-function-group-end}} @@ -69,14 +69,14 @@ context classdecl template group-comment-start :blank :indent -"A comment occuring in front of a group of declarations. +"A comment occurring in front of a group of declarations. Recycle javadoc comment code from the more general template set." ---- {{>:classdecl:javadoc-function-group-start}} ---- template group-comment-end :blank :indent -"A comment occuring at the end of a a group of declarations. +"A comment occurring at the end of a a group of declarations. Recycle javadoc comment code from the more general template set." ---- {{>:classdecl:javadoc-function-group-end}}
--- a/lib-src/emacsclient.c Wed Jan 13 14:05:08 2010 +0000 +++ b/lib-src/emacsclient.c Fri Jan 15 14:21:59 2010 +0000 @@ -340,7 +340,7 @@ /* getenv wrapper for Windows - This is needed to duplicate Emacs's behavior, which is to look for enviroment + This is needed to duplicate Emacs's behavior, which is to look for environment variables in the registry if they don't appear in the environment. */ char *
--- a/lisp/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -1,3 +1,89 @@ +2010-01-15 Kenichi Handa <handa@m17n.org> + + * international/mule-cmds.el (canonicalize-coding-system-name): + Convert "msXXX", "ibmXXX", "windows-XXX" to "cpXXX". + +2010-01-15 Glenn Morris <rgm@gnu.org> + + * log-view.el (top-level): Require 'wid-edit. (Bug#5311) + + * wid-edit.el (widget-keymap): Doc fix. + + * vc-svn.el (vc-svn-print-log): Use --limit rather than -l since the + former seems to be more widely accepted by various svn versions. + +2010-01-14 Juanma Barranquero <lekktu@gmail.com> + + * find-cmd.el (find-constituents): + * vc-arch.el (vc-arch-root): + * window.el (window-body-height, pop-up-frames): + * cedet/semantic/edit.el (semantic-reparse-needed-change-hook) + (semantic-no-reparse-needed-change-hook): + * cedet/srecode/insert.el (srecode-resolve-argument-list) + (srecode-template-inserter-blank, srecode-template-inserter-variable) + (srecode-template-inserter-ask, srecode-template-inserter-width) + (srecode-template-inserter-section-start) + (srecode-template-inserter-section-end, srecode-insert-method): + * emacs-lisp/eieio-base.el (eieio-singleton, slot-missing): + * progmodes/ada-stmt.el (ada-if): + * progmodes/gdb-ui.el (gdb-jsonify-buffer): + * textmodes/ispell.el (ispell-grep-options, ispell-dictionary-alist) + (ispell-encoding8-command, ispell-aspell-supports-utf8) + (ispell-last-program-name, ispell-help): Fix typos in docstrings. + + * progmodes/flymake.el (flymake-post-syntax-check): + Fix typo in error message. + +2010-01-14 Juanma Barranquero <lekktu@gmail.com> + + * hexl.el (hexl-printable-character): Fix check of `hexl-iso', + which is always a string. (Bug#5313) + +2010-01-14 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/ada-xref.el (ada-default-prj-properties): + Simplify previous change. + +2010-01-14 Stephen Leake <stephen_leake@member.fsf.org> + + * progmodes/ada-xref.el (ada-default-prj-properties): + Default ada_project_path to $ADA_PROJECT_PATH. + +2010-01-14 Stephen Leake <stephen_leake@member.fsf.org> + + * progmodes/ada-mode.el (ada-create-keymap): + Override `narrow-to-defun' with `ada-narrow-to-defun'. + +2010-01-14 Stephen Leake <stephen_leake@member.fsf.org> + + * progmodes/ada-mode.el: Deal with Ada 2005 "overriding" keyword. + (ada-subprog-start-re, ada-imenu-subprogram-menu-re): Add keyword. + (ada-get-current-indent, ada-imenu-generic-expression) + (ada-which-function): Check for it. + +2010-01-14 Stephen Leake <stephen_leake@member.fsf.org> + + * progmodes/ada-mode.el (ada-clean-buffer-before-saving): Make obsolete. + (ada-mode): Don't obey `ada-clean-buffer-before-saving' anymore. + +2010-01-14 Glenn Morris <rgm@gnu.org> + + * frame.el (show-trailing-whitespace): Safe if boolean. (Bug#5312) + +2010-01-14 Kenichi Handa <handa@m17n.org> + + * composite.el (auto-composition-mode): Make it a buffer local + variable (permanent-local). + (auto-composition-function): Set the default value to + auto-compose-chars. + (auto-composition-mode): Make it a simple function, not a minor mode. + (global-auto-composition-mode): Likewise. + (turn-on-auto-composition-if-enabled): Delete it. + +2010-01-13 Karl Fogel <kfogel@red-bean.com> + + * bookmark.el (bookmark-bmenu-execute-deletions): Doc fix (Bug#5276). + 2010-01-12 Michael Albinus <michael.albinus@gmx.de> * files.el (copy-directory): Compute target for recursive
--- a/lisp/ChangeLog.10 Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/ChangeLog.10 Fri Jan 15 14:21:59 2010 +0000 @@ -6773,7 +6773,7 @@ (ruler-mode-mouse-grab-any-column) (ruler-mode-mouse-drag-any-column-iteration) (ruler-mode-mouse-drag-any-column): New functions. - (ruler-mode-map): [header-line down-mouse-2] Bound to + (ruler-mode-map) [header-line down-mouse-2]: Bound to `ruler-mode-mouse-grab-any-column' instead of `ruler-mode-mouse-set-fill-column'. (ruler-mode-ruler-help-echo): Update its value.
--- a/lisp/ChangeLog.5 Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/ChangeLog.5 Fri Jan 15 14:21:59 2010 +0000 @@ -2083,7 +2083,7 @@ * desktop.el (desktop-save): Use dired-directory as name of top-level in order to capture wildcards used. (desktop-buffer-dired): Skip possible wildcard when checking - for directory existance. Use dired-insert-subdir, not + for directory existence. Use dired-insert-subdir, not dired-maybe-insert-subdir. 1995-04-06 Karl Heuer <kwzh@nutrimat.gnu.ai.mit.edu>
--- a/lisp/ChangeLog.8 Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/ChangeLog.8 Fri Jan 15 14:21:59 2010 +0000 @@ -6760,7 +6760,7 @@ 1999-01-22 Andrew Innes <andrewi@gnu.org> - * startup.el (command-line): [windows-nt]: Check for existence of + * startup.el (command-line) [windows-nt]: Check for existence of .emacs file so as to notice .emacs.el or .emacs.elc and use them in preference to _emacs.
--- a/lisp/bookmark.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/bookmark.el Fri Jan 15 14:21:59 2010 +0000 @@ -1960,7 +1960,7 @@ (defun bookmark-bmenu-execute-deletions () - "Delete bookmarks marked with \\<Buffer-menu-mode-map>\\[Buffer-menu-delete] commands." + "Delete bookmarks flagged `D'." (interactive) (message "Deleting bookmarks...") (let ((o-point (point))
--- a/lisp/cedet/ede/files.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/cedet/ede/files.el Fri Jan 15 14:21:59 2010 +0000 @@ -442,7 +442,7 @@ (setq ans calc)) ;; If we failed to calculate something, we ;; should add it to the hash, but ONLY if we are not - ;; going to FORCE the file into existance. + ;; going to FORCE the file into existence. (when (not force) (ede-locate-add-file-to-hash loc filename 'nomatch)))) ))
--- a/lisp/cedet/semantic/edit.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/cedet/semantic/edit.el Fri Jan 15 14:21:59 2010 +0000 @@ -81,15 +81,13 @@ (defvar semantic-reparse-needed-change-hook nil "Hooks run when a user edit is detected as needing a reparse. -For language specific hooks, make sure you define this as a local -hook. -Not used yet; part of the next generation reparse mechanism") +For language specific hooks, make sure you define this as a local hook. +Not used yet; part of the next generation reparse mechanism.") (defvar semantic-no-reparse-needed-change-hook nil "Hooks run when a user edit is detected as not needing a reparse. If the hook returns non-nil, then declare that a reparse is needed. -For language specific hooks, make sure you define this as a local -hook. +For language specific hooks, make sure you define this as a local hook. Not used yet; part of the next generation reparse mechanism.") (defvar semantic-edits-new-change-hooks nil @@ -307,7 +305,7 @@ (semantic-tag-components (car tags))) ;; Ok, we are completely encompassed within the first tag ;; entry, AND that tag has children. This means that change - ;; occured outside of all children, but inside some tag + ;; occurred outside of all children, but inside some tag ;; with children. (if (or (not (semantic-tag-with-position-p (car list-to-search))) (> start (semantic-tag-end @@ -751,7 +749,7 @@ ;;;; Whitespace change ((and (not tags) (not newf-tags)) - ;; A change that occured outside of any existing tags + ;; A change that occurred outside of any existing tags ;; and there are no new tags to replace it. (when semantic-edits-verbose-flag (message "White space changes")) @@ -760,7 +758,7 @@ ;;;; New tags in old whitespace area. ((and (not tags) newf-tags) - ;; A change occured outside existing tags which added + ;; A change occurred outside existing tags which added ;; a new tag. We need to splice these tags back ;; into the cache at the right place. (semantic-edits-splice-insert newf-tags parent-tag cache-list) @@ -775,7 +773,7 @@ ;;;; Old tags removed ((and tags (not newf-tags)) - ;; A change occured where pre-existing tags were + ;; A change occurred where pre-existing tags were ;; deleted! Remove the tag from the cache. (semantic-edits-splice-remove tags parent-tag cache-list)
--- a/lisp/cedet/semantic/lex.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/cedet/semantic/lex.el Fri Jan 15 14:21:59 2010 +0000 @@ -900,7 +900,7 @@ Optional STR is the string for the token only if the bounds in the buffer do not cover the string they represent. (As from macro expansion.)" - ;; This if statement checks the existance of a STR argument at + ;; This if statement checks the existence of a STR argument at ;; compile time, where STR is some symbol or constant. If the ;; variable STr (runtime) is nil, this will make an incorrect decision. ;;
--- a/lisp/cedet/srecode/args.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/cedet/srecode/args.el Fri Jan 15 14:21:59 2010 +0000 @@ -33,7 +33,7 @@ ;; ;; Using :blank means that the template should force blank lines ;; before and after the template, reguardless of where the insertion -;; is occuring. +;; is occurring. (defun srecode-semantic-handle-:blank (dict) "Add macros into the dictionary DICT specifying blank line spacing. The wrapgap means make sure the first and last lines of the macro
--- a/lisp/cedet/srecode/insert.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/cedet/srecode/insert.el Fri Jan 15 14:21:59 2010 +0000 @@ -201,7 +201,7 @@ "Resolve arguments in the argument list ARGS. ARGS is a list of symbols, such as :blank, or :file. Apply values to DICT. -Optional argument TEMP is the template that is getting it's arguments resolved." +Optional argument TEMP is the template that is getting its arguments resolved." (let ((fcn nil)) (while args (setq fcn (intern-soft (concat "srecode-semantic-handle-" @@ -334,14 +334,14 @@ ((key :initform "\r" :allocation :class :documentation - "The character represeinting this inserter style. + "The character representing this inserter style. Can't be blank, or it might be used by regular variable insertion.") (where :initform 'begin :initarg :where :documentation - "This should be 'begin or 'end, indicating where to insrt a CR. + "This should be 'begin or 'end, indicating where to insert a CR. When set to 'begin, it will insert a CR if we are not at 'bol'. -When set to 'end it will insert a CR if we are not at 'eol'") +When set to 'end it will insert a CR if we are not at 'eol'.") ;; @TODO - Add slot and control for the number of blank ;; lines before and after point. ) @@ -407,7 +407,7 @@ :allocation :class :documentation "The character code used to identify inserters of this style.")) - "Insert the value of a dictionary entry + "Insert the value of a dictionary entry. If there is no entry, insert nothing.") (defvar srecode-inserter-variable-current-dictionary nil @@ -493,7 +493,7 @@ :documentation "The function used to read in the text for this prompt.") ) - "Insert the value of a dictionary entry + "Insert the value of a dictionary entry. If there is no entry, prompt the user for the value to use. The prompt text used is derived from the previous PROMPT command in the template file.") @@ -626,8 +626,8 @@ "The character code used to identify inserters of this style.") ) "Inserts the value of a dictionary variable with a specific width. -The second argument specifies the width, and a pad, seperated by a colon. -thus a specification of `10:left' will insert the value of A +The second argument specifies the width, and a pad, separated by a colon. +Thus a specification of `10:left' will insert the value of A to 10 characters, with spaces added to the left. Use `right' for adding spaces to the right.") @@ -771,7 +771,7 @@ "The character code used to identify inserters of this style.") (template :initarg :template :documentation - "A Template used to frame the codes from this inserter.") + "A template used to frame the codes from this inserter.") ) "Apply values from a sub-dictionary to a template section. The dictionary saved at the named dictionary entry will be @@ -806,7 +806,7 @@ :documentation "The character code used to identify inserters of this style.") ) - "All template segments between the secion-start and section-end + "All template segments between the section-start and section-end are treated specially.") (defmethod srecode-insert-method ((sti srecode-template-inserter-section-end) @@ -881,7 +881,7 @@ (setq active (cdr active))) (when (not tmpl) ;; If it wasn't in this context, look to see if it - ;; defines it's own context + ;; defines its own context (setq tmpl (srecode-template-get-table (srecode-table) templatenamepart))) ) @@ -897,7 +897,7 @@ dictionary) "Insert the STI inserter. Finds the template with this macro function part, and inserts it -with the dictionaries found in the dictinary." +with the dictionaries found in the dictionary." (srecode-insert-include-lookup sti dictionary) ;; Insert the template. ;; Our baseclass has a simple way to do this. @@ -952,7 +952,7 @@ "Insert the template STI. This will first insert the include part via inheritance, then insert the section it wraps into the location in the included -template where a ^ inserter occurs." +template where a ^ inserter occurs." ;; Step 1: Look up the included inserter (srecode-insert-include-lookup sti dictionary) ;; Step 2: Temporarilly override the point inserter.
--- a/lisp/composite.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/composite.el Fri Jan 15 14:21:59 2010 +0000 @@ -744,10 +744,14 @@ (setq func 'compose-gstring-for-terminal)) (funcall func gstring)))) +(make-variable-buffer-local 'auto-composition-mode) +(put 'auto-composition-mode 'permanent-local t) + (make-variable-buffer-local 'auto-composition-function) +(setq-default auto-composition-function 'auto-compose-chars) ;;;###autoload -(define-minor-mode auto-composition-mode +(defun auto-composition-mode (&optional arg) "Toggle Auto Composition mode. With ARG, turn Auto Composition mode off if and only if ARG is a non-positive number; if ARG is nil, toggle Auto Composition mode; anything else turns Auto @@ -758,29 +762,23 @@ You can use `global-auto-composition-mode' to turn on Auto Composition mode in all buffers (this is the default)." - nil nil nil - (if noninteractive - (setq auto-composition-mode nil)) - (cond (auto-composition-mode - (setq auto-composition-function 'auto-compose-chars)) - (t - (setq auto-composition-function nil)))) - -(defun turn-on-auto-composition-if-enabled () - (if enable-multibyte-characters - (auto-composition-mode 1))) + (interactive "P") + (setq auto-composition-mode + (if arg + (or (not (integerp arg)) (> arg 0)) + (not auto-composition-mode)))) ;;;###autoload -(define-global-minor-mode global-auto-composition-mode - auto-composition-mode turn-on-auto-composition-if-enabled - ;; This :extra-args' appears to be the result of a naive copy&paste - ;; from global-font-lock-mode. - ;; :extra-args (dummy) - :initialize 'custom-initialize-delay - :init-value (not noninteractive) - :group 'auto-composition - :version "23.1") - +(defun global-auto-composition-mode (&optional arg) + "Toggle Auto-Composition mode in every possible buffer. +With prefix arg, turn Global-Auto-Composition mode on if and only if arg +is positive. +See `auto-composition-mode' for more information on Auto-Composition mode." + (interactive "P") + (setq-default auto-composition-mode + (if arg + (or (not (integerp arg)) (> arg 0)) + (not (default-value 'auto-composition-mode))))) (defalias 'toggle-auto-composition 'auto-composition-mode)
--- a/lisp/emacs-lisp/eieio-base.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/emacs-lisp/eieio-base.el Fri Jan 15 14:21:59 2010 +0000 @@ -150,7 +150,7 @@ "The only instance of this class that will be instantiated. Multiple calls to `make-instance' will return this object.")) "This special class causes subclasses to be singletons. -A singleton is a class which will only ever have one instace." +A singleton is a class which will only ever have one instance." :abstract t) (defmethod constructor :STATIC ((class eieio-singleton) name &rest slots) @@ -309,7 +309,7 @@ (defmethod slot-missing ((obj eieio-named) slot-name operation &optional new-value) - "Called when a on-existant slot is accessed. + "Called when a non-existent slot is accessed. For variable `eieio-named', provide an imaginary `object-name' slot. Argument OBJ is the named object. Argument SLOT-NAME is the slot that was attempted to be accessed.
--- a/lisp/find-cmd.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/find-cmd.el Fri Jan 15 14:21:59 2010 +0000 @@ -122,7 +122,7 @@ (okdir . (1 find-command t))) "Holds details of each of the find options. The car of each alist is the name. The cdr is minimum args, the -function used to join many occurences of the argument together, +function used to join many occurrences of the argument together, and whether or not to leave quotes off the string (non-nil means the string will be quoted).")
--- a/lisp/frame.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/frame.el Fri Jan 15 14:21:59 2010 +0000 @@ -1525,6 +1525,7 @@ "Non-nil means highlight trailing whitespace. This is done in the face `trailing-whitespace'." :type 'boolean + :safe 'booleanp :group 'whitespace-faces)
--- a/lisp/gnus/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/gnus/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -5151,7 +5151,7 @@ * gnus-agent.el (directory-files-and-attributes): Move all the way forward (the third and final move). (gnus-agent-read-agentview): Trap reconstruction errors due to - nonexistant directory. Handle by returning nil. + nonexistent directory. Handle by returning nil. 2006-05-30 Didier Verna <didier@xemacs.org> @@ -12206,7 +12206,7 @@ (gnus-agent-set-local): Delete stored entry if either min, or max, are nil. (gnus-agent-fetch-session): Reworded error/quit messages. On - quit, use gnus-agent-regenerate-group to record existance of any + quit, use gnus-agent-regenerate-group to record existence of any articles fetched to disk before the quit occurred. (gnus-agent-expire-group-1): Use gnus-agent-with-refreshed-group, gnus-agent-update-view-total-fetched-for, and
--- a/lisp/gnus/gnus-diary.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/gnus/gnus-diary.el Fri Jan 15 14:21:59 2010 +0000 @@ -158,7 +158,7 @@ ;; I just ignore it. ;;;###autoload (defun gnus-user-format-function-d (header) - ;; Returns an aproximative delay string for the next occurence of this + ;; Returns an aproximative delay string for the next occurrence of this ;; message. The delay is given only in the first non zero unit. ;; Code partly stolen from article-make-date-line (let* ((extras (mail-header-extra header)) @@ -195,7 +195,7 @@ ;; I just ignore it. ;;;###autoload (defun gnus-user-format-function-D (header) - ;; Returns a formatted time string for the next occurence of this message. + ;; Returns a formatted time string for the next occurrence of this message. (let* ((extras (mail-header-extra header)) (sched (gnus-diary-header-schedule extras)) (occur (nndiary-next-occurence sched (current-time))))
--- a/lisp/gnus/nndiary.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/gnus/nndiary.el Fri Jan 15 14:21:59 2010 +0000 @@ -67,7 +67,7 @@ ;; IMHO, nnoo is actually badly designed. A much simpler, and yet more ;; powerful one would be to make *real* functions and variables for a new ;; back end based on another. Lisp is a reflexive language so that's a very -;; easy thing to do: inspect the function's form, replace occurences of +;; easy thing to do: inspect the function's form, replace occurrences of ;; <nnfrom> (even in strings) with <nnto>, and you're done. ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: @@ -1322,7 +1322,7 @@ (sort res 'time-less-p))) (defun nndiary-last-occurence (sched) - ;; Returns the last occurence of schedule SCHED as an Emacs time struct, or + ;; Returns the last occurrence of schedule SCHED as an Emacs time struct, or ;; nil for permanent schedule or errors. (let ((minute (nndiary-max (nth 0 sched))) (hour (nndiary-max (nth 1 sched))) @@ -1393,7 +1393,7 @@ (encode-time 0 minute hour (car days) month year time-zone))) ))))) - ;; There's an upper limit, but we didn't find any last occurence. + ;; There's an upper limit, but we didn't find any last occurrence. ;; This means that the schedule is undecidable. This can happen if ;; you happen to say something like "each Feb 31 until 2038". (progn @@ -1402,8 +1402,8 @@ )))) (defun nndiary-next-occurence (sched now) - ;; Returns the next occurence of schedule SCHED, starting from time NOW. - ;; If there's no next occurence, returns the last one (if any) which is then + ;; Returns the next occurrence of schedule SCHED, starting from time NOW. + ;; If there's no next occurrence, returns the last one (if any) which is then ;; in the past. (let* ((today (decode-time now)) (this-minute (nth 1 today)) @@ -1557,12 +1557,12 @@ ;; The article should be re-considered as unread if there's a reminder ;; between the group timestamp and the current time. (when (and sched (setq sched (nndiary-next-occurence sched now))) - (let ((reminders ;; add the next occurence itself at the end. + (let ((reminders ;; add the next occurrence itself at the end. (append (nndiary-compute-reminders sched) (list sched)))) (while (and reminders (time-less-p (car reminders) timestamp)) (pop reminders)) ;; The reminders might be empty if the last date is in the past, - ;; or we've got at least the next occurence itself left. All past + ;; or we've got at least the next occurrence itself left. All past ;; dates are renewed. (or (not reminders) (time-less-p (car reminders) now)))
--- a/lisp/gnus/nnml.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/gnus/nnml.el Fri Jan 15 14:21:59 2010 +0000 @@ -1200,7 +1200,7 @@ ;; #### already belongs to a range, whereas the corresponding ;; #### article doesn't exist (for example, if you delete an ;; #### article). For that reason, it is important to update - ;; #### the ranges (meaning remove inexistant articles) before + ;; #### the ranges (meaning remove inexistent articles) before ;; #### doing anything on them. ;; 2 a/ read articles: (let ((read (gnus-info-read info)))
--- a/lisp/gnus/webmail.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/gnus/webmail.el Fri Jan 15 14:21:59 2010 +0000 @@ -529,7 +529,7 @@ (widen))) (delete-region p (point-max)) (goto-char (point-min)) - ;; Some blank line to seperate mails. + ;; Some blank line to separate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") (insert "X-Gnus-Webmail: " (symbol-value 'user) "@" (symbol-name webmail-type) "\n") @@ -658,7 +658,7 @@ (setq p (point)))) (delete-region p (point-max)) (goto-char (point-min)) - ;; Some blank line to seperate mails. + ;; Some blank line to separate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") (insert "X-Gnus-Webmail: " (symbol-value 'user) "@" (symbol-name webmail-type) "\n") @@ -835,7 +835,7 @@ (setq mime (webmail-netaddress-single-part)) (widen)) (goto-char (point-min)) - ;; Some blank line to seperate mails. + ;; Some blank line to separate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") (insert "X-Gnus-Webmail: " (symbol-value 'user) "@" (symbol-name webmail-type) "\n") @@ -962,7 +962,7 @@ (setq mime (webmail-netaddress-single-part)) (widen)) (goto-char (point-min)) - ;; Some blank line to seperate mails. + ;; Some blank line to separate mails. (insert "\n\nFrom nobody " (current-time-string) "\n") (insert "X-Gnus-Webmail: " (symbol-value 'user) "@" (symbol-name webmail-type) "\n")
--- a/lisp/hexl.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/hexl.el Fri Jan 15 14:21:59 2010 +0000 @@ -779,11 +779,11 @@ (defun hexl-printable-character (ch) "Return a displayable string for character CH." - (format "%c" (if hexl-iso - (if (or (< ch 32) (and (>= ch 127) (< ch 160))) + (format "%c" (if (equal hexl-iso "") + (if (or (< ch 32) (>= ch 127)) 46 ch) - (if (or (< ch 32) (>= ch 127)) + (if (or (< ch 32) (and (>= ch 127) (< ch 160))) 46 ch))))
--- a/lisp/international/mule-cmds.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/international/mule-cmds.el Fri Jan 15 14:21:59 2010 +0000 @@ -226,19 +226,22 @@ ;; and delimiter characters. Support function of ;; coding-system-from-name. (defun canonicalize-coding-system-name (name) - (if (string-match "^iso[-_ ]?[0-9]" name) - ;; "iso-8859-1" -> "8859-1", "iso-2022-jp" ->"2022-jp" - (setq name (substring name (1- (match-end 0))))) - (let ((idx (string-match "[-_ /]" name))) - ;; Delete "-", "_", " ", "/" but do distinguish "16-be" and "16be". - (while idx - (if (and (>= idx 2) - (eq (string-match "16-[lb]e$" name (- idx 2)) - (- idx 2))) - (setq idx (string-match "[-_ /]" name (match-end 0))) - (setq name (concat (substring name 0 idx) (substring name (1+ idx))) - idx (string-match "[-_ /]" name idx)))) - name)) + (if (string-match "^\\(ms\\|ibm\\|windows-\\)\\([0-9]+\\)$" name) + ;; "ms950", "ibm950", "windows-950" -> "cp950" + (concat "cp" (match-string 2 name)) + (if (string-match "^iso[-_ ]?[0-9]" name) + ;; "iso-8859-1" -> "8859-1", "iso-2022-jp" ->"2022-jp" + (setq name (substring name (1- (match-end 0))))) + (let ((idx (string-match "[-_ /]" name))) + ;; Delete "-", "_", " ", "/" but do distinguish "16-be" and "16be". + (while idx + (if (and (>= idx 2) + (eq (string-match "16-[lb]e$" name (- idx 2)) + (- idx 2))) + (setq idx (string-match "[-_ /]" name (match-end 0))) + (setq name (concat (substring name 0 idx) (substring name (1+ idx))) + idx (string-match "[-_ /]" name idx)))) + name))) (defun coding-system-from-name (name) "Return a coding system whose name matches with NAME (string or symbol)."
--- a/lisp/log-view.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/log-view.el Fri Jan 15 14:21:59 2010 +0000 @@ -122,6 +122,9 @@ :group 'pcl-cvs :prefix "log-view-") +;; Needed because log-view-mode-map inherits from widget-keymap. (Bug#5311) +(require 'wid-edit) + (easy-mmode-defmap log-view-mode-map '(("z" . kill-this-buffer) ("q" . quit-window)
--- a/lisp/org/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/org/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -1,3 +1,8 @@ +2010-01-14 Juanma Barranquero <lekktu@gmail.com> + + * org-protocol.el (org-protocol-flatten-greedy, org-protocol-flatten): + Fix typos in docstrings. + 2010-01-01 Juanma Barranquero <lekktu@gmail.com> * org.el (org-get-outline-path, org-speed-command-help):
--- a/lisp/org/org-protocol.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/org/org-protocol.el Fri Jan 15 14:21:59 2010 +0000 @@ -355,9 +355,9 @@ ret )) (defun org-protocol-flatten-greedy (param-list &optional strip-path replacement) - "Greedy handlers might recieve a list like this from emacsclient: + "Greedy handlers might receive a list like this from emacsclient: '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") -where \"/dir/\" is the absolute path to emacsclients working directory. This +where \"/dir/\" is the absolute path to emacsclients working directory. This function transforms it into a flat list utilizing `org-protocol-flatten' and transforms the elements of that list as follows: @@ -400,10 +400,10 @@ (defun org-protocol-flatten (l) - "Greedy handlers might recieve a list like this from emacsclient: + "Greedy handlers might receive a list like this from emacsclient: '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") -where \"/dir/\" is the absolute path to emacsclients working directory. This -function transforms it into a flat list." +where \"/dir/\" is the absolute path to emacsclients working directory. +This function transforms it into a flat list." (if (null l) () (if (listp l) (append (org-protocol-flatten (car l)) (org-protocol-flatten (cdr l)))
--- a/lisp/paths.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/paths.el Fri Jan 15 14:21:59 2010 +0000 @@ -58,7 +58,7 @@ (list config-dir)) (unpruned-prefixes ;; Directory trees that may not exist at installation time, and - ;; so shouldn't be pruned based on existance. + ;; so shouldn't be pruned based on existence. '("/usr/local/")) (prefixes ;; Directory trees in which to look for info subdirectories
--- a/lisp/progmodes/ada-mode.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/ada-mode.el Fri Jan 15 14:21:59 2010 +0000 @@ -229,11 +229,13 @@ (const ada-no-auto-case)) :group 'ada) -;; FIXME If this is not something required by the ada language, this -;; should be removed. (defcustom ada-clean-buffer-before-saving t "*Non-nil means remove trailing spaces and untabify the buffer before saving." :type 'boolean :group 'ada) +(make-obsolete-variable 'ada-clean-buffer-before-saving + "use the `write-file-functions' hook." + "23.2") + (defcustom ada-indent 3 "*Size of Ada indentation. @@ -672,7 +674,7 @@ (defvar ada-subprog-start-re (eval-when-compile - (concat "\\<" (regexp-opt '("accept" "entry" "function" "package" "procedure" + (concat "\\<" (regexp-opt '("accept" "entry" "function" "overriding" "package" "procedure" "protected" "task") t) "\\>")) "Regexp for the start of a subprogram.") @@ -719,7 +721,7 @@ (defconst ada-imenu-comment-re "\\([ \t]*--.*\\)?") (defconst ada-imenu-subprogram-menu-re - (concat "^[ \t]*\\(procedure\\|function\\)[ \t\n]+" + (concat "^[ \t]*\\(overriding[ \t]*\\)?\\(procedure\\|function\\)[ \t\n]+" "\\(\\(\\sw\\|_\\)+\\)[ \t\n]*\\([ \t\n]\\|([^)]+)" ada-imenu-comment-re "\\)[ \t\n]*" @@ -727,7 +729,7 @@ (defvar ada-imenu-generic-expression (list - (list nil ada-imenu-subprogram-menu-re 2) + (list nil ada-imenu-subprogram-menu-re 3) (list "*Specs*" (concat "^[ \t]*\\(procedure\\|function\\)[ \t\n]+\\(\\(\\sw\\|_\\)+\\)" @@ -1303,14 +1305,6 @@ (set-syntax-table ada-mode-syntax-table) - (if ada-clean-buffer-before-saving - (progn - ;; remove all spaces at the end of lines in the whole buffer. - (add-hook 'local-write-file-hooks 'delete-trailing-whitespace) - ;; convert all tabs to the correct number of spaces. - (add-hook 'local-write-file-hooks - (lambda () (untabify (point-min) (point-max)))))) - (set (make-local-variable 'skeleton-further-elements) '((< '(backward-delete-char-untabify (min ada-indent (current-column)))))) @@ -2483,7 +2477,7 @@ (list (progn (back-to-indentation) (point)) 'ada-indent)) (save-excursion (ada-goto-stmt-start) - (if (looking-at "\\<package\\|procedure\\|function\\>") + (if (looking-at "\\<overriding\\|package\\|procedure\\|function\\>") (list (progn (back-to-indentation) (point)) 0) (list (progn (back-to-indentation) (point)) 'ada-indent))))) @@ -2632,20 +2626,23 @@ (looking-at "\\<\\(package\\|function\\|procedure\\)\\>")) (save-excursion ;; Go up until we find either a generic section, or the end of the - ;; previous subprogram/package + ;; previous subprogram/package, or 'overriding' for this function/procedure (let (found) (while (and (not found) (ada-search-ignore-string-comment - "\\<\\(generic\\|end\\|begin\\|package\\|procedure\\|function\\)\\>" t)) + "\\<\\(generic\\|end\\|begin\\|overriding\\|package\\|procedure\\|function\\)\\>" t)) ;; avoid "with procedure"... in generic parts (save-excursion (forward-word -1) (setq found (not (looking-at "with")))))) - (if (looking-at "generic") - (list (progn (back-to-indentation) (point)) 0) - (ada-indent-on-previous-lines nil orgpoint orgpoint)))) + (cond + ((looking-at "\\<generic\\|overriding\\>") + (list (progn (back-to-indentation) (point)) 0)) + + (t + (ada-indent-on-previous-lines nil orgpoint orgpoint))))) ;;--------------------------------- ;; label @@ -4571,6 +4568,8 @@ (define-key ada-mode-extra-map "u" 'ada-prj-edit) + (define-key ada-mode-map "\C-xnd" 'ada-narrow-to-defun); override narrow-to-defun + ;; The templates, defined in ada-stmt.el (let ((map (make-sparse-keymap))) @@ -5063,7 +5062,7 @@ ;; Get the function name, but not the properties, or this changes ;; the face in the modeline on Emacs 21 - (setq func-name (match-string-no-properties 2)) + (setq func-name (match-string-no-properties 3)) (if (and (not (ada-in-comment-p)) (not (save-excursion (goto-char (match-end 0))
--- a/lisp/progmodes/ada-stmt.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/ada-stmt.el Fri Jan 15 14:21:59 2010 +0000 @@ -187,7 +187,7 @@ (define-skeleton ada-if - "Insert skeleton if statment, prompting for a boolean-expression." + "Insert skeleton if statement, prompting for a boolean-expression." "[condition]: " "if " str " then" \n > _ \n
--- a/lisp/progmodes/ada-xref.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/ada-xref.el Fri Jan 15 14:21:59 2010 +0000 @@ -755,7 +755,7 @@ (let ((file (buffer-file-name nil))) (list ;; variable name alphabetical order - 'ada_project_path "" + 'ada_project_path (or (getenv "ADA_PROJECT_PATH") "") 'ada_project_path_sep ada-prj-ada-project-path-sep 'bind_opt ada-prj-default-bind-opt 'build_dir default-directory
--- a/lisp/progmodes/cc-defs.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/cc-defs.el Fri Jan 15 14:21:59 2010 +0000 @@ -1010,7 +1010,7 @@ `(c-clear-char-property-fun ,pos ',property)))) (defmacro c-clear-char-properties (from to property) - ;; Remove all the occurences of the given property in the given + ;; Remove all the occurrences of the given property in the given ;; region that has been put with `c-put-char-property'. PROPERTY is ;; assumed to be constant. ;; @@ -1035,7 +1035,7 @@ properties are assumed to be over individual characters, having been put there by c-put-char-property. POINT remains unchanged." (let ((place from) end-place) - (while ; loop round occurrances of (PROPERTY VALUE) + (while ; loop round occurrences of (PROPERTY VALUE) (progn (while ; loop round changes in PROPERTY till we find VALUE (and
--- a/lisp/progmodes/cc-engine.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/cc-engine.el Fri Jan 15 14:21:59 2010 +0000 @@ -447,7 +447,7 @@ (c-put-char-property pos 'c-type value)) (defun c-clear-c-type-property (from to value) - ;; Remove all occurences of the c-type property that has the given + ;; Remove all occurrences of the c-type property that has the given ;; value in the region between FROM and TO. VALUE is assumed to not ;; be nil. ;; @@ -555,7 +555,7 @@ statements/declarations on the same level are considered, i.e. don't move into or out of sexps (not even normal expression parentheses). -If point is already at the earliest statment within braces or parens, +If point is already at the earliest statement within braces or parens, this function doesn't move back into any whitespace preceding it; it returns 'same in this case. @@ -605,7 +605,7 @@ ;; The bulk of this function is a pushdown automaton that looks at statement ;; boundaries and the tokens (such as "while") in c-opt-block-stmt-key. Its ;; purpose is to keep track of nested statements, ensuring that such - ;; statments are skipped over in their entirety (somewhat akin to what C-M-p + ;; statements are skipped over in their entirety (somewhat akin to what C-M-p ;; does with nested braces/brackets/parentheses). ;; ;; Note: The position of a boundary is the following token. @@ -4394,7 +4394,7 @@ ;; `c-decl-prefix-or-start-re' when that submatch matches. ;; o The start of each `c-decl-prefix-or-start-re' match when ;; submatch 1 doesn't match. - ;; o The first token after the end of each occurence of the + ;; o The first token after the end of each occurrence of the ;; `c-type' text property with the value `c-decl-end', provided ;; `c-type-decl-end-used' is set. ;;
--- a/lisp/progmodes/cc-fonts.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/cc-fonts.el Fri Jan 15 14:21:59 2010 +0000 @@ -1327,7 +1327,7 @@ ,@(when (c-lang-const c-recognize-<>-arglists) `(c-font-lock-<>-arglists)) - ;; The first two rules here mostly find occurences that + ;; The first two rules here mostly find occurrences that ;; `c-font-lock-declarations' has found already, but not ;; declarations containing blocks in the type (see note below). ;; It's also useful to fontify these everywhere to show e.g. when @@ -2117,7 +2117,7 @@ (defun c-find-invalid-doc-markup (regexp limit) ;; Used to fontify invalid markup in doc comments after the correct - ;; ones have been fontified: Find the first occurence of REGEXP + ;; ones have been fontified: Find the first occurrence of REGEXP ;; between the point and LIMIT that only is fontified with ;; `c-doc-face-name'. If a match is found then submatch 0 surrounds ;; the first char and t is returned, otherwise nil is returned.
--- a/lisp/progmodes/delphi.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/delphi.el Fri Jan 15 14:21:59 2010 +0000 @@ -1370,7 +1370,7 @@ ;; Indent in from the expression. (delphi-indent-of last-token delphi-indent-level)) - ;; No enclosing expression; use the previous statment's + ;; No enclosing expression; use the previous statement's ;; indent. ((delphi-previous-indent-of token)))))
--- a/lisp/progmodes/flymake.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/flymake.el Fri Jan 15 14:21:59 2010 +0000 @@ -643,7 +643,7 @@ (flymake-report-status "" "") ; PASSED (if (not flymake-check-was-interrupted) (flymake-report-fatal-status "CFGERR" - (format "Configuration error has occured while running %s" command)) + (format "Configuration error has occurred while running %s" command)) (flymake-report-status nil ""))) ; "STOPPED" (flymake-report-status (format "%d/%d" err-count warn-count) ""))))
--- a/lisp/progmodes/gdb-ui.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/gdb-ui.el Fri Jan 15 14:21:59 2010 +0000 @@ -1814,7 +1814,7 @@ Field names are wrapped in double quotes and equal signs are replaced with semicolons. -If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurences from +If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurrences from partial output. This is used to get rid of useless keys in lists in MI messages, e.g.: [key=.., key=..]. -stack-list-frames and -break-info are examples of MI commands which issue such
--- a/lisp/progmodes/idlwave.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/progmodes/idlwave.el Fri Jan 15 14:21:59 2010 +0000 @@ -4607,7 +4607,7 @@ (defun idlwave-shorten-syntax (syntax name &optional class) - ;; From a list of syntax statments, shorten with %s and group with "or" + ;; From a list of syntax statements, shorten with %s and group with "or" (let ((case-fold-search t)) (mapconcat (lambda (x)
--- a/lisp/term/x-win.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/term/x-win.el Fri Jan 15 14:21:59 2010 +0000 @@ -1197,7 +1197,7 @@ ;; We keep track of the last text selected here, so we can check the ;; current selection against it, and avoid passing back our own text ;; from x-cut-buffer-or-selection-value. We track all three -;; seperately in case another X application only sets one of them +;; separately in case another X application only sets one of them ;; (say the cut buffer) we aren't fooled by the PRIMARY or ;; CLIPBOARD selection staying the same. (defvar x-last-selected-text-clipboard nil
--- a/lisp/textmodes/bibtex.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/textmodes/bibtex.el Fri Jan 15 14:21:59 2010 +0000 @@ -2181,7 +2181,7 @@ (if (memq 'realign format) (bibtex-fill-entry))))) - ;; Unwindform: move point to location where error occured if possible + ;; Unwindform: move point to location where error occurred if possible (if error-field-name (let (bounds) (when (save-excursion
--- a/lisp/textmodes/ispell.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/textmodes/ispell.el Fri Jan 15 14:21:59 2010 +0000 @@ -407,7 +407,7 @@ (if (memq system-type '(windows-nt ms-dos)) "-Ei" "-i") "String of options to use when running the program in `ispell-grep-command'. Should probably be \"-i\" or \"-e\". -Some machines (like the NeXT) don't support \"-i\"" +Some machines (like the NeXT) don't support \"-i\"." :type 'string :group 'ispell) @@ -729,7 +729,7 @@ in English. This has the same effect as the command-line `-T' option. The buffer Major Mode controls Ispell's parsing in tex or nroff mode, but the dictionary can control the extended character mode. -Both defaults can be overruled in a buffer-local fashion. See +Both defaults can be overruled in a buffer-local fashion. See `ispell-parsing-keyword' for details on this. CHARACTER-SET used for languages with multibyte characters. @@ -744,7 +744,7 @@ "Command line option prefix to select UTF-8 if supported, nil otherwise. If UTF-8 if supported by spellchecker and is selectable from the command line this variable will contain \"--encoding=\" for aspell and \"-i \" for hunspell, -so UTF-8 or other mime charsets can be selected. That will be set for hunspell +so UTF-8 or other mime charsets can be selected. That will be set for hunspell >=1.1.6 or aspell >= 0.60 in `ispell-check-version'. For aspell non-nil means to try to automatically find aspell dictionaries. @@ -752,9 +752,9 @@ this would require some extra guessing in `ispell-aspell-find-dictionary'.") (defvar ispell-aspell-supports-utf8 nil - "Non nil if aspell has consistent command line UTF-8 support. Obsolete. + "Non nil if aspell has consistent command line UTF-8 support. Obsolete. ispell.el and flyspell.el will use for this purpose the more generic -variable `ispell-encoding8-command' for both aspell and hunspell. Is left +variable `ispell-encoding8-command' for both aspell and hunspell. Is left here just for backwards compatibility.") (make-obsolete-variable 'ispell-aspell-supports-utf8 @@ -1048,7 +1048,7 @@ ;; Set params according to the selected spellchecker (defvar ispell-last-program-name nil - "Last value of `ispell-program-name'. Internal use.") + "Last value of `ispell-program-name'. Internal use.") (defvar ispell-initialize-spellchecker-hook nil "Normal hook run on spellchecker initialization. @@ -1956,7 +1956,7 @@ ;; If the user types C-g, or generates some other ;; non-character event (such as a frame switch ;; event), stop ispell. As a special exception, - ;; ignore mouse events occuring in the same frame. + ;; ignore mouse events occurring in the same frame. (while (and input-valid (not (characterp char))) (setq char (read-key)) (setq input-valid @@ -2184,7 +2184,7 @@ `a': Accept word for this session. `A': Accept word and place in `buffer-local dictionary'. `r': Replace word with typed-in value. Rechecked. -`R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. +`R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. `?': Show these commands. `x': Exit spelling buffer. Move cursor to original point. `X': Exit spelling buffer. Leaves cursor at the current point, and permits @@ -2216,7 +2216,7 @@ `a': Accept word for this session. `A': Accept word and place in `buffer-local dictionary'. `r': Replace word with typed-in value. Rechecked. -`R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. +`R': Replace word with typed-in value. Query-replaced in buffer. Rechecked. `?': Show these commands. `x': Exit spelling buffer. Move cursor to original point. `X': Exit spelling buffer. Leaves cursor at the current point, and permits
--- a/lisp/vc-arch.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/vc-arch.el Fri Jan 15 14:21:59 2010 +0000 @@ -213,7 +213,7 @@ 'names)))) (defun vc-arch-root (file) - "Return the root directory of a Arch project, if any." + "Return the root directory of an Arch project, if any." (or (vc-file-getprop file 'arch-root) ;; Check the =tagging-method, in case someone naively manually ;; creates a {arch} directory somewhere.
--- a/lisp/vc-bzr.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/vc-bzr.el Fri Jan 15 14:21:59 2010 +0000 @@ -363,8 +363,9 @@ (let ((l-c-parent-dir (match-string 1))) (when (and (memq system-type '(ms-dos windows-nt)) (string-match-p "^/[[:alpha:]]:" l-c-parent-dir)) - ;;; On Windows, file:// URLs often have three slashes, - ;;; so we must remove the remaining one (bug#5345) + ;;; The non-Windows code takes a shortcut by using the host/path + ;;; separator slash as the start of the absolute path. That + ;;; does not work on Windows, so we must remove it (bug#5345) (setq l-c-parent-dir (substring l-c-parent-dir 1))) (setq branch-format-file (expand-file-name vc-bzr-admin-branch-format-file
--- a/lisp/vc-svn.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/vc-svn.el Fri Jan 15 14:21:59 2010 +0000 @@ -487,13 +487,13 @@ ;; subsequent commits. At least that's what the ;; vc-cvs.el code does. "-rHEAD:0")) - (when limit (list "-l" (format "%s" limit)))))) + (when limit (list "--limit" (format "%s" limit)))))) ;; Dump log for the entire directory. (apply 'vc-svn-command buffer 0 nil "log" (append (list (if start-revision (format "-r%s" start-revision) "-rHEAD:0")) - (when limit (list "-l" (format "%s" limit))))))))) + (when limit (list "--limit" (format "%s" limit))))))))) (defun vc-svn-diff (files &optional oldvers newvers buffer) "Get a difference report using SVN between two revisions of fileset FILES."
--- a/lisp/wid-edit.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/wid-edit.el Fri Jan 15 14:21:59 2010 +0000 @@ -875,7 +875,8 @@ (define-key map [(control ?m)] 'widget-button-press) map) "Keymap containing useful binding for buffers containing widgets. -Recommended as a parent keymap for modes using widgets.") +Recommended as a parent keymap for modes using widgets. +Note that such modes will need to require wid-edit.") (defvar widget-global-map global-map "Keymap used for events a widget does not handle itself.")
--- a/lisp/window.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/window.el Fri Jan 15 14:21:59 2010 +0000 @@ -77,9 +77,9 @@ The return value does not include the mode line or the header line, if any. If a line at the bottom of the window is only -partially visible, that line is included in the return value. If -you do not want to include a partially visible bottom line in the -return value, use `window-text-height' instead." +partially visible, that line is included in the return value. +If you do not want to include a partially visible bottom line +in the return value, use `window-text-height' instead." (or window (setq window (selected-window))) (if (window-minibuffer-p window) (window-height window) @@ -785,7 +785,7 @@ (defcustom pop-up-frames nil "Whether `display-buffer' should make a separate frame. -If nil, never make a seperate frame. +If nil, never make a separate frame. If the value is `graphic-only', make a separate frame on graphic displays only. Any other non-nil value means always make a separate frame." @@ -1006,7 +1006,7 @@ (not (eq window (selected-window))) ;; Don't resize minibuffer windows. (not (window-minibuffer-p (selected-window))) - (> (window-height (selected-window)) (window-height window)) + (> (window-height (selected-window)) (window-height window)) (eq (window-frame window) (window-frame (selected-window))) (let ((sel-edges (window-edges (selected-window))) (win-edges (window-edges window)))
--- a/src/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/src/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -1,3 +1,35 @@ +2010-01-15 Kenichi Handa <handa@m17n.org> + + * xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS. Callers changed. + +2010-01-15 Chong Yidong <cyd@stupidchicken.com> + + * nsterm.m (Qnone): Define. + + * nsfns.m (Qnone): Move definition to nsterm.m. + +2010-01-14 Kenichi Handa <handa@m17n.org> + + * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding + systems. + +2010-01-14 Kenichi Handa <handa@m17n.org> + + Make auto-composition work on all buffers even if they are + fundamental mode. + + * composite.c (Vauto_composition_mode): New variable. + (composition_compute_stop_pos): Check Vauto_composition_mode + instead of Vauto_composition_function. + (composition_adjust_point, Ffind_composition_internal): Likewise. + (syms_of_composite): Declare Lisp variable + "auto-composition-mode" here. + +2010-01-13 Chong Yidong <cyd@stupidchicken.com> + + * xterm.c (x_term_init): Avoid garbage-collecting the new terminal + during call to vendor-specific-keysyms (Bug#5365). + 2010-01-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * keyboard.c (input_available_signal) [SYNC_INPUT]:
--- a/src/ChangeLog.3 Wed Jan 13 14:05:08 2010 +0000 +++ b/src/ChangeLog.3 Fri Jan 15 14:21:59 2010 +0000 @@ -4776,7 +4776,7 @@ New struct face with associated typedef FACE declared, along with accessing macros. - * scroll.c (do_scrolling): Don't bcopy non-existant `nruns' or + * scroll.c (do_scrolling): Don't bcopy non-existent `nruns' or `face_list' elements. Do copy new `max_ascent' frame element. * dispnew.c (scroll_frame_lines): All references to frame elements
--- a/src/ChangeLog.8 Wed Jan 13 14:05:08 2010 +0000 +++ b/src/ChangeLog.8 Fri Jan 15 14:21:59 2010 +0000 @@ -11848,7 +11848,7 @@ * w32fns.c (w32_strict_fontnames): New variable. (Fx_create_frame): Formatting fix. - (w32_load_system_font): Keep trying to load non-existant font + (w32_load_system_font): Keep trying to load non-existent font if w32_strict_fontnames is nil. Formatting fix. (syms_of_w32fns): Add w32-strict-fontnames.
--- a/src/ChangeLog.9 Wed Jan 13 14:05:08 2010 +0000 +++ b/src/ChangeLog.9 Fri Jan 15 14:21:59 2010 +0000 @@ -834,7 +834,7 @@ 2001-10-02 Miles Bader <miles@gnu.org> * textprop.c (Fnext_char_property_change) - (Fprevious_char_property_change): Remove reference to non-existant + (Fprevious_char_property_change): Remove reference to non-existent argument OBJECT from doc-string. 2001-10-01 Gerd Moellmann <gerd@gnu.org>
--- a/src/coding.c Wed Jan 13 14:05:08 2010 +0000 +++ b/src/coding.c Fri Jan 15 14:21:59 2010 +0000 @@ -3239,9 +3239,13 @@ int i = 1; while (src < src_end) { + src_base = src; ONE_MORE_BYTE (c); if (c < 0xA0) - break; + { + src = src_base; + break; + } i++; }
--- a/src/composite.c Wed Jan 13 14:05:08 2010 +0000 +++ b/src/composite.c Fri Jan 15 14:21:59 2010 +0000 @@ -157,6 +157,7 @@ Lisp_Object Vcompose_chars_after_function; Lisp_Object Qauto_composed; +Lisp_Object Vauto_composition_mode; Lisp_Object Vauto_composition_function; Lisp_Object Qauto_composition_function; Lisp_Object Vcomposition_function_table; @@ -1039,7 +1040,7 @@ if (NILP (string) && PT > charpos && PT < endpos) cmp_it->stop_pos = PT; if (NILP (current_buffer->enable_multibyte_characters) - || ! FUNCTIONP (Vauto_composition_function)) + || NILP (Vauto_composition_mode)) return; if (bytepos < 0) { @@ -1478,7 +1479,7 @@ } if (NILP (current_buffer->enable_multibyte_characters) - || ! FUNCTIONP (Vauto_composition_function)) + || NILP (Vauto_composition_mode)) return new_pt; /* Next check the automatic composition. */ @@ -1661,7 +1662,7 @@ if (!find_composition (from, to, &start, &end, &prop, string)) { if (!NILP (current_buffer->enable_multibyte_characters) - && FUNCTIONP (Vauto_composition_function) + && ! NILP (Vauto_composition_mode) && find_automatic_composition (from, to, &start, &end, &gstring, string)) return list3 (make_number (start), make_number (end), gstring); @@ -1788,6 +1789,11 @@ Qauto_composition_function = intern_c_string ("auto-composition-function"); staticpro (&Qauto_composition_function); + DEFVAR_LISP ("auto-composition-mode", &Vauto_composition_mode, + doc: /* Non-nil if Auto-Composition mode is enabled. +Use the command `auto-composition-mode' to change this variable. */); + Vauto_composition_mode = Qt; + DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function, doc: /* Function to call to compose characters automatically. This function is called from the display routine with four arguments:
--- a/src/emacs.c Wed Jan 13 14:05:08 2010 +0000 +++ b/src/emacs.c Fri Jan 15 14:21:59 2010 +0000 @@ -157,7 +157,7 @@ extern void *malloc_get_state (); /* From glibc, a routine that overwrites the malloc internal state. */ extern int malloc_set_state (); -/* Non-zero if the MALLOC_CHECK_ enviroment variable was set while +/* Non-zero if the MALLOC_CHECK_ environment variable was set while dumping. Used to work around a bug in glibc's malloc. */ int malloc_using_checking; #endif
--- a/src/nsfns.m Wed Jan 13 14:05:08 2010 +0000 +++ b/src/nsfns.m Fri Jan 15 14:21:59 2010 +0000 @@ -80,8 +80,8 @@ extern Lisp_Object Qunderline, Qundefined; extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth; extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle; - -Lisp_Object Qnone; +extern Lisp_Object Qnone; + Lisp_Object Qbuffered; Lisp_Object Qfontsize; @@ -2606,8 +2606,6 @@ { int i; - Qnone = intern ("none"); - staticpro (&Qnone); Qfontsize = intern ("fontsize"); staticpro (&Qfontsize);
--- a/src/nsterm.m Wed Jan 13 14:05:08 2010 +0000 +++ b/src/nsterm.m Fri Jan 15 14:21:59 2010 +0000 @@ -141,8 +141,7 @@ Lisp_Object ns_input_spi_name, ns_input_spi_arg; Lisp_Object Vx_toolkit_scroll_bars; static Lisp_Object Qmodifier_value; -/* TODO: unsure why these defined in term files, anyway we need in keymap.c */ -Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper; +Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone; extern Lisp_Object Qcursor_color, Qcursor_type, Qns; /* Specifies which emacs modifier should be generated when NS receives @@ -6151,6 +6150,7 @@ DEFSYM (Qmeta, "meta"); DEFSYM (Qsuper, "super"); DEFSYM (Qcontrol, "control"); + DEFSYM (Qnone, "none"); Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
--- a/src/w32uniscribe.c Wed Jan 13 14:05:08 2010 +0000 +++ b/src/w32uniscribe.c Fri Jan 15 14:21:59 2010 +0000 @@ -22,7 +22,7 @@ Windows 2000, though most users of older systems will have it since it installs with Internet Explorer 5.0 and other software. We only enable the feature if it is available, so there is no chance - of calling non-existant functions. */ + of calling non-existent functions. */ #undef _WIN32_WINNT #define _WIN32_WINNT 0x500 #include <windows.h>
--- a/src/xdisp.c Wed Jan 13 14:05:08 2010 +0000 +++ b/src/xdisp.c Fri Jan 15 14:21:59 2010 +0000 @@ -5638,11 +5638,11 @@ /* Return 1 iff a character at CHARPOS (and BYTEPOS) is composed (possibly with the following characters). */ -#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS) \ +#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS,END_CHARPOS) \ ((IT)->cmp_it.id >= 0 \ || ((IT)->cmp_it.stop_pos == (CHARPOS) \ && composition_reseat_it (&(IT)->cmp_it, CHARPOS, BYTEPOS, \ - (IT)->end_charpos, (IT)->w, \ + END_CHARPOS, (IT)->w, \ FACE_FROM_ID ((IT)->f, (IT)->face_id), \ (IT)->string))) @@ -6300,7 +6300,7 @@ return 0; } else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it), - IT_STRING_BYTEPOS (*it)) + IT_STRING_BYTEPOS (*it), SCHARS (it->string)) && next_element_from_composition (it)) { return 1; @@ -6336,7 +6336,7 @@ CHARPOS (position) = BYTEPOS (position) = -1; } else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it), - IT_STRING_BYTEPOS (*it)) + IT_STRING_BYTEPOS (*it), it->string_nchars) && next_element_from_composition (it)) { return 1; @@ -6523,7 +6523,8 @@ && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos) run_redisplay_end_trigger_hook (it); - if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it)) + if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it), + it->end_charpos) && next_element_from_composition (it)) { return 1;
--- a/src/xterm.c Wed Jan 13 14:05:08 2010 +0000 +++ b/src/xterm.c Fri Jan 15 14:21:59 2010 +0000 @@ -10218,13 +10218,16 @@ if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) { char *vendor = ServerVendor (dpy); - /* Temporarily hide the partially initialized terminal */ + /* Temporarily hide the partially initialized terminal, + but make sure it doesn't get garbage collected. */ + int count = inhibit_garbage_collection (); terminal_list = terminal->next_terminal; UNBLOCK_INPUT; terminal->kboard->Vsystem_key_alist = call1 (Qvendor_specific_keysyms, vendor ? build_string (vendor) : empty_unibyte_string); BLOCK_INPUT; + unbind_to (count, Qnil); terminal->next_terminal = terminal_list; terminal_list = terminal; }
--- a/test/ChangeLog Wed Jan 13 14:05:08 2010 +0000 +++ b/test/ChangeLog Fri Jan 15 14:21:59 2010 +0000 @@ -1,3 +1,9 @@ +2010-01-14 Juanma Barranquero <lekktu@gmail.com> + + * cedet/cedet-utests.el (cedet-utest-log-shutdown, pulse-test): + * cedet/semantic-ia-utest.el (semantic-ia-utest-error-log-list) + (semantic-ia-utest-buffer-refs): Fix typos in docstrings. + 2009-12-18 Ulf Jasper <ulf.jasper@web.de> * icalendar-testsuite.el
--- a/test/cedet/cedet-utests.el Wed Jan 13 14:05:08 2010 +0000 +++ b/test/cedet/cedet-utests.el Fri Jan 15 14:21:59 2010 +0000 @@ -236,7 +236,7 @@ (defun cedet-utest-log-shutdown (title &optional errorcondition) "Shut-down a larger test suite. TITLE is the section that is done. -ERRORCONDITION is some error that may have occured durinig testing." +ERRORCONDITION is some error that may have occurred during testing." (let ((endtime (current-time)) ) (cedet-utest-log-shutdown-msg title cedet-utest-log-timer endtime) @@ -466,7 +466,7 @@ (defun pulse-test (&optional no-error) "Test the lightening function for pulsing a line. -When optional NO-ERROR Don't throw an error if we can't run tests." +When optional NO-ERROR don't throw an error if we can't run tests." (interactive) (if (or (not pulse-flag) (not (pulse-available-p))) (if no-error
--- a/test/cedet/semantic-ia-utest.el Wed Jan 13 14:05:08 2010 +0000 +++ b/test/cedet/semantic-ia-utest.el Fri Jan 15 14:21:59 2010 +0000 @@ -54,7 +54,7 @@ "List of files with analyzer completion test points.") (defvar semantic-ia-utest-error-log-list nil - "List of errors occuring during a run.") + "List of errors occurring during a run.") ;;;###autoload (defun semantic-ia-utest (&optional arg) @@ -211,7 +211,7 @@ )) (defun semantic-ia-utest-buffer-refs () - "Run a analyze-refs unit-test pass in the current buffer." + "Run an analyze-refs unit-test pass in the current buffer." (let* ((idx 1) (regex-p nil)