Now on revision 106487. ------------------------------------------------------------ revno: 106487 fixes bug(s): http://debbugs.gnu.org/7743 author: Mark Lillibridge committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 23:49:53 -0800 message: * lisp/mail/unrmail.el (unrmail): Always add blank line. (tiny change) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 07:41:17 +0000 +++ lisp/ChangeLog 2011-11-23 07:49:53 +0000 @@ -1,3 +1,7 @@ +2011-11-23 Mark Lillibridge (tiny change) + + * mail/unrmail.el (unrmail): Always add blank line. (Bug#7743) + 2011-11-23 Glenn Morris * mail/rmail.el (rmail-forward): === modified file 'lisp/mail/unrmail.el' --- lisp/mail/unrmail.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/unrmail.el 2011-11-23 07:49:53 +0000 @@ -231,10 +231,9 @@ (while (search-forward "\nFrom " nil t) (forward-char -5) (insert ?>))) - ;; Make sure the message ends with two newlines (goto-char (point-max)) - (unless (looking-back "\n\n") - (insert "\n")) + ;; Add terminator blank line to message. + (insert "\n") ;; Write it to the output file, suitably encoded. (let ((coding-system-for-write coding)) (write-region (point-min) (point-max) to-file t ------------------------------------------------------------ revno: 106486 fixes bug(s): http://debbugs.gnu.org/10082 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 23:41:17 -0800 message: Rmail trivia: give explicit errors for empty folders. * mail/rmail.el (rmail-forward): * mail/rmailkwd.el (rmail-set-label): * mail/rmailout.el (rmail-output, rmail-output-as-seen) (rmail-output-body-to-file): Give error if no message. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 07:31:39 +0000 +++ lisp/ChangeLog 2011-11-23 07:41:17 +0000 @@ -1,5 +1,10 @@ 2011-11-23 Glenn Morris + * mail/rmail.el (rmail-forward): + * mail/rmailkwd.el (rmail-set-label): + * mail/rmailout.el (rmail-output, rmail-output-as-seen) + (rmail-output-body-to-file): Give error if no message. (Bug#10082) + * mail/rmail.el (rmail-current-message): Doc fix. * mail/rmail.el (rmail-message-filter): Mark as obsolete. (Bug#2624) === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-23 07:31:39 +0000 +++ lisp/mail/rmail.el 2011-11-23 07:41:17 +0000 @@ -3786,6 +3786,8 @@ With prefix argument, \"resend\" the message instead of forwarding it; see the documentation of `rmail-resend'." (interactive "P") + (if (zerop rmail-current-message) + (error "No message to forward")) (if resend (call-interactively 'rmail-resend) (let ((forward-buffer rmail-buffer) === modified file 'lisp/mail/rmailkwd.el' --- lisp/mail/rmailkwd.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/rmailkwd.el 2011-11-23 07:41:17 +0000 @@ -96,7 +96,8 @@ (error "More than one label specified")) (with-current-buffer rmail-buffer (rmail-maybe-set-message-counters) - (or msg (setq msg rmail-current-message)) + (if (zerop (or msg (setq msg rmail-current-message))) + (error "No message")) ;; Force recalculation of summary for this message. (aset rmail-summary-vector (1- msg) nil) (let (attr-index) === modified file 'lisp/mail/rmailout.el' --- lisp/mail/rmailout.el 2011-11-15 00:34:01 +0000 +++ lisp/mail/rmailout.el 2011-11-23 07:41:17 +0000 @@ -468,6 +468,8 @@ (if rmail-buffer (set-buffer rmail-buffer) (error "There is no Rmail buffer")) + (if (zerop rmail-total-messages) + (error "No messages to output")) (let ((orig-count count) beg end) (while (> count 0) @@ -533,6 +535,8 @@ (if rmail-buffer (set-buffer rmail-buffer) (error "There is no Rmail buffer")) + (if (zerop rmail-total-messages) + (error "No messages to output")) (let ((orig-count count) (cur (current-buffer))) (while (> count 0) @@ -594,6 +598,8 @@ (expand-file-name file-name (and rmail-default-body-file (file-name-directory rmail-default-body-file)))) + (if (zerop rmail-current-message) + (error "No message to output")) (save-excursion (goto-char (point-min)) (search-forward "\n\n") ------------------------------------------------------------ revno: 106485 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 23:31:39 -0800 message: * lisp/mail/rmail.el (rmail-current-message): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 07:17:48 +0000 +++ lisp/ChangeLog 2011-11-23 07:31:39 +0000 @@ -1,5 +1,7 @@ 2011-11-23 Glenn Morris + * mail/rmail.el (rmail-current-message): Doc fix. + * mail/rmail.el (rmail-message-filter): Mark as obsolete. (Bug#2624) 2011-11-22 Stefan Monnier === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-23 07:17:48 +0000 +++ lisp/mail/rmail.el 2011-11-23 07:31:39 +0000 @@ -557,7 +557,9 @@ ;; Message counters and markers. Deleted flags. (defvar rmail-current-message nil - "Integer specifying the message currently being displayed in this folder.") + "Integer specifying the message currently being displayed in this folder. +Counts messages from 1 to `rmail-total-messages'. A value of 0 +means there are no messages in the folder.") (put 'rmail-current-message 'permanent-local t) (defvar rmail-total-messages nil ------------------------------------------------------------ revno: 106484 fixes bug(s): http://debbugs.gnu.org/2624 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 23:17:48 -0800 message: * lisp/mail/rmail.el (rmail-message-filter): Mark as obsolete. * etc/NEWS: Mention this. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-11-22 21:53:59 +0000 +++ etc/NEWS 2011-11-23 07:17:48 +0000 @@ -725,6 +725,11 @@ *** The command `rmail-epa-decrypt' decrypts OpenPGP data in the Rmail incoming message. +--- +*** The variable `rmail-message-filter' no longer has any effect. +This change was made in Emacs 23.1 but was not advertised at the time. +Try using `rmail-show-message-hook' instead. + ** Shell mode *** Shell mode uses pcomplete rules, with the standard completion UI. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-22 15:18:56 +0000 +++ lisp/ChangeLog 2011-11-23 07:17:48 +0000 @@ -1,3 +1,7 @@ +2011-11-23 Glenn Morris + + * mail/rmail.el (rmail-message-filter): Mark as obsolete. (Bug#2624) + 2011-11-22 Stefan Monnier * server.el (server-eval-and-print): Allow C-g (bug#6585). === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-22 11:35:26 +0000 +++ lisp/mail/rmail.el 2011-11-23 07:17:48 +0000 @@ -482,6 +482,7 @@ ;; It's not clear what it should do now, since there is nothing that ;; records when a message is shown for the first time (unseen is not ;; necessarily the same thing). +;; See http://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00013.html (defcustom rmail-message-filter nil "If non-nil, a filter function for new messages in RMAIL. Called with region narrowed to the message, including headers, @@ -489,6 +490,10 @@ :group 'rmail-headers :type '(choice (const nil) function)) +(make-obsolete-variable 'rmail-message-filter + "it is not used (try `rmail-show-message-hook')." + "23.1") + (defcustom rmail-automatic-folder-directives nil "List of directives specifying where to put a message. Each element of the list is of the form: ------------------------------------------------------------ revno: 106483 fixes bug(s): http://debbugs.gnu.org/2526 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 23:09:27 -0800 message: * src/font.c (font_find_for_lface) [HAVE_NS]: Ignore case. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-23 07:03:56 +0000 +++ src/ChangeLog 2011-11-23 07:09:27 +0000 @@ -1,3 +1,7 @@ +2011-11-23 Glenn Morris + + * font.c (font_find_for_lface) [HAVE_NS]: Ignore case. (Bug#2526) + 2011-11-23 Chong Yidong * xdisp.c (compute_stop_pos): Check validity of end_charpos before === modified file 'src/font.c' --- src/font.c 2011-11-17 17:40:48 +0000 +++ src/font.c 2011-11-23 07:09:27 +0000 @@ -3160,14 +3160,7 @@ else { Lisp_Object alters - = Fassoc_string (val, Vface_alternative_font_family_alist, - /* Font family names are case-sensitive under NS. */ -#ifndef HAVE_NS - Qt -#else - Qnil -#endif - ); + = Fassoc_string (val, Vface_alternative_font_family_alist, Qt); if (! NILP (alters)) { ------------------------------------------------------------ revno: 106482 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-11-22 23:03:56 -0800 message: Spelling fixes. diff: === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2011-11-20 07:30:16 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2011-11-23 07:03:56 +0000 @@ -1401,7 +1401,7 @@ error messages intentionally. Once you understand the jargon, error messages can be informative. Instead of being called ``error'' messages, they should be called ``help'' messages. They are like -signposts to a traveller in a strange country; deciphering them can be +signposts to a traveler in a strange country; deciphering them can be hard, but once understood, they can point the way. The error message is generated by a built-in GNU Emacs debugger. We === modified file 'doc/lispref/spellfile' --- doc/lispref/spellfile 2011-11-20 07:30:16 +0000 +++ doc/lispref/spellfile 2011-11-23 07:03:56 +0000 @@ -660,7 +660,7 @@ tildes time's to' -towars +towards transportable txt types' @@ -674,7 +674,6 @@ undefines underfull undo's -undodata unevaluated' unexec unexpand === modified file 'doc/lispref/two-volume-cross-refs.txt' --- doc/lispref/two-volume-cross-refs.txt 2011-11-15 17:37:37 +0000 +++ doc/lispref/two-volume-cross-refs.txt 2011-11-23 07:03:56 +0000 @@ -34,7 +34,7 @@ harder to go to the right place in the volume.) References to the same volume are just the page number; references to -the other volume are a volumne number (in Roman numerals) preceding +the other volume are a volume number (in Roman numerals) preceding the page number. For example, in Volume I: === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2011-11-20 07:30:16 +0000 +++ doc/misc/calc.texi 2011-11-23 07:03:56 +0000 @@ -34631,7 +34631,7 @@ derivative is left in terms of @var{var}. If the expression contains functions for which no derivative formula is known, new derivative functions are invented by adding primes to the names; @pxref{Calculus}. -However, if @var{symb} is non-@code{nil}, the presence of undifferentiable +However, if @var{symb} is non-@code{nil}, the presence of nondifferentiable functions in @var{expr} instead cancels the whole differentiation, and @code{deriv} returns @code{nil} instead. === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2011-11-20 03:48:53 +0000 +++ doc/misc/ede.texi 2011-11-23 07:03:56 +0000 @@ -268,7 +268,7 @@ Some project modes do not have a project file, but directly read a Makefile or other existing file. Instead of directly editing the -object, you can edit the file by typine @kbd{C-c . e} +object, you can edit the file by typing @kbd{C-c . e} (@code{ede-edit-file-target}). You should ``rescan'' the project afterwards (@pxref{Miscellaneous commands}). === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-11-20 20:14:54 +0000 +++ doc/misc/gnus.texi 2011-11-23 07:03:56 +0000 @@ -22047,7 +22047,7 @@ (nnml "mairix" (nnml-directory "mairix") (nnml-get-new-mail nil)) @end lisp -(The @code{nnmaildir} back end also has a server variabe +(The @code{nnmaildir} back end also has a server variable @code{get-new-mail}, but its default value is @code{nil}, so you don't have to explicitly set it if you use a @code{nnmaildir} server just for mairix.) === modified file 'doc/misc/pcl-cvs.texi' --- doc/misc/pcl-cvs.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/pcl-cvs.texi 2011-11-23 07:03:56 +0000 @@ -70,7 +70,7 @@ of the various commands and major modes for further information. @c This manual is updated to release 2.5 of PCL-CVS. -@insertcopying +@insertcopying @end ifnottex @@ -1275,7 +1275,7 @@ useful if your site has several repositories. @item log-edit-require-final-newline -@c wordy to avoid unhderfull hbox +@c wordy to avoid underfull hbox When you enter a log message by typing into the @samp{*cvs-commit-message*} buffer, PCL-CVS normally automatically inserts a trailing newline, unless there already is one. This behavior === modified file 'doc/misc/sem-user.texi' --- doc/misc/sem-user.texi 2011-11-20 19:35:27 +0000 +++ doc/misc/sem-user.texi 2011-11-23 07:03:56 +0000 @@ -547,7 +547,7 @@ @end deffn @deffn Option semantic-idle-scheduler-no-working-message -If non-@code{nil}, disable display of working messages whie reparsing. +If non-@code{nil}, disable display of working messages while reparsing. @end deffn @deffn Option semantic-idle-scheduler-working-in-modeline-flag === modified file 'etc/NEWS.1-17' --- etc/NEWS.1-17 2011-11-20 07:30:16 +0000 +++ etc/NEWS.1-17 2011-11-23 07:03:56 +0000 @@ -1630,7 +1630,7 @@ read-char now returns a value in the range 128-255 if a Meta character is typed. When interpreted as command input, a Meta character is equivalent to a two character - sequence, the meta prefix character followed by the un-metized + sequence, the meta prefix character followed by the unmetized character (Meta-G unmetized is G). The meta prefix character === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-11-20 19:35:27 +0000 +++ etc/NEWS.22 2011-11-23 07:03:56 +0000 @@ -163,7 +163,7 @@ customize `font-lock-comment-face'. Another alternative is to use a newer terminal emulator that supports more colors (256 is now common). For example, for xterm compatible emulators that support 256 colors, -you can run emacs like this: +you can run emacs like this: env TERM=xterm-256color emacs -nw (This was new in Emacs 22.1, but was not described. In Emacs 22.1 this also happened for terminals with a light background, that is not @@ -280,13 +280,13 @@ ** Support for FreeBSD/Alpha has been added. ** New translations of the Emacs Tutorial are available in the -following languages: Brasilian Portuguese, Bulgarian, Chinese (both +following languages: Brazilian Portuguese, Bulgarian, Chinese (both with simplified and traditional characters), French, Russian, and Italian. Type `C-u C-h t' to choose one of them in case your language setup doesn't automatically select the right one. ** New translations of the Emacs reference card are available in the -Brasilian Portuguese and Russian. The corresponding PostScript files +Brazilian Portuguese and Russian. The corresponding PostScript files are also included. ** A French translation of the `Emacs Survival Guide' is available. === modified file 'etc/refcards/gnus-refcard.tex' --- etc/refcards/gnus-refcard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/gnus-refcard.tex 2011-11-23 07:03:56 +0000 @@ -13,7 +13,7 @@ % % latex gnus-refcard.tex && % dvips -t letter -f gnus-refcard.dvi > gnus-refcard.ps -% +% % latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' && % mv gnus-refcard.dvi gnus-booklet.dvi && % dvips -t letter -f gnus-booklet.dvi > gnus-booklet.ps @@ -35,16 +35,16 @@ \ifthenelse{\isundefined{\booklettrue}}{% ifcard %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Reference Card - + \def\Guide{Card}\def\guide{card} \def\logoscale{0.25} - + % Page setup for the refcard: - + % \setlength{\textwidth}{7.26in} \setlength{\textheight}{10in} % \setlength{\topmargin}{-1.0in} % % the same settings work for A4, although there is a bit of space at the - % % top and bottom of the page. + % % top and bottom of the page. % \setlength{\oddsidemargin}{-0.5in} \setlength{\evensidemargin}{-0.5in} \ifthenelse{\isundefined{\letterpapertrue}}{ @@ -52,19 +52,19 @@ }{ \geometry{hmargin=20mm,tmargin=10mm,bmargin=12mm} } - + }{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Reference Booklet - + \def\Guide{Booklet}\def\guide{booklet} \def\logoscale{0.5}% FIXME: too large for 2up printing? --rsteib - + \ifthenelse{\isundefined{\letterpapertrue}}{ \geometry{a5paper,hmargin=10mm,tmargin=10mm,bmargin=4mm} }{ \geometry{a5paper,hmargin=20mm,tmargin=10mm,bmargin=4mm} } - + \def\sec{\section} \def\subsec{\subsection} \def\subsubsec{\subsubsection} @@ -73,7 +73,7 @@ \par\vspace*{\fill}\pagebreak} }%ifbooklet% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % % +% \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % % %% include file for the Gnus refcard and booklet \def\progver{5.11} % program version @@ -218,7 +218,7 @@ \hline \multicolumn{2}{|p{\markdblcolwidth}|}{{\bf ``Read'' Marks.} All these marks appear in the first column of the summary line, and so - are mutually exclusive.}\\ + are mutually exclusive.}\\ \hline ` ' & (M-u, M SPC, M c) Not read.\\ ! & (!, M !, M t) Ticked (interesting).\\ @@ -284,7 +284,7 @@ [Prefix: use group under point to find posting-style].\\ b & Find {\bf bogus} groups and delete them.\\ c & Mark all unticked articles in group as read ({\bf catch-up}). - [p/p]\\ + [p/p]\\ g & Check the server for new articles ({\bf get}). [level]\\ M-g & Check the server for new articles in this group ({\bf get}). [p/p]\\ j & {\bf Jump} to a group.\\ @@ -292,14 +292,14 @@ [Prefix: use group under point to find posting-style].\\ n & Go to the {\bf next} group with unread articles. [distance]\\ M-n & Go to the {\bf next} group on the same or lower level. - [distance]\\ + [distance]\\ p & (DEL) Go to the {\bf previous} group with unread articles. - [distance]\\ - M-p & Go to the {\bf previous} group on the same or lower level. [distance]\\ + [distance]\\ + M-p & Go to the {\bf previous} group on the same or lower level. [distance]\\ q & {\bf Quit} Gnus.\\ r & Re-read the init file ({\bf reset}).\\ s & {\bf Save} `.newsrc.eld' file (and `.newsrc' if - `gnus-save-newsrc-file').\\ + `gnus-save-newsrc-file').\\ z & Suspend (kill all buffers of) Gnus.\\ B & {\bf Browse} a foreign server.\\ C & Mark all articles in this group as read ({\bf Catch-up}). [p/p]\\ @@ -312,7 +312,7 @@ M-c & Clear data from group (marks and list of read articles). \\ C-c C-s & {\bf Sort} the groups by name, number of unread articles, or level (depending on `gnus-group-sort-function').\\ - C-c C-x & Run all expirable articles in group through the {\bf expiry} + C-c C-x & Run all expirable articles in group through the {\bf expiry} process.\\ C-c M-C-x & Run all articles in all groups through the {\bf expiry} process.\\ C-c M-g & Activate all {\bf groups}.\\ @@ -324,7 +324,7 @@ ange-ftp). [Prefix: query for group]\\ H v & (V) Display the Gnus {\bf version} number.\\ H d & (C-c C-d) Show the {\bf description} of this group - [Prefix: re-read from server].\\ + [Prefix: re-read from server].\\ M-d & {\bf Describe} all groups. [Prefix: re-read from server]\\ D g & Regenerate a Sieve script from group parameters.\\ D u & Regenerate Sieve script and {\bf upload} to server.\\ @@ -334,17 +334,17 @@ \newcommand{\ListGroups}{% {\esamepage \begin{keys}{A M} - A d & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\ + A d & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\ A k & (C-c C-l) List all {\bf killed} groups. [Prefix: look at active-file from server]\\ A l & List all groups on a specific level. [Prefix: also list groups with no unread articles]\\ A a & (C-c C-a) List all groups whose names match a regexp - ({\bf apropos}).\\ + ({\bf apropos}).\\ A A & List the server's active-file.\\ A M & List groups that {\bf match} a regexp.\\ - A m & List groups that {\bf match} a regexp and have unread articles. - [level]\\ + A m & List groups that {\bf match} a regexp and have unread articles. + [level]\\ A s & (l) List all {\bf subscribed} groups with unread articles. [level; 5 and lower is the default]\\ A u & (L) List all groups (including read and {\bf unsubscribed}). @@ -354,7 +354,7 @@ A ? & List all groups with dormant articles. [level]\\ \end{keys} } - + \newcommand{\CreateEditGroups}{% {\esamepage The select methods are indicated in parentheses.\\* @@ -404,8 +404,8 @@ M m & (\#) Set the process {\bf mark} on this group. [scope]\\ M r & Mark all groups matching regular expression.\\ M u & (M-\#) Remove process mark from this group ({\bf unmark}). - [scope]\\ - M U & Remove the process mark from all groups (\textbf{umark all}).\\ + [scope]\\ + M U & Remove the process mark from all groups (\textbf{unmark all}).\\ M w & Mark all groups in the current region. [prefix: unmark]\\ M b & Mark all groups in the {\bf buffer}. [prefix: unmark]\\ \end{keys}} @@ -427,7 +427,7 @@ T DEL & Delete an empty topic.\\ T \# & Mark all groups in the current topic with the process-mark.\\ T M-\# & Remove the process-mark from all groups in the current topic.\\ - T TAB & (TAB) Indent current topic [Prefix: unindent].\\ + T TAB & (TAB) Indent current topic [Prefix: unindent].\\ M-TAB & Unindent the current topic.\\ RET & (SPC) Either unfold topic or enter group [level].\\ T s & {\bf Show} the current topic. [Prefix: show permanently]\\ @@ -478,7 +478,7 @@ {\esamepage \begin{keys}{M-RET} SPC & (A SPC, A n) Select an article, scroll it one page, move to the - next one.\\ + next one.\\ DEL & (A DEL, A p, b) Scroll this article one page back. [distance]\\ RET & (A RET) Scroll this article one line forward. [distance]\\ M-RET & (A M-RET) Scroll this article one line backward. [distance]\\ @@ -490,9 +490,9 @@ M-\& & Execute a command on all articles having the process mark.\\ % M-n & (G M-n) Go to {\bf next} summary line of unread article. - [distance]\\ - M-p & (G M-p) Go to {\bf previous} summary line of an unread article. - [distance]\\ + [distance]\\ + M-p & (G M-p) Go to {\bf previous} summary line of an unread article. + [distance]\\ M-s & {\bf Search} through all subsequent articles for a regexp.\\ M-r & Search through all previous articles for a regexp.\\ % @@ -519,7 +519,7 @@ M-C-d & Like C-d, but open several documents in nndoc-groups, wrapped in an nnvirtual group [p/p]\\ % - A g & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\ + A g & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\ A r & (\^{}, A \^{}) Fetch the parent(s) of this article. [Prefix: if positive fetch \textit{n} ancestors; negative: fetch only the \textit{n}th ancestor]\\ @@ -541,7 +541,7 @@ prefix selects which part to operate on. If the point is placed over a MIME button in the article buffer, use the corresponding bindings for the article buffer instead. - + \begin{keys}{W M w} K v & (b, W M b) {\bf View} the MIME-part.\\ K o & {\bf Save} the MIME part.\\ @@ -597,7 +597,7 @@ B t & {\bf Trace} the fancy splitting patterns applied to this article.\\ B w & (e) Edit this article.\\ B M-C-e & {\bf Expunge} (delete from disk) all expirable articles in this group - (!). [p/p]\\ + (!). [p/p]\\ K E & {\bf Encrypt} article body. [p/p]\\ \end{keys} } @@ -665,7 +665,7 @@ W 6 & Translate a base64 article.\\ W a & Strip certain {\bf headers} from body.\\ W b & Make Message-IDs and URLs in the article mouse-clickable - {\bf buttons}.\\ + {\bf buttons}.\\ W c & Translate CRLF-pairs to LF and then remaining CR's to LF's.\\ W d & Treat {\bf dumbquotes}.\\ W e & Treat {\bf emphasized} text.\\ @@ -698,7 +698,7 @@ } } - \newcommand{\BlankAndWhitespace}{% + \newcommand{\BlankAndWhitespace}{% {\esamepage \begin{keys}{W E w} W E l & Strip blank {\bf lines} from the beginning of the article.\\ @@ -715,7 +715,7 @@ } } - \newcommand{\Picons}{% + \newcommand{\Picons}{% {\esamepage \begin{keys}{W D D} W D s & (W g) Display {\bf smilies}.\\ @@ -729,7 +729,7 @@ } } - \newcommand{\TimeAndDate}{% + \newcommand{\TimeAndDate}{% {\esamepage \begin{keys}{W T u} W T u & (W T z) Display the article timestamp in GMT ({\bf UT, ZULU}).\\ @@ -739,7 +739,7 @@ W T e & Display the time {\bf elapsed} since it was sent.\\ W T o & Display the {\bf original} timestamp.\\ W T p & Display the date in format that's {\bf - pronounceable} in English.\\ + pronounceable} in English.\\ \end{keys} } } @@ -793,26 +793,26 @@ {\esamepage \begin{keys}{M M-C-r} d & (M d, M r) Mark this article as read and move to the next one. - [scope]\\ + [scope]\\ D & Mark this article as read and move to previous one. [scope]\\ ! & (u, M !, M t) Tick this article (mark it as interesting) and move to the next one. [scope]\\ - U & Tick this article and move to the previous one. [scope]\\ + U & Tick this article and move to the previous one. [scope]\\ M ? & (?) Mark this article as dormant (only followups are - interesting). [scope]\\ + interesting). [scope]\\ M D & Show all {\bf dormant} articles (normally they are hidden unless they have any followups).\\ M M-D & Hide all {\bf dormant} articles.\\ C-w & Mark all articles between point and mark as read.\\ M-u & (M SPC, M c) Clear all marks from this article and move to the next - one. [scope]\\ + one. [scope]\\ M-U & Clear all marks from this article and move to the previous one. [scope]\\ % M e & (E, M x) Mark this article as {\bf expirable}. [scope]\\ % M k & (k) {\bf Kill} all articles with same subject, select - next unread one.\\ + next unread one.\\ M K & (C-k) {\bf Kill} all articles with the same subject as this one.\\ % M C & {\bf Catch-up} the articles that are not ticked and not dormant.\\ @@ -842,7 +842,7 @@ } \newcommand{\ProcessMark}{% - {\esamepage + {\esamepage These commands set and remove the process mark (\#). You only need to use it if the set of articles you want to operate on is non-contiguous. Else use a numeric prefix.\\* @@ -929,7 +929,7 @@ %After %editing the article, send it by pressing C-c C-c. If you are in a %foreign group and want to post the article using the foreign server, give - %a prefix to C-c C-c.\\* + %a prefix to C-c C-c.\\* \begin{keys}{S O m} S p & (a) {\bf Post} an article to this group.\\ S f & (f) Post a {\bf followup} to this article.\\ @@ -965,7 +965,7 @@ % S O m & Digest these series and forward by {\bf mail}. [p/p]\\ S O p & Digest these series and forward as a {\bf post} to a newsgroup. - [p/p]\\ + [p/p]\\ % S u & {\bf Uuencode} a file and post it as a series.\\ \end{keys} @@ -1036,8 +1036,8 @@ \quad \B{l}ifetime: t)emporary, p)ermanent, i)mmediate. If you type the second letter in uppercase, the remaining two are assumed - to be s)ubstring and t)emporary. - If you type the third letter in uppercase, the last one is assumed to be + to be s)ubstring and t)emporary. + If you type the third letter in uppercase, the last one is assumed to be t)emporary. \quad Extra keys for manual editing of a score file:\\* @@ -1057,7 +1057,7 @@ archives, they are expanded and gathered in a new group.\\* \begin{keys}{X p} X b & Un-{\bf binhex} these series. [p/p]\\ - X o & Simply {\bf output} these series (no decoding). [p/p]\\ + X o & Simply {\bf output} these series (no decoding). [p/p]\\ X p & Unpack these {\bf postscript} series. [p/p]\\ X s & Un-{\bf shar} these series. [p/p]\\ X u & {\bf Uudecode} these series. [p/p]\\ @@ -1259,7 +1259,7 @@ } } -% end {gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % % +% end {gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % % % o some things might not be updated: scoring and server modes, maybe more @@ -1333,7 +1333,7 @@ \SortSummary \subsection*{Score (Value) Commands} \Scoring - + \ifthenelse{\isundefined{\booklettrue}}{% ifcard %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection*{Output Articles} \OutputArticles @@ -1343,7 +1343,7 @@ \subsection*{MIME operations from the Summary-Buffer} \MIMESummary - + \ifthenelse{\isundefined{\booklettrue}}{}{% ifbooklet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection*{Extract Series (Uudecode etc)} \ExtractSeries @@ -1354,7 +1354,7 @@ % \subsection*{Post, Followup, Reply, Forward, Cancel} \PostReplyetc - + \ifthenelse{\isundefined{\booklettrue}}{\newpage}{}% newpage ifcard \subsection*{Message Composition} === modified file 'leim/quail/py-punct.el' --- leim/quail/py-punct.el 2011-01-26 08:36:39 +0000 +++ leim/quail/py-punct.el 2011-11-23 07:03:56 +0000 @@ -8,7 +8,7 @@ ;; Author: Ken'ichi HANDA -;; Keywords: multilingual, input method, Chienese +;; Keywords: multilingual, input method, Chinese ;; This file is part of GNU Emacs. === modified file 'leim/quail/pypunct-b5.el' --- leim/quail/pypunct-b5.el 2011-01-15 23:16:57 +0000 +++ leim/quail/pypunct-b5.el 2011-11-23 07:03:56 +0000 @@ -7,7 +7,7 @@ ;; Author: Ken'ichi HANDA -;; Keywords: multilingual, input method, Chienese +;; Keywords: multilingual, input method, Chinese ;; This file is part of GNU Emacs. === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2011-11-20 03:48:53 +0000 +++ lisp/ChangeLog.15 2011-11-23 07:03:56 +0000 @@ -2818,7 +2818,7 @@ * tool-bar.el (tool-bar-setup): Remove :enable conditions, which are handled by the menu-bar entries. As before, don't use - :visibile to avoid changing the tool-bar. + :visible to avoid changing the tool-bar. 2010-12-27 Michael Albinus === modified file 'lisp/ChangeLog.6' --- lisp/ChangeLog.6 2011-11-20 02:29:42 +0000 +++ lisp/ChangeLog.6 2011-11-23 07:03:56 +0000 @@ -5716,7 +5716,7 @@ (vip-read-string-with-history, vip-search): Won't pause inside macros any more. * viper-mous.el (vip-surrounding-word): Modified to understand - tripple clicks. + triple clicks. * viper-util.el (vip-leave-region-active): New function. * viper-ex.el (ex-write): Uses better defaults. * viper-macs.el (vip-record-kbd-macro): Correctly escapes `.' and @@ -6689,7 +6689,7 @@ Harnessed view-minor-mode. Added (vip-leave-region-active) to all simple movement commands. * viper-mous.el (vip-surrounding-word): Modified to understand - tripple clicks. + triple clicks. * viper-util.el (vip-leave-region-active): New function. 1995-08-19 Richard Stallman === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2011-11-17 17:40:48 +0000 +++ lisp/ChangeLog.7 2011-11-23 07:03:56 +0000 @@ -1230,7 +1230,7 @@ indicator regex, Fix line positioning. (speedbar-add-indicator): Handles obj indicators now. (speedbar-check-objects, speedbar-check-obj-this-line): New functions. - (speedbar-double-click): Fix tripple click error. + (speedbar-double-click): Fix triple click error. (speedbar-line-file, speedbar-goto-this-file): Handle indicator regex. (speedbar-line-path): Only try to get a file when in "files" display. (speedbar-line-depth): Handle indicator regex. @@ -2018,7 +2018,7 @@ 1998-06-19 Karl Heuer * emacs-lisp/checkdoc.el (checkdoc-eval-defun): Doc fix. - (checkdoc-continue, checkdoc-tripple-semi-comment-check-flag): Ditto. + (checkdoc-continue, checkdoc-triple-semi-comment-check-flag): Ditto. (checkdoc-common-verbs-wrong-voice): Use dotted pairs. 1998-06-19 Richard Stallman === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2011-11-20 03:48:53 +0000 +++ lisp/ChangeLog.9 2011-11-23 07:03:56 +0000 @@ -8319,7 +8319,7 @@ * frame.el (show-cursor-in-non-selected-windows): Doc fix. * hi-lock.el (hi-lock-refontify): Don't call non-existent - jit-lock-fontify-buffer; it should anyway be unneccessary to + jit-lock-fontify-buffer; it should anyway be unnecessary to do anything special when jit-lock is active. (hi-yellow, hi-pink, hi-green, hi-blue): Fix defface specs. === modified file 'lisp/allout.el' --- lisp/allout.el 2011-11-20 07:30:16 +0000 +++ lisp/allout.el 2011-11-23 07:03:56 +0000 @@ -3100,7 +3100,7 @@ Costs more than regular `allout-next-sibling' for short traversals: - - we have to check the prior (next, if travelling backwards) + - we have to check the prior (next, if traveling backwards) item to confirm connectivity with the prior topic, and - if confirmed, we have to reestablish the allout-recent-* settings with some extra navigation === modified file 'lisp/calc/calc-nlfit.el' --- lisp/calc/calc-nlfit.el 2011-01-25 04:08:28 +0000 +++ lisp/calc/calc-nlfit.el 2011-11-23 07:03:56 +0000 @@ -22,7 +22,7 @@ ;;; Commentary: ;; This code uses the Levenberg-Marquardt method, as described in -;; _Numerical Analysis_ by H. R. Schwarz, to fit data to +;; _Numerical Analysis_ by H. R. Schwarz, to fit data to ;; nonlinear curves. Currently, the only the following curves are ;; supported: ;; The logistic S curve, y=a/(1+exp(b*(t-c))) @@ -33,14 +33,14 @@ ;; The logistic bell curve, y=A*exp(B*(t-C))/(1+exp(B*(t-C)))^2 ;; Note that this is the derivative of the formula for the S curve. -;; We get A=-a*b, B=b and C=c. Here, y is interpreted as the rate -;; of growth of a population at time t. So we will think of the -;; data as consisting of rates p0, p1, ..., pn and their +;; We get A=-a*b, B=b and C=c. Here, y is interpreted as the rate +;; of growth of a population at time t. So we will think of the +;; data as consisting of rates p0, p1, ..., pn and their ;; respective times t0, t1, ..., tn. ;; The Hubbert Linearization, y/x=A*(1-x/B) ;; Here, y is thought of as the rate of growth of a population -;; and x represents the actual population. This is essentially +;; and x represents the actual population. This is essentially ;; the differential equation describing the actual population. ;; The Levenberg-Marquardt method is an iterative process: it takes @@ -53,7 +53,7 @@ ;; approximations for b and c are found using least squares on the ;; linearization log((a/y)-1) = log(bb) + cc*t of ;; y=a/(1+bb*exp(cc*t)), which is equivalent to the above s curve -;; formula, and then tranlating it to b and c. From this, we can +;; formula, and then translating it to b and c. From this, we can ;; also get approximations for the bell curve parameters. ;;; Code: @@ -68,7 +68,7 @@ (defun math-nlfit-least-squares (xdata ydata &optional sdata sigmas) "Return the parameters A and B for the best least squares fit y=a+bx." (let* ((n (length xdata)) - (s2data (if sdata + (s2data (if sdata (mapcar 'calcFunc-sqr sdata) (make-list n 1))) (S (if sdata 0 n)) @@ -109,11 +109,11 @@ ;;; The methods described by de Sousa require the cumulative data qdata ;;; and the rates pdata. We will assume that we are given either ;;; qdata and the corresponding times tdata, or pdata and the corresponding -;;; tdata. The following two functions will find pdata or qdata, +;;; tdata. The following two functions will find pdata or qdata, ;;; given the other.. -;;; First, given two lists; one of values q0, q1, ..., qn and one of -;;; corresponding times t0, t1, ..., tn; return a list +;;; First, given two lists; one of values q0, q1, ..., qn and one of +;;; corresponding times t0, t1, ..., tn; return a list ;;; p0, p1, ..., pn of the rates of change of the qi with respect to t. ;;; p0 is the right hand derivative (q1 - q0)/(t1 - t0). ;;; pn is the left hand derivative (qn - q(n-1))/(tn - t(n-1)). @@ -122,7 +122,7 @@ (defun math-nlfit-get-rates-from-cumul (tdata qdata) (let ((pdata (list - (math-div + (math-div (math-sub (nth 1 qdata) (nth 0 qdata)) (math-sub (nth 1 tdata) @@ -155,7 +155,7 @@ pdata)) (reverse pdata))) -;;; Next, given two lists -- one of rates p0, p1, ..., pn and one of +;;; Next, given two lists -- one of rates p0, p1, ..., pn and one of ;;; corresponding times t0, t1, ..., tn -- and an initial values q0, ;;; return a list q0, q1, ..., qn of the cumulative values. ;;; q0 is the initial value given. @@ -169,7 +169,7 @@ (cons (math-add (car qdata) (math-mul - (math-mul + (math-mul '(float 5 -1) (math-add (nth 1 pdata) (nth 0 pdata))) (math-sub (nth 1 tdata) @@ -181,13 +181,13 @@ ;;; Given the qdata, pdata and tdata, find the parameters ;;; a, b and c that fit q = a/(1+b*exp(c*t)). -;;; a is found using the method described by de Sousa. +;;; a is found using the method described by de Sousa. ;;; b and c are found using least squares on the linearization ;;; log((a/q)-1) = log(b) + c*t ;;; In some cases (where the logistic curve may well be the wrong ;;; model), the computed a will be less than or equal to the maximum ;;; value of q in qdata; in which case the above linearization won't work. -;;; In this case, a will be replaced by a number slightly above +;;; In this case, a will be replaced by a number slightly above ;;; the maximum value of q. (defun math-nlfit-find-qmax (qdata pdata tdata) @@ -224,7 +224,7 @@ (setq qmh (math-add qmh (math-mul - (math-mul + (math-mul '(float 5 -1) (math-add (nth 1 pdata) (nth 0 pdata))) (math-sub (nth 1 tdata) @@ -239,7 +239,7 @@ (let* ((qhalf (math-nlfit-find-qmaxhalf pdata tdata)) (q0 (math-mul 2 qhalf)) (qdata (math-nlfit-get-cumul-from-rates tdata pdata q0))) - (while (math-lessp (math-nlfit-find-qmax + (while (math-lessp (math-nlfit-find-qmax (mapcar (lambda (q) (math-add q0 q)) qdata) @@ -260,7 +260,7 @@ (i 0)) (while (< i 10) (setq q0 (math-mul '(float 5 -1) (math-add qmin qmax))) - (if (math-lessp + (if (math-lessp (math-nlfit-find-qmax (mapcar (lambda (q) (math-add q0 q)) @@ -272,7 +272,7 @@ (setq i (1+ i))) (math-mul '(float 5 -1) (math-add qmin qmax))))) -;;; To improve the approximations to the parameters, we can use +;;; To improve the approximations to the parameters, we can use ;;; Marquardt method as described in Schwarz's book. ;;; Small numbers used in the Givens algorithm @@ -329,7 +329,7 @@ (let ((cij (math-nlfit-get-matx-elt C i j)) (cjj (math-nlfit-get-matx-elt C j j))) (when (not (math-equal 0 cij)) - (if (math-lessp (calcFunc-abs cjj) + (if (math-lessp (calcFunc-abs cjj) (math-mul math-nlfit-delta (calcFunc-abs cij))) (setq w (math-neg cij) gamma 0 @@ -337,7 +337,7 @@ rho 1) (setq w (math-mul (calcFunc-sign cjj) - (calcFunc-sqrt + (calcFunc-sqrt (math-add (math-mul cjj cjj) (math-mul cij cij)))) @@ -351,10 +351,10 @@ (math-nlfit-set-matx-elt C j j w) (math-nlfit-set-matx-elt C i j rho) (let ((k (1+ j))) - (while (<= k n) + (while (<= k n) (let* ((cjk (math-nlfit-get-matx-elt C j k)) (cik (math-nlfit-get-matx-elt C i k)) - (h (math-sub + (h (math-sub (math-mul gamma cjk) (math-mul sigma cik)))) (setq cik (math-add (math-mul sigma cjk) @@ -386,9 +386,9 @@ (setq s (math-add s (math-mul (math-nlfit-get-matx-elt C i k) (math-nlfit-get-elt x k)))) (setq k (1+ k)))) - (math-nlfit-set-elt x i - (math-neg - (math-div s + (math-nlfit-set-elt x i + (math-neg + (math-div s (math-nlfit-get-matx-elt C i i)))) (setq i (1- i)))) (let ((i (1+ n))) @@ -405,7 +405,7 @@ sigma 1) (if (math-lessp (calcFunc-abs rho) 1) (setq sigma rho - gamma (calcFunc-sqrt + gamma (calcFunc-sqrt (math-sub 1 (math-mul sigma sigma)))) (setq gamma (math-div 1 (calcFunc-abs rho)) sigma (math-mul (calcFunc-sign rho) @@ -429,7 +429,7 @@ (defun math-nlfit-jacobian (grad xlist parms &optional slist) (let ((j nil)) - (while xlist + (while xlist (let ((row (apply grad (car xlist) parms))) (setq j (cons @@ -495,7 +495,7 @@ (setq ydata (cdr ydata)) (setq sdata (cdr sdata))) (reverse d))) - + (defun math-nlfit-make-dtilda (d n) (append d (make-list n 0))) @@ -520,8 +520,8 @@ (newchisq (math-nlfit-chi-sq xlist ylist newparms fn slist))) (if (math-lessp newchisq chisq) (progn - (if (math-lessp - (math-div + (if (math-lessp + (math-div (math-sub chisq newchisq) newchisq) math-nlfit-epsilon) (setq really-done t)) (setq lambda (math-div lambda 10)) @@ -551,7 +551,7 @@ (let ((ex (calcFunc-exp (math-mul c (math-sub x d))))) (math-div (math-mul a ex) - (math-sqr + (math-sqr (math-add 1 ex))))) @@ -582,7 +582,7 @@ (defun math-nlfit-find-covar (grad xlist pparms) (let ((j nil)) - (while xlist + (while xlist (setq j (cons (cons 'vec (apply grad (car xlist) pparms)) j)) (setq xlist (cdr xlist))) (setq j (cons 'vec (reverse j))) @@ -603,7 +603,7 @@ (setq i (1+ i))) (setq sgs (reverse sgs))) (list sgs covar))) - + ;;; Now the Calc functions (defun math-nlfit-s-logistic-params (xdata ydata) @@ -687,15 +687,15 @@ (funcall initparms xdata ydata)) (fit (math-nlfit-fit xdata ydata parmguess fn grad sdata)) (finalparms (nth 1 fit)) - (sigmacovar + (sigmacovar (if sdevv (math-nlfit-get-sigmas grad xdata finalparms (nth 0 fit)))) - (sigmas + (sigmas (if sdevv (nth 0 sigmacovar))) - (finalparms + (finalparms (if sigmas - (math-map-binop + (math-map-binop (lambda (x y) (list 'sdev x y)) finalparms sigmas) finalparms)) (soln (funcall solnexpr finalparms var))) @@ -712,8 +712,8 @@ ((eq sdv 'calcFunc-xfit) (let (sln) (setq sln - (list 'vec - soln + (list 'vec + soln traillist (nth 1 sigmacovar) '(vec) @@ -721,7 +721,7 @@ (let ((n (length xdata)) (m (length finalparms))) (if (and sdata (> n m)) - (calcFunc-utpc (nth 0 fit) + (calcFunc-utpc (nth 0 fit) (- n m)) '(var nan var-nan))))) (math-nlfit-enter-result 1 "xfit" sln))) @@ -787,14 +787,14 @@ (list (nth 1 (nth 0 finalparms)) (nth 1 (nth 1 finalparms))) (lambda (x a b) - (math-mul a + (math-mul a (math-sub 1 (math-div x b)))) sdata))) (setq sln - (list 'vec - soln + (list 'vec + soln traillist (nth 2 parmvals) (list @@ -807,7 +807,7 @@ chisq (let ((n (length qdata))) (if (and sdata (> n 2)) - (calcFunc-utpc + (calcFunc-utpc chisq (- n 2)) '(var nan var-nan))))) @@ -817,4 +817,3 @@ (calc-record traillist "parm"))))) (provide 'calc-nlfit) - === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2011-11-21 23:59:09 +0000 +++ lisp/calc/calc.el 2011-11-23 07:03:56 +0000 @@ -1003,7 +1003,7 @@ (defvar calc-quick-prev-results nil "Previous results from Quick Calc.") (defvar calc-said-hello nil - "Non-nil if the welcomd message has been displayed.") + "Non-nil if the welcome message has been displayed.") (defvar calc-executing-macro nil "Non-nil if a keyboard macro is executing from the \"K\" key.") (defvar calc-any-selections nil === modified file 'lisp/cedet/semantic.el' --- lisp/cedet/semantic.el 2011-11-20 03:48:53 +0000 +++ lisp/cedet/semantic.el 2011-11-23 07:03:56 +0000 @@ -437,7 +437,7 @@ unmatched syntax encountered. When nil, parsing skips the syntax, adding it to the unmatched syntax cache. -Must return a list of semantic tags wich have been cooked +Must return a list of semantic tags which have been cooked \(repositioned properly) but which DO NOT HAVE OVERLAYS associated with them. When overloading this function, use `semantic--tag-expand' to cook raw tags.") === modified file 'lisp/cedet/semantic/analyze.el' --- lisp/cedet/semantic/analyze.el 2011-11-20 07:30:16 +0000 +++ lisp/cedet/semantic/analyze.el 2011-11-23 07:03:56 +0000 @@ -254,7 +254,7 @@ (fname nil) (miniscope (when scope (clone scope))) ) - ;; First order check. Is this wholely contained in the typecache? + ;; First order check. Is this wholly contained in the typecache? (setq tmp (semanticdb-typecache-find sequence)) (if tmp === modified file 'lisp/cedet/semantic/analyze/fcn.el' --- lisp/cedet/semantic/analyze/fcn.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/analyze/fcn.el 2011-11-23 07:03:56 +0000 @@ -157,7 +157,7 @@ ;; (define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration) - ;; todo - move into typecahe!! + ;; todo - move into typecache!! "Return a concrete type tag based on input TYPE tag. A concrete type is an actual declaration of a memory description, such as a structure, or class. A meta type is an alias, === modified file 'lisp/cedet/semantic/complete.el' --- lisp/cedet/semantic/complete.el 2011-11-20 07:30:16 +0000 +++ lisp/cedet/semantic/complete.el 2011-11-23 07:03:56 +0000 @@ -1023,7 +1023,7 @@ (defmethod semantic-collector-try-completion-whitespace ((obj semantic-collector-abstract) prefix) - "For OBJ, do whatepsace completion based on PREFIX. + "For OBJ, do whitespace completion based on PREFIX. This implies that if there are two completions, one matching the test \"prefix\\>\", and one not, the one matching the full word version of PREFIX will be chosen, and that text returned. === modified file 'lisp/cedet/semantic/ia-sb.el' --- lisp/cedet/semantic/ia-sb.el 2011-11-17 17:40:48 +0000 +++ lisp/cedet/semantic/ia-sb.el 2011-11-23 07:03:56 +0000 @@ -348,7 +348,7 @@ (insert (semantic-tag-name tag)) (if movepoint (setq movepoint (point))) ;; I'd like to use this to add fancy () or what not at the end - ;; but we need the parent file whih requires an upgrade to the + ;; but we need the parent file which requires an upgrade to the ;; analysis tool. ;;(semantic-insert-foreign-tag tag ??)) ) === modified file 'lisp/cedet/semantic/lex-spp.el' --- lisp/cedet/semantic/lex-spp.el 2011-11-19 09:18:31 +0000 +++ lisp/cedet/semantic/lex-spp.el 2011-11-23 07:03:56 +0000 @@ -452,7 +452,7 @@ ;; If val is nil, that's probably wrong. ;; Found a system header case where this was true. ((null val) "") - ;; Debug wierd stuff. + ;; Debug weird stuff. (t (debug))) )) ((stringp txt) === modified file 'lisp/cedet/semantic/sort.el' --- lisp/cedet/semantic/sort.el 2011-11-03 20:03:45 +0000 +++ lisp/cedet/semantic/sort.el 2011-11-23 07:03:56 +0000 @@ -229,7 +229,7 @@ (mapc (lambda (tag) (let ((components (semantic-tag-components tag))) (if (and components - ;; unpositined tags can be hazardous to + ;; unpositioned tags can be hazardous to ;; completion. Do we need any type of tag ;; here? - EL (semantic-tag-with-position-p (car components))) === modified file 'lisp/cedet/semantic/symref.el' --- lisp/cedet/semantic/symref.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/symref.el 2011-11-23 07:03:56 +0000 @@ -324,7 +324,7 @@ (setq ans (list (car files)) files (cdr files)) (dolist (F files) - ;; This algorithm for uniqing the file list depends on the + ;; This algorithm for uniquifying the file list depends on the ;; tool in question providing all the hits in the same file ;; grouped together. (when (not (string= F (car ans))) === modified file 'lisp/cedet/semantic/symref/list.el' --- lisp/cedet/semantic/symref/list.el 2011-11-20 03:48:53 +0000 +++ lisp/cedet/semantic/symref/list.el 2011-11-23 07:03:56 +0000 @@ -401,7 +401,7 @@ ;;; UTILS ;; -;; List mode utils for understadning the current line +;; List mode utils for understanding the current line (defun semantic-symref-list-on-hit-p () "Return the line number if the cursor is on a buffer line with a hit. === modified file 'lisp/cedet/srecode/texi.el' --- lisp/cedet/srecode/texi.el 2011-11-15 17:37:37 +0000 +++ lisp/cedet/srecode/texi.el 2011-11-23 07:03:56 +0000 @@ -244,7 +244,7 @@ `function' => @dfn{function} `variable' => @code{variable} `class' => @code{class} @xref{class} - `unknown' => @code{unknonwn} + `unknown' => @code{unknown} \"text\" => ``text'' 'quoteme => @code{quoteme} non-nil => non-@code{nil} === modified file 'lisp/doc-view.el' --- lisp/doc-view.el 2011-10-29 00:39:57 +0000 +++ lisp/doc-view.el 2011-11-23 07:03:56 +0000 @@ -124,7 +124,7 @@ ;; (except the tooltip) if the next match is on the same page. ;; And it's much slower than the current search facility, because -;; isearch really searches for each step forward or backward wheras +;; isearch really searches for each step forward or backward whereas ;; the current approach searches once and then it knows to which ;; pages to jump. === modified file 'lisp/emacs-lisp/eieio.el' --- lisp/emacs-lisp/eieio.el 2011-11-16 03:17:29 +0000 +++ lisp/emacs-lisp/eieio.el 2011-11-23 07:03:56 +0000 @@ -992,7 +992,7 @@ ;; EML - Note: the only reason to override a class bound slot ;; is to change the default, so allow unbound in. - ;; If we have a repeat, only update the vlaue... + ;; If we have a repeat, only update the value... (eieio-perform-slot-validation-for-default a tp value skipnil) (setcar dp value)) === modified file 'lisp/emacs-lisp/elint.el' --- lisp/emacs-lisp/elint.el 2011-11-20 07:30:16 +0000 +++ lisp/emacs-lisp/elint.el 2011-11-23 07:03:56 +0000 @@ -1098,7 +1098,7 @@ ;; This includes all the built-in and dumped things with documentation. (defun elint-scan-doc-file () "Scan the DOC file for function and variables. -Marks the function wih their arguments, and returns a list of variables." +Marks the function with their arguments, and returns a list of variables." ;; Cribbed from help-fns.el. (let ((docbuf " *DOC*") vars sym args) === modified file 'lisp/emacs-lisp/testcover.el' --- lisp/emacs-lisp/testcover.el 2011-11-15 07:55:13 +0000 +++ lisp/emacs-lisp/testcover.el 2011-11-23 07:03:56 +0000 @@ -220,7 +220,7 @@ (defun testcover-reinstrument (form) "Reinstruments FORM to use testcover instead of edebug. This function modifies the list that FORM points to. Result is nil if -FORM should return multiple vlues, t if should always return same +FORM should return multiple values, t if should always return same value, 'maybe if either is acceptable." (let ((fun (car-safe form)) id val) === modified file 'lisp/emulation/viper-cmd.el' --- lisp/emulation/viper-cmd.el 2011-11-13 07:48:23 +0000 +++ lisp/emulation/viper-cmd.el 2011-11-23 07:03:56 +0000 @@ -3715,7 +3715,7 @@ convenient way to use it is to bind `//' to the macro `1 M-x viper-toggle-search-style' and `///' to `2 M-x viper-toggle-search-style'. In this way, hitting `//' quickly will -toggle case-fold-search and hitting `/' three times witth toggle regexp +toggle case-fold-search and hitting `/' three times with toggle regexp search. Macros are more convenient in this case because they don't affect the Emacs binding of `/'." (interactive "P") === modified file 'lisp/emulation/viper-init.el' --- lisp/emulation/viper-init.el 2011-11-20 07:30:16 +0000 +++ lisp/emulation/viper-init.el 2011-11-23 07:03:56 +0000 @@ -593,7 +593,7 @@ ;; The reason this is needed is because dabbrev-expand (and possibly ;; others) may jump to before the insertion point, delete something and ;; then reinsert a bigger piece. For instance: bla^blo -;; If dabbrev-expand is called after `blo' and ^ undicates viper-insert-point, +;; If dabbrev-expand is called after `blo' and ^ indicates viper-insert-point, ;; then point jumps to the beginning of `blo'. If expansion is found, `blablo' ;; is deleted, and we have |^, where | denotes point. Next, dabbrev-expand ;; will insert the expansion, and we get: blablo^ === modified file 'lisp/emulation/viper-mous.el' --- lisp/emulation/viper-mous.el 2011-11-20 02:29:42 +0000 +++ lisp/emulation/viper-mous.el 2011-11-23 07:03:56 +0000 @@ -66,7 +66,7 @@ "*Function that determines what constitutes a word for clicking events. Takes two parameters: a COUNT, indicating how many words to return, and CLICK-COUNT, telling whether this is the first click, a double-click, -or a tripple-click." +or a triple-click." :type 'symbol :group 'viper-mouse) === modified file 'lisp/epg.el' --- lisp/epg.el 2011-11-15 00:54:19 +0000 +++ lisp/epg.el 2011-11-23 07:03:56 +0000 @@ -82,7 +82,7 @@ (defconst epg-invalid-recipients-reason-alist '((0 . "No specific reason given") (1 . "Not Found") - (2 . "Ambigious specification") + (2 . "Ambiguous specification") (3 . "Wrong key usage") (4 . "Key revoked") (5 . "Key expired") @@ -95,7 +95,7 @@ (defconst epg-delete-problem-reason-alist '((1 . "No such key") (2 . "Must delete secret key first") - (3 . "Ambigious specification"))) + (3 . "Ambiguous specification"))) (defconst epg-import-ok-reason-alist '((0 . "Not actually changed") === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2011-11-20 02:29:42 +0000 +++ lisp/erc/erc.el 2011-11-23 07:03:56 +0000 @@ -2626,7 +2626,7 @@ (defun erc-cmd-default (line) "Fallback command. -Commands for which no erc-cmd-xxx exists, are tunnelled through +Commands for which no erc-cmd-xxx exists, are tunneled through this function. LINE is sent to the server verbatim, and therefore has to contain the command itself as well." (erc-log (format "cmd: DEFAULT: %s" line)) === modified file 'lisp/gnus/ChangeLog.1' --- lisp/gnus/ChangeLog.1 2011-11-16 12:34:47 +0000 +++ lisp/gnus/ChangeLog.1 2011-11-23 07:03:56 +0000 @@ -2346,7 +2346,7 @@ * nnmh.el: Don't call nnmail-activate. - * gnus.el: User-variabelize all custom vars. + * gnus.el: User-variablize all custom vars. 1998-02-13 Lars Magne Ingebrigtsen === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-11-20 07:30:16 +0000 +++ lisp/gnus/gnus-sum.el 2011-11-23 07:03:56 +0000 @@ -11913,7 +11913,7 @@ ;; This is a pseudo-article. (if (assq 'name header) (gnus-copy-file (cdr (assq 'name header))) - (gnus-message 1 "Article %d is unsaveable" article)) + (gnus-message 1 "Article %d is unsavable" article)) ;; This is a real article. (save-window-excursion (gnus-summary-select-article decode decode nil article) === modified file 'lisp/info.el' --- lisp/info.el 2011-11-19 23:34:40 +0000 +++ lisp/info.el 2011-11-23 07:03:56 +0000 @@ -3240,7 +3240,7 @@ (Info-index topic) (push (cons (cons Info-current-file topic) Info-index-alternatives) Info-virtual-index-nodes) - ;; Clean up unneccessary side-effects of `Info-index'. + ;; Clean up unnecessary side-effects of `Info-index'. (setq Info-history-list ohist-list) (Info-goto-node orignode) (message ""))) === modified file 'lisp/language/tibetan.el' --- lisp/language/tibetan.el 2011-01-25 04:08:28 +0000 +++ lisp/language/tibetan.el 2011-11-23 07:03:56 +0000 @@ -424,7 +424,7 @@ )) ;;; alist for Tibetan composite vowels (long i, vocalic r, etc.) -;;; New varialble. created by Tomabechi 2000/06/08 +;;; New variable. created by Tomabechi 2000/06/08 (defconst tibetan-composite-vowel-alist '(;; LONG A ;; ("$(7"R(B" . ((bc . tc) ?$(7"R(B)) @@ -604,7 +604,7 @@ (defvar tibetan-decomposed-temp nil) ;; For automatic composition. -(set-char-table-range +(set-char-table-range composition-function-table '(#xF00 . #xFD1) (list (vector tibetan-composable-pattern 0 'font-shape-gstring))) === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-11-17 17:40:48 +0000 +++ lisp/ldefs-boot.el 2011-11-23 07:03:56 +0000 @@ -8944,7 +8944,7 @@ Return non-nil if logging is enabled for BUFFER. If BUFFER is nil, the value of `current-buffer' is used. Logging is enabled if `erc-log-channels-directory' is non-nil, the directory -is writeable (it will be created as necessary) and +is writable (it will be created as necessary) and `erc-enable-logging' returns a non-nil value. \(fn &optional BUFFER)" nil nil) === modified file 'lisp/mail/feedmail.el' --- lisp/mail/feedmail.el 2011-11-20 07:30:16 +0000 +++ lisp/mail/feedmail.el 2011-11-23 07:03:56 +0000 @@ -2026,7 +2026,7 @@ (if (looking-at ".*\r\n.*\r\n") (while (search-forward "\r\n" nil t) (replace-match "\n" nil t))) -;; ;; work around text-vs-binary wierdness +;; ;; work around text-vs-binary weirdness ;; ;; if we don't find the normal M-H-S, try reading the file a different way ;; (if (not (feedmail-find-eoh t)) ;; (let ((file-name-buffer-file-type-alist nil) (default-buffer-file-type nil)) === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2011-11-20 03:48:53 +0000 +++ lisp/mh-e/ChangeLog.1 2011-11-23 07:03:56 +0000 @@ -9150,7 +9150,7 @@ %number(msg). (mh-scan-msg-format-string): Format to be used with the current maximum width of message number for the folder in the - `mh-upate-scan-format' function. + `mh-update-scan-format' function. (mh-update-scan-format): Use `mh-scan-msg-format-regexp' for greater flexibility. The message number is no longer anchored to the beginning of the `mh-scan-format-nmh' or `mh-scan-format-mh' format === modified file 'lisp/net/xesam.el' --- lisp/net/xesam.el 2011-11-20 02:29:42 +0000 +++ lisp/net/xesam.el 2011-11-23 07:03:56 +0000 @@ -196,7 +196,7 @@ (defconst xesam-all-fields '("xesam:35mmEquivalent" "xesam:aimContactMedium" "xesam:aperture" "xesam:aspectRatio" "xesam:attachmentEncoding" "xesam:attendee" - "xesam:audioBirate" "xesam:audioChannels" "xesam:audioCodec" + "xesam:audioBitrate" "xesam:audioChannels" "xesam:audioCodec" "xesam:audioCodecType" "xesam:audioSampleFormat" "xesam:audioSampleRate" "xesam:author" "xesam:bcc" "xesam:birthDate" "xesam:blogContactURL" "xesam:cameraManufacturer" "xesam:cameraModel" "xesam:cc" "xesam:ccdWidth" @@ -240,7 +240,8 @@ "xesam:subject" "xesam:supercedes" "xesam:title" "xesam:to" "xesam:totalSpace" "xesam:totalUncompressedSize" "xesam:url" "xesam:usageIntensity" "xesam:userComment" "xesam:userKeyword" - "xesam:uuid" "xesam:version" "xesam:verticalResolution" "xesam:videoBirate" + "xesam:uuid" "xesam:version" "xesam:verticalResolution" + "xesam:videoBitrate" "xesam:videoCodec" "xesam:videoCodecType" "xesam:whiteBalance" "xesam:width" "xesam:wordCount" "xesam:workEmailAddress" "xesam:workPhoneNumber" "xesam:workPostalAddress" === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-11-20 19:35:27 +0000 +++ lisp/org/ChangeLog 2011-11-23 07:03:56 +0000 @@ -15461,7 +15461,7 @@ * org.el (org-enforce-todo-checkbox-dependencies): New option. (org-block-todo-from-checkboxes): New function. - (org-todo): Make tripple prefix arg circumvent blocking. + (org-todo): Make triple prefix arg circumvent blocking. 2009-01-30 Glenn Morris === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2011-11-17 17:40:48 +0000 +++ lisp/org/org-bibtex.el 2011-11-23 07:03:56 +0000 @@ -215,7 +215,7 @@ "List to hold parsed bibtex entries.") (defcustom org-bibtex-autogen-keys nil - "Set to a truthy value to use `bibtex-generate-autokey' to generate keys." + "Set to a truth value to use `bibtex-generate-autokey' to generate keys." :group 'org-bibtex :type 'boolean) === modified file 'lisp/org/org-clock.el' --- lisp/org/org-clock.el 2011-11-17 09:09:20 +0000 +++ lisp/org/org-clock.el 2011-11-23 07:03:56 +0000 @@ -1919,7 +1919,7 @@ shiftedm (- 13 (* 3 (nth 1 tmp))) shiftedq (- 5 (nth 1 tmp)))) (setq d 1 h 0 m 0 d1 1 month shiftedm month1 (+ 3 shiftedm) h1 0 m1 0 y shiftedy)) - ((> (+ q shift) 0) ; shift is whitin this year + ((> (+ q shift) 0) ; shift is within this year (setq shiftedq (+ q shift)) (setq shiftedy y) (setq d 1 h 0 m 0 d1 1 month (+ 1 (* 3 (- (+ q shift) 1))) month1 (+ 4 (* 3 (- (+ q shift) 1))) h1 0 m1 0)))) === modified file 'lisp/org/org-colview.el' --- lisp/org/org-colview.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-colview.el 2011-11-23 07:03:56 +0000 @@ -474,7 +474,7 @@ ((equal major-mode 'org-agenda-mode) (org-columns-eval eval) ;; The following let preserves the current format, and makes sure - ;; that in only a single file things need to be upated. + ;; that in only a single file things need to be updated. (let* ((org-agenda-overriding-columns-format org-columns-current-fmt) (buffer (marker-buffer pom)) (org-agenda-contributing-files @@ -605,7 +605,7 @@ ((equal major-mode 'org-agenda-mode) (org-columns-eval '(org-entry-put pom key nval)) ;; The following let preserves the current format, and makes sure - ;; that in only a single file things need to be upated. + ;; that in only a single file things need to be updated. (let* ((org-agenda-overriding-columns-format org-columns-current-fmt) (buffer (marker-buffer pom)) (org-agenda-contributing-files === modified file 'lisp/org/org-freemind.el' --- lisp/org/org-freemind.el 2011-08-30 22:43:43 +0000 +++ lisp/org/org-freemind.el 2011-11-23 07:03:56 +0000 @@ -660,7 +660,7 @@ (with-current-buffer mm-buffer (erase-buffer) (setq buffer-file-coding-system 'utf-8) - ;; Fix-me: Currentl Freemind (ver 0.9.0 RC9) does not support this: + ;; Fix-me: Currently Freemind (ver 0.9.0 RC9) does not support this: ;;(insert "\n") (insert "\n") (insert "\n")) === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2011-11-19 09:18:31 +0000 +++ lisp/progmodes/ada-mode.el 2011-11-23 07:03:56 +0000 @@ -1694,7 +1694,7 @@ (defun ada-no-auto-case (&optional _arg) "Do nothing. ARG is ignored. This function can be used for the auto-casing variables in Ada mode, to -adapt to unusal auto-casing schemes. Since it does nothing, you can for +adapt to unusual auto-casing schemes. Since it does nothing, you can for instance use it for `ada-case-identifier' if you don't want any special auto-casing for identifiers, whereas keywords have to be lower-cased. See also `ada-auto-case' to disable auto casing altogether." === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2011-11-20 07:30:16 +0000 +++ lisp/progmodes/cc-engine.el 2011-11-23 07:03:56 +0000 @@ -6467,7 +6467,7 @@ (when (c-keyword-member kwd-sym 'c-typeless-decl-kwds) (setq maybe-typeless t)) - ;; Haven't matched a type so it's an umambiguous + ;; Haven't matched a type so it's an unambiguous ;; specifier keyword and we know we're in a ;; declaration. (setq at-decl-or-cast t) === modified file 'lisp/progmodes/cperl-mode.el' --- lisp/progmodes/cperl-mode.el 2011-11-20 07:30:16 +0000 +++ lisp/progmodes/cperl-mode.el 2011-11-23 07:03:56 +0000 @@ -1811,7 +1811,7 @@ (funcall f)) (make-local-variable 'compilation-error-regexp-alist) (push 'cperl compilation-error-regexp-alist))) - ((boundp 'compilation-error-regexp-alist);; xmeacs 19.x + ((boundp 'compilation-error-regexp-alist);; xemacs 19.x (make-local-variable 'compilation-error-regexp-alist) (set 'compilation-error-regexp-alist (append cperl-compilation-error-regexp-alist === modified file 'lisp/progmodes/hideshow.el' --- lisp/progmodes/hideshow.el 2011-09-22 07:24:08 +0000 +++ lisp/progmodes/hideshow.el 2011-11-23 07:03:56 +0000 @@ -194,9 +194,9 @@ ;; Unfortunately, these workarounds do not restore hideshow state. ;; If someone figures out a better way, please let me know. -;; * Correspondance +;; * Correspondence ;; -;; Correspondance welcome; please indicate version number. Send bug +;; Correspondence welcome; please indicate version number. Send bug ;; reports and inquiries to . ;; * Thanks === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2011-11-16 17:47:25 +0000 +++ lisp/progmodes/idlw-shell.el 2011-11-23 07:03:56 +0000 @@ -1844,7 +1844,7 @@ (cond ((file-regular-p file2) file2) ((file-regular-p file1) file1) - ;; If we cannot veryfy the existence of the file, we return the shorter + ;; If we cannot verify the existence of the file, we return the shorter ;; name. The idea behind this is that this may be a relative file name ;; and our idea about the current working directory may be wrong. ;; If it is a relative file name, it hopefully is short. === modified file 'lisp/progmodes/prolog.el' --- lisp/progmodes/prolog.el 2011-11-20 02:29:42 +0000 +++ lisp/progmodes/prolog.el 2011-11-23 07:03:56 +0000 @@ -164,7 +164,7 @@ ;; with the original form). My code on the matter was improved ;; considerably by Markus Triska. ;; o Fixed `prolog-insert-spaces-after-paren' (which used an -;; unitialized variable). +;; uninitialized variable). ;; o Minor changes to clean up the code and avoid some implicit ;; package requirements. ;; Version 1.13: @@ -691,7 +691,7 @@ (defcustom prolog-use-standard-consult-compile-method-flag t "*Non-nil means use the standard compilation method. Otherwise the new compilation method will be used. This -utilises a special compilation buffer with the associated +utilizes a special compilation buffer with the associated features such as parsing of error messages and automatically jumping to the source code responsible for the error. === modified file 'lisp/ps-mule.el' --- lisp/ps-mule.el 2011-11-20 02:29:42 +0000 +++ lisp/ps-mule.el 2011-11-23 07:03:56 +0000 @@ -366,7 +366,7 @@ ;; character is printed by which FONT-SPEC. It has one extra slot ;; whose value is an alist of the form: ;; (CHARSET . FONT-SPEC) -;; FONT-SPEC is a vecotr of the form: +;; FONT-SPEC is a vector of the form: ;; (ID FONT-SRC FONT-NAME ENCODING EXTRA) (defvar ps-mule-font-spec-tables nil) === modified file 'lisp/repeat.el' --- lisp/repeat.el 2011-11-20 02:29:42 +0000 +++ lisp/repeat.el 2011-11-23 07:03:56 +0000 @@ -363,7 +363,7 @@ ;; OK, there's one situation left where that doesn't work correctly: when the ;; most recent self-insertion provoked an auto-fill. The problem is that -;; unravelling the undo information after an auto-fill is too hard, since all +;; unraveling the undo information after an auto-fill is too hard, since all ;; kinds of stuff can get in there as a result of comment prefixes etc. It'd ;; be possible to advise do-auto-fill to record the most recent ;; self-insertion before it does its thing, but that's a performance hit on === modified file 'lisp/ses.el' --- lisp/ses.el 2011-11-20 02:29:42 +0000 +++ lisp/ses.el 2011-11-23 07:03:56 +0000 @@ -1143,7 +1143,7 @@ (setq x (concat text (if (< maxcol ses--numcols) " " "\n"))) ;; We use set-text-properties to prevent a wacky print function from ;; inserting rogue properties, and to ensure that the keymap property is - ;; inherited (is it a bug that only unpropertied strings actually + ;; inherited (is it a bug that only unpropertized strings actually ;; inherit from surrounding text?) (set-text-properties 0 (length x) nil x) (insert-and-inherit x) @@ -1371,7 +1371,7 @@ result-so-far) (defsubst ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr) - "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and + "Relocate one symbol SYM, which corresponds to ROWCOL (a cons of ROW and COL). Cells starting at (STARTROW,STARTCOL) are being shifted by (ROWINCR,COLINCR)." (let ((row (car rowcol)) === modified file 'lisp/subr.el' --- lisp/subr.el 2011-11-19 13:17:13 +0000 +++ lisp/subr.el 2011-11-23 07:03:56 +0000 @@ -3792,7 +3792,7 @@ ;; MIN-CHANGE ;; MIN-TIME]) ;; -;; This weirdeness is for optimization reasons: we want +;; This weirdness is for optimization reasons: we want ;; `progress-reporter-update' to be as fast as possible, so ;; `(car reporter)' is better than `(aref reporter 0)'. ;; === modified file 'lisp/term.el' --- lisp/term.el 2011-11-20 02:29:42 +0000 +++ lisp/term.el 2011-11-23 07:03:56 +0000 @@ -43,7 +43,7 @@ ;; Important caveat, when deciding the cursor/'grey keys' keycodes I had to ;; make a choice: on my Linux box this choice allows me to run all the ;; ncurses applications without problems but make these keys -;; uncomprehensible to all the cursesX programs. Your mileage may vary so +;; incomprehensible to all the cursesX programs. Your mileage may vary so ;; you may consider changing the default 'emulation'. Just search for this ;; piece of code and modify it as you like: ;; === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2011-11-20 19:35:27 +0000 +++ lisp/term/ns-win.el 2011-11-23 07:03:56 +0000 @@ -492,7 +492,7 @@ command-line-default-directory))) (file (find-file-noselect f)) (bufwin1 (get-buffer-window file 'visible)) - (bufwin2 (get-buffer-window "*scratch*" 'visibile))) + (bufwin2 (get-buffer-window "*scratch*" 'visible))) (cond (bufwin1 (select-frame (window-frame bufwin1)) === modified file 'lisp/textmodes/artist.el' --- lisp/textmodes/artist.el 2011-11-20 19:35:27 +0000 +++ lisp/textmodes/artist.el 2011-11-23 07:03:56 +0000 @@ -3215,7 +3215,7 @@ ;; 2| | ;; 3+-----+ ;; -;; We will then pop (0,0) and remove the left-most vertival line while +;; We will then pop (0,0) and remove the left-most vertical line while ;; pushing the lower left corner (0,3) on the stack, and so on until ;; the entire rectangle is vaporized. ;; === modified file 'lisp/textmodes/fill.el' --- lisp/textmodes/fill.el 2011-07-16 20:05:54 +0000 +++ lisp/textmodes/fill.el 2011-11-23 07:03:56 +0000 @@ -469,7 +469,7 @@ (goto-char from) (if enable-multibyte-characters - ;; Delete unnecessay newlines surrounded by words. The + ;; Delete unnecessary newlines surrounded by words. The ;; character category `|' means that we can break a line at the ;; character. And, char-table ;; `fill-nospace-between-words-table' tells how to concatenate === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2011-11-20 19:35:27 +0000 +++ lisp/vc/ediff-util.el 2011-11-23 07:03:56 +0000 @@ -2635,7 +2635,7 @@ )) ;; Kill the variant buffer, according to user directives (ask, kill -;; unconditionaly, keep) +;; unconditionally, keep) ;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor (defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants) ;; if this is indirect buffer, kill it and substitute with direct buf === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2011-11-20 07:30:16 +0000 +++ lisp/vc/vc.el 2011-11-23 07:03:56 +0000 @@ -181,7 +181,7 @@ ;; * working-revision (file) ;; ;; Return the working revision of FILE. This is the revision fetched -;; by the last checkout or upate, not necessarily the same thing as the +;; by the last checkout or update, not necessarily the same thing as the ;; head or tip revision. Should return "0" for a file added but not yet ;; committed. ;; === modified file 'oldXMenu/Activate.c' --- oldXMenu/Activate.c 2011-04-16 08:25:42 +0000 +++ oldXMenu/Activate.c 2011-11-23 07:03:56 +0000 @@ -78,7 +78,7 @@ * * 3) The application has enabled asynchronous event * queuing mode. In this mode all foreign events - * will be queued up untill XMenuActivate + * will be queued up until XMenuActivate * terminates; at which time they will be * returned to the X event queue. As long as * AEQ mode is enabled any asynchronous event === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-23 06:47:09 +0000 +++ src/ChangeLog 2011-11-23 07:03:56 +0000 @@ -7089,7 +7089,7 @@ 2011-04-08 T.V. Raman (tiny change) - * xml.c (parse_region): Avoid creating spurious whiespace nodes. + * xml.c (parse_region): Avoid creating spurious whitespace nodes. 2011-04-08 Chong Yidong === modified file 'src/ChangeLog.10' --- src/ChangeLog.10 2011-11-20 19:35:27 +0000 +++ src/ChangeLog.10 2011-11-23 07:03:56 +0000 @@ -5084,7 +5084,7 @@ 2006-02-26 Chong Yidong - * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument. + * xterm.h, xterm.c (x_uncatch_errors): Delete unnecessary argument. * xterm.c (x_load_font, x_term_init, XTmouse_position) (handle_one_xevent, x_connection_closed, x_list_fonts): === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-11-20 19:35:27 +0000 +++ src/ChangeLog.11 2011-11-23 07:03:56 +0000 @@ -11805,7 +11805,7 @@ * coding.c (encode_coding_utf_16): Fix checking of a Unicode character. - * cmds.c (Fself_insert_command): Avoid unnecessay + * cmds.c (Fself_insert_command): Avoid unnecessary unibyte->multibyte conversion. (Bug#4240) (Bug#4037) 2009-08-26 Dan Nicolaescu === modified file 'src/ChangeLog.3' --- src/ChangeLog.3 2011-11-20 03:48:53 +0000 +++ src/ChangeLog.3 2011-11-23 07:03:56 +0000 @@ -14880,7 +14880,7 @@ 1989-08-09 Joseph Arceneaux (jla@spiff) - * ../oldXMenu/Makefile: Removed all the unneccessary X stuff. + * ../oldXMenu/Makefile: Removed all the unnecessary X stuff. 1989-08-07 Richard Stallman (rms@sugar-bombs.ai.mit.edu) === modified file 'src/ChangeLog.9' --- src/ChangeLog.9 2011-11-20 19:35:27 +0000 +++ src/ChangeLog.9 2011-11-23 07:03:56 +0000 @@ -3479,7 +3479,7 @@ a workaround for SunOS 4's cc. (CCL_CALL_FOR_MAP_INSTRUCTION): Use "if (1)..." not "do {...". (CCL_SUCCESS, CCL_SUSPEND, CCL_INVALID_CMD): Likewise. - (ccl_driver) : Remove unnecessay "do" + (ccl_driver) : Remove unnecessary "do" statement. 2001-01-23 Gerd Moellmann === modified file 'src/fileio.c' --- src/fileio.c 2011-11-20 04:34:32 +0000 +++ src/fileio.c 2011-11-23 07:03:56 +0000 @@ -1553,7 +1553,7 @@ if (p) /* Start over with the new string, so we check the file-name-handler again. Important with filenames like "/home/foo//:/hello///there" - which whould substitute to "/:/hello///there" rather than "/there". */ + which would substitute to "/:/hello///there" rather than "/there". */ return Fsubstitute_in_file_name (make_specified_string (p, -1, endp - p, multibyte)); === modified file 'src/fontset.c' --- src/fontset.c 2011-11-20 07:30:16 +0000 +++ src/fontset.c 2011-11-23 07:03:56 +0000 @@ -631,7 +631,7 @@ { /* Something strange happened, perhaps because of a Font-backend problem. Too avoid crashing, record - that this spec is unsable. It may be better to find + that this spec is unusable. It may be better to find another font of the same spec, but currently we don't have such an API. */ RFONT_DEF_SET_FACE (rfont_def, -1); === modified file 'src/fringe.c' --- src/fringe.c 2011-09-09 01:06:52 +0000 +++ src/fringe.c 2011-11-23 07:03:56 +0000 @@ -928,7 +928,7 @@ int top_ind_rn, bot_ind_rn; int top_ind_min_y, bot_ind_max_y; - /* top_ind_rn is set to a nonnegative value whenver + /* top_ind_rn is set to a nonnegative value whenever row->indicate_bob_p is set, so it's OK that top_row_ends_at_zv_p is not initialized here. Similarly for bot_ind_rn, row->indicate_eob_p and bot_row_ends_at_zv_p. */ === modified file 'src/nsgui.h' --- src/nsgui.h 2011-09-09 01:06:52 +0000 +++ src/nsgui.h 2011-11-23 07:03:56 +0000 @@ -65,7 +65,7 @@ int descent; } XCharStruct; -/* Fake tructure from Xlib.h to represent two-byte characters. */ +/* Fake structure from Xlib.h to represent two-byte characters. */ #ifndef __OBJC__ typedef unsigned short unichar; #endif @@ -202,4 +202,3 @@ #define PWinGravity (1L << 9) /* program specified window gravity */ #endif /* __NSGUI_H__ */ - === modified file 'src/nsterm.m' --- src/nsterm.m 2011-11-15 07:55:13 +0000 +++ src/nsterm.m 2011-11-23 07:03:56 +0000 @@ -3075,7 +3075,7 @@ /* If there is no mask, the background won't be seen, so draw a rectangle on the image for the cursor. - Do this for all images, getting trancparency right is not reliable. */ + Do this for all images, getting transparency right is not reliable. */ if (s->hl == DRAW_CURSOR) { int thickness = abs (s->img->relief); === modified file 'src/w32fns.c' --- src/w32fns.c 2011-11-20 19:35:27 +0000 +++ src/w32fns.c 2011-11-23 07:03:56 +0000 @@ -3711,7 +3711,7 @@ if (w32_system_caret_hwnd == NULL) { /* Use the default caret width, and avoid changing it - unneccesarily, as it confuses screen reader software. */ + unnecessarily, as it confuses screen reader software. */ w32_system_caret_hwnd = hwnd; CreateCaret (hwnd, NULL, 0, w32_system_caret_height); === modified file 'src/w32term.h' --- src/w32term.h 2011-11-17 17:40:48 +0000 +++ src/w32term.h 2011-11-23 07:03:56 +0000 @@ -209,7 +209,7 @@ the information that is specific to W32 windows. */ /* Put some things in x_output for compatibility. - NTEMACS_TODO: Move all common things here to eliminate unneccesary + NTEMACS_TODO: Move all common things here to eliminate unnecessary diffs between X and w32 code. */ struct x_output { === modified file 'test/cedet/cedet-utests.el' --- test/cedet/cedet-utests.el 2011-01-25 04:08:28 +0000 +++ test/cedet/cedet-utests.el 2011-11-23 07:03:56 +0000 @@ -96,7 +96,7 @@ "Non-nil when CEDET-utest is running all the tests.") (defun cedet-utest (&optional exit-on-error) - "Run the CEDET unittests. + "Run the CEDET unit tests. EXIT-ON-ERROR causes the test suite to exit on an error, instead of just logging the error." (interactive) === modified file 'test/cedet/semantic-utest.el' --- test/cedet/semantic-utest.el 2011-11-20 19:35:27 +0000 +++ test/cedet/semantic-utest.el 2011-11-23 07:03:56 +0000 @@ -536,7 +536,7 @@ (defun semantic-utest-generic (testname filename contents name-contents names-removed killme insertme) "Generic unit test according to template. -Should work for languages withouth .h files, python javascript java. +Should work for languages without .h files, python javascript java. TESTNAME is the name of the test. FILENAME is the name of the file to create. CONTENTS is the contents of the file to test. === modified file 'test/indent/octave.m' --- test/indent/octave.m 2011-11-14 23:59:56 +0000 +++ test/indent/octave.m 2011-11-23 07:03:56 +0000 @@ -19,7 +19,7 @@ pop = x(:,1:10)(:); ## Here and below, we test if the indentation aligns with a previous ## fixindented line. This is important so as to make it easier for the - ## user to verride some indentation somewhere, and also because it + ## user to override some indentation somewhere, and also because it ## reflects the fact that the indentation decision is taken with a minimum ## amount of work (i.e. in the present case, without having to walk back ## until the `function' line). ------------------------------------------------------------ revno: 106481 fixes bug(s): http://debbugs.gnu.org/5984 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-11-23 14:47:09 +0800 message: * xdisp.c (compute_stop_pos): Check validity of end_charpos before using it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-22 18:00:38 +0000 +++ src/ChangeLog 2011-11-23 06:47:09 +0000 @@ -1,3 +1,8 @@ +2011-11-23 Chong Yidong + + * xdisp.c (compute_stop_pos): Check validity of end_charpos before + using it (Bug#5984). + 2011-11-22 Eli Zaretskii * dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode- === modified file 'src/xdisp.c' --- src/xdisp.c 2011-11-20 02:29:42 +0000 +++ src/xdisp.c 2011-11-23 06:47:09 +0000 @@ -3166,13 +3166,11 @@ Lisp_Object object, limit, position; EMACS_INT charpos, bytepos; - /* If nowhere else, stop at the end. */ - it->stop_charpos = it->end_charpos; - if (STRINGP (it->string)) { /* Strings are usually short, so don't limit the search for properties. */ + it->stop_charpos = it->end_charpos; object = it->string; limit = Qnil; charpos = IT_STRING_CHARPOS (*it); @@ -3182,6 +3180,12 @@ { EMACS_INT pos; + /* If end_charpos is out of range for some reason, such as a + misbehaving display function, rationalize it (Bug#5984). */ + if (it->end_charpos > ZV) + it->end_charpos = ZV; + it->stop_charpos = it->end_charpos; + /* If next overlay change is in front of the current stop pos (which is IT->end_charpos), stop there. Note: value of next_overlay_change is point-max if no overlay change ------------------------------------------------------------ revno: 106480 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-11-23 00:20:17 +0000 message: shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to avoid later breakage. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-22 02:17:20 +0000 +++ lisp/gnus/ChangeLog 2011-11-23 00:20:17 +0000 @@ -1,3 +1,8 @@ +2011-11-22 Lars Magne Ingebrigtsen + + * shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to + avoid later breakage. + 2011-11-22 Katsumi Yamaoka * gnus-art.el (gnus-article-setup-buffer): Decode group name used for === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-11-22 00:59:33 +0000 +++ lisp/gnus/shr.el 2011-11-23 00:20:17 +0000 @@ -53,17 +53,17 @@ :group 'shr :type 'regexp) -(defcustom shr-table-horizontal-line ? ; space +(defcustom shr-table-horizontal-line ?\s "Character used to draw horizontal table lines." :group 'shr :type 'character) -(defcustom shr-table-vertical-line ? ; space +(defcustom shr-table-vertical-line ?\s "Character used to draw vertical table lines." :group 'shr :type 'character) -(defcustom shr-table-corner ? ; space +(defcustom shr-table-corner ?\s "Character used to draw table corners." :group 'shr :type 'character) ------------------------------------------------------------ revno: 106479 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-11-22 16:53:59 -0500 message: * etc/NEWS: Mention debug-on-event. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-11-20 20:32:21 +0000 +++ etc/NEWS 2011-11-22 21:53:59 +0000 @@ -1327,6 +1327,8 @@ ** keymaps can inherit from multiple parents. +** `debug-on-event' lets you debug Emacs when stuck because of inhibit-quit. + +++ ** New reader macro ## which stands for the empty symbol. This means that the empty symbol can now be read back. Also, #: by itself ------------------------------------------------------------ revno: 106478 fixes bug(s): http://debbugs.gnu.org/10098 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-11-22 20:00:38 +0200 message: Fix bug #10098 with assertion violation during frame resize. src/dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode- and header-lines, as they don't have one computed for them. src/.gdbinit (prow): Make displayed values more self-explaining. Add row's hash code. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2011-10-29 13:35:23 +0000 +++ src/.gdbinit 2011-11-22 18:00:38 +0000 @@ -311,9 +311,8 @@ printf "y=%d x=%d pwid=%d", $row->y, $row->x, $row->pixel_width printf " a+d=%d+%d=%d", $row->ascent, $row->height-$row->ascent, $row->height printf " phys=%d+%d=%d", $row->phys_ascent, $row->phys_height-$row->phys_ascent, $row->phys_height - printf " vis=%d", $row->visible_height - printf " L=%d T=%d R=%d", $row->used[0], $row->used[1], $row->used[2] - printf "\n" + printf " vis=%d\n", $row->visible_height + printf "used=(LMargin=%d,Text=%d,RMargin=%d) Hash=%d\n", $row->used[0], $row->used[1], $row->used[2], $row->hash printf "start=%d end=%d", $row->start.pos.charpos, $row->end.pos.charpos if ($row->enabled_p) printf " ENA" === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-21 20:39:44 +0000 +++ src/ChangeLog 2011-11-22 18:00:38 +0000 @@ -1,3 +1,12 @@ +2011-11-22 Eli Zaretskii + + * dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode- + and header-lines, as they don't have one computed for them. + (Bug#10098) + + * .gdbinit (prow): Make displayed values more self-explaining. + Add row's hash code. + 2011-11-21 Lars Magne Ingebrigtsen * process.c (wait_reading_process_output): Fix asynchrounous === modified file 'src/dispnew.c' --- src/dispnew.c 2011-11-19 08:39:42 +0000 +++ src/dispnew.c 2011-11-22 18:00:38 +0000 @@ -608,7 +608,9 @@ row->glyphs[LAST_AREA] = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } - xassert (!row->enabled_p || verify_row_hash (row)); + xassert (!row->enabled_p + || row->mode_line_p + || verify_row_hash (row)); ++row; } } ------------------------------------------------------------ revno: 106477 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6585 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-11-22 10:18:56 -0500 message: * lisp/server.el (server-eval-and-print): Allow C-g. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-22 02:55:06 +0000 +++ lisp/ChangeLog 2011-11-22 15:18:56 +0000 @@ -1,3 +1,7 @@ +2011-11-22 Stefan Monnier + + * server.el (server-eval-and-print): Allow C-g (bug#6585). + 2011-11-22 Glenn Morris * mail/rmailmm.el (test-rmail-mime-handler) === modified file 'lisp/server.el' --- lisp/server.el 2011-10-19 12:54:24 +0000 +++ lisp/server.el 2011-11-22 15:18:56 +0000 @@ -685,7 +685,14 @@ (defun server-eval-and-print (expr proc) "Eval EXPR and send the result back to client PROC." - (let ((v (eval (car (read-from-string expr))))) + ;; While we're running asynchronously (from a process filter), it is likely + ;; that the emacsclient command was run in response to a user + ;; action, so the user probably knows that Emacs is processing this + ;; emacsclient request, so if we get a C-g it's likely that the user + ;; intended it to interrupt us rather than interrupt whatever Emacs + ;; was doing before it started handling the process filter. + ;; Hence `with-local-quit' (bug#6585). + (let ((v (with-local-quit (eval (car (read-from-string expr)))))) (when proc (with-temp-buffer (let ((standard-output (current-buffer))) ------------------------------------------------------------ revno: 106476 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 06:35:26 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-20 11:27:56 +0000 +++ lisp/mail/rmail.el 2011-11-22 11:35:26 +0000 @@ -4504,7 +4504,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3aa9747bf925bd2cd450f4b1f9c7cd03") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5ecb69456c4d86a4e905eb3008602a95") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ ------------------------------------------------------------ revno: 106475 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 06:20:22 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-11-20 11:21:03 +0000 +++ autogen/configure 2011-11-22 11:20:22 +0000 @@ -9834,10 +9834,10 @@ window_system=nextstep with_xft=no # set up packaging dirs - exec_prefix=${ns_appbindir} - libexecdir=${ns_appbindir}/libexec if test "${EN_NS_SELF_CONTAINED}" = yes; then prefix=${ns_appresdir} + exec_prefix=${ns_appbindir} + libexecdir=${ns_appbindir}/libexec fi ns_frag=$srcdir/src/ns.mk NS_OBJ="fontset.o fringe.o image.o" @@ -13501,7 +13501,7 @@ # See also .m.o rule in Makefile.in */ # FIXME: are all these flags really needed? Document here why. */ - C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" ## Extra CFLAGS applied to src/*.m files. GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE" fi @@ -22435,6 +22435,13 @@ echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo +if test -n "${EMACSDATA}"; then + echo " Environment variable EMACSDATA set to: $EMACSDATA" +fi +if test -n "${EMACSDOC}"; then + echo " Environment variable EMACSDOC set to: $EMACSDOC" +fi + if test $USE_XASSERTS = yes; then echo " Compiling with asserts turned on." CPPFLAGS="$CPPFLAGS -DXASSERTS=1" ------------------------------------------------------------ revno: 106474 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 00:02:21 -0800 message: Make configure print EMACSDATA/DOC. * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can have confusing effects on the build. diff: === modified file 'ChangeLog' --- ChangeLog 2011-11-22 01:56:49 +0000 +++ ChangeLog 2011-11-22 08:02:21 +0000 @@ -1,5 +1,8 @@ 2011-11-22 Glenn Morris + * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can + have confusing effects on the build. (Bug#6401) + * Makefile.in (install-arch-dep): Tweak previous change. 2011-11-22 Yavor Doganov === modified file 'configure.in' --- configure.in 2011-11-22 01:37:45 +0000 +++ configure.in 2011-11-22 08:02:21 +0000 @@ -2586,6 +2586,8 @@ AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) # See also .m.o rule in Makefile.in */ # FIXME: are all these flags really needed? Document here why. */ + dnl FIXME this should be renamed to GNUSTEP_CFLAGS, and only + dnl used in src/Makefile.in. C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" ## Extra CFLAGS applied to src/*.m files. GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE" @@ -3730,6 +3732,13 @@ echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" echo +if test -n "${EMACSDATA}"; then + echo " Environment variable EMACSDATA set to: $EMACSDATA" +fi +if test -n "${EMACSDOC}"; then + echo " Environment variable EMACSDOC set to: $EMACSDOC" +fi + if test $USE_XASSERTS = yes; then echo " Compiling with asserts turned on." CPPFLAGS="$CPPFLAGS -DXASSERTS=1" ------------------------------------------------------------ revno: 106473 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-11-21 21:55:06 -0500 message: Move rmailmm test functions to test/ directory. * lisp/mail/rmailmm.el (test-rmail-mime-handler) (test-rmail-mime-bulk-handler) (test-rmail-mime-multipart-handler): Move tests to test/ directory. * test/rmailmm.el: New file, split from lisp/mail/rmailmm.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-21 23:59:09 +0000 +++ lisp/ChangeLog 2011-11-22 02:55:06 +0000 @@ -1,3 +1,9 @@ +2011-11-22 Glenn Morris + + * mail/rmailmm.el (test-rmail-mime-handler) + (test-rmail-mime-bulk-handler) + (test-rmail-mime-multipart-handler): Move tests to test/ directory. + 2011-11-21 Juri Linkov * calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2011-11-19 11:49:54 +0000 +++ lisp/mail/rmailmm.el 2011-11-22 02:55:06 +0000 @@ -612,23 +612,6 @@ (rmail-mime-insert-decoded-text entity))) (put-text-property beg (point) 'rmail-mime-entity entity))) -;; FIXME move to the test/ directory? -(defun test-rmail-mime-handler () - "Test of a mail using no MIME parts at all." - (let ((mail "To: alex@gnu.org -Content-Type: text/plain; charset=koi8-r -Content-Transfer-Encoding: 8bit -MIME-Version: 1.0 - -\372\304\322\301\327\323\324\327\325\312\324\305\41")) - (switch-to-buffer (get-buffer-create "*test*")) - (erase-buffer) - (set-buffer-multibyte nil) - (insert mail) - (rmail-mime-show t) - (set-buffer-multibyte t))) - - (defun rmail-mime-insert-image (entity) "Decode and insert the image body of MIME-entity ENTITY." (let* ((content-type (car (rmail-mime-entity-type entity))) @@ -813,27 +796,6 @@ (rmail-mime-insert-decoded-text entity))))) (put-text-property beg (point) 'rmail-mime-entity entity))) -(defun test-rmail-mime-bulk-handler () - "Test of a mail used as an example in RFC 2183." - (let ((mail "Content-Type: image/jpeg -Content-Disposition: attachment; filename=genome.jpeg; - modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\"; -Content-Description: a complete map of the human genome -Content-Transfer-Encoding: base64 - -iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAZQ -TFRF////AAAAVcLTfgAAAPZJREFUeNq9ldsOwzAIQ+3//+l1WlvA5ZLsoUiTto4TB+ISoAjy -+ITfRBfcAmgRFFeAm+J6uhdKdFhFWUgDkFsK0oUp/9G2//Kj7Jx+5tSKOdBscgUYiKHRS/me -WATQdRUvAK0Bnmshmtn79PpaLBbbOZkjKvRnjRZoRswOkG1wFchKew2g9wXVJVZL/m4+B+vv -9AxQQR2Q33SgAYJzzVACdAWjAfRYzYFO9n6SLnydtQHSMxYDMAKqZ/8FS/lTK+zuq3CtK64L -UDwbgUEAUmk2Zyg101d6PhCDySgAvTvDgKiuOrc4dLxUb7UMnhGIexyI+d6U+ABuNAP4Simx -lgAAAABJRU5ErkJggg== -")) - (switch-to-buffer (get-buffer-create "*test*")) - (erase-buffer) - (insert mail) - (rmail-mime-show))) - (defun rmail-mime-multipart-handler (content-type content-disposition content-transfer-encoding) @@ -971,37 +933,6 @@ (rmail-mime-hidden-mode child))))) entities))) -(defun test-rmail-mime-multipart-handler () - "Test of a mail used as an example in RFC 2046." - (let ((mail "From: Nathaniel Borenstein -To: Ned Freed -Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST) -Subject: Sample message -MIME-Version: 1.0 -Content-type: multipart/mixed; boundary=\"simple boundary\" - -This is the preamble. It is to be ignored, though it -is a handy place for composition agents to include an -explanatory note to non-MIME conformant readers. - ---simple boundary - -This is implicitly typed plain US-ASCII text. -It does NOT end with a linebreak. ---simple boundary -Content-type: text/plain; charset=us-ascii - -This is explicitly typed plain US-ASCII text. -It DOES end with a linebreak. - ---simple boundary-- - -This is the epilogue. It is also to be ignored.")) - (switch-to-buffer (get-buffer-create "*test*")) - (erase-buffer) - (insert mail) - (rmail-mime-show t))) - (defun rmail-mime-insert-multipart (entity) "Presentation handler for a multipart MIME entity." (let ((current (aref (rmail-mime-entity-display entity) 0)) === modified file 'test/ChangeLog' --- test/ChangeLog 2011-11-20 03:48:53 +0000 +++ test/ChangeLog 2011-11-22 02:55:06 +0000 @@ -1,3 +1,7 @@ +2011-11-22 Glenn Morris + + * rmailmm.el: New file, split from lisp/mail/rmailmm.el. + 2011-11-20 Juanma Barranquero * cedet/semantic-utest-c.el (semantic-utest-c-comparisons): Fix typo. === added file 'test/rmailmm.el' --- test/rmailmm.el 1970-01-01 00:00:00 +0000 +++ test/rmailmm.el 2011-11-22 02:55:06 +0000 @@ -0,0 +1,93 @@ +;;; rmailmm.el --- tests for mail/rmailmm.el + +;; Copyright (C) 2006-2011 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'rmailmm) + +(defun rmailmm-test-handler () + "Test of a mail using no MIME parts at all." + (let ((mail "To: alex@gnu.org +Content-Type: text/plain; charset=koi8-r +Content-Transfer-Encoding: 8bit +MIME-Version: 1.0 + +\372\304\322\301\327\323\324\327\325\312\324\305\41")) + (switch-to-buffer (get-buffer-create "*test*")) + (erase-buffer) + (set-buffer-multibyte nil) + (insert mail) + (rmail-mime-show t) + (set-buffer-multibyte t))) + +(defun rmailmm-test-bulk-handler () + "Test of a mail used as an example in RFC 2183." + (let ((mail "Content-Type: image/jpeg +Content-Disposition: attachment; filename=genome.jpeg; + modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\"; +Content-Description: a complete map of the human genome +Content-Transfer-Encoding: base64 + +iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAAAZQ +TFRF////AAAAVcLTfgAAAPZJREFUeNq9ldsOwzAIQ+3//+l1WlvA5ZLsoUiTto4TB+ISoAjy ++ITfRBfcAmgRFFeAm+J6uhdKdFhFWUgDkFsK0oUp/9G2//Kj7Jx+5tSKOdBscgUYiKHRS/me +WATQdRUvAK0Bnmshmtn79PpaLBbbOZkjKvRnjRZoRswOkG1wFchKew2g9wXVJVZL/m4+B+vv +9AxQQR2Q33SgAYJzzVACdAWjAfRYzYFO9n6SLnydtQHSMxYDMAKqZ/8FS/lTK+zuq3CtK64L +UDwbgUEAUmk2Zyg101d6PhCDySgAvTvDgKiuOrc4dLxUb7UMnhGIexyI+d6U+ABuNAP4Simx +lgAAAABJRU5ErkJggg== +")) + (switch-to-buffer (get-buffer-create "*test*")) + (erase-buffer) + (insert mail) + (rmail-mime-show))) + +(defun rmailmm-test-multipart-handler () + "Test of a mail used as an example in RFC 2046." + (let ((mail "From: Nathaniel Borenstein +To: Ned Freed +Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST) +Subject: Sample message +MIME-Version: 1.0 +Content-type: multipart/mixed; boundary=\"simple boundary\" + +This is the preamble. It is to be ignored, though it +is a handy place for composition agents to include an +explanatory note to non-MIME conformant readers. + +--simple boundary + +This is implicitly typed plain US-ASCII text. +It does NOT end with a linebreak. +--simple boundary +Content-type: text/plain; charset=us-ascii + +This is explicitly typed plain US-ASCII text. +It DOES end with a linebreak. + +--simple boundary-- + +This is the epilogue. It is also to be ignored.")) + (switch-to-buffer (get-buffer-create "*test*")) + (erase-buffer) + (insert mail) + (rmail-mime-show t))) + +;;; rmailmm.el ends here