Now on revision 106510. ------------------------------------------------------------ revno: 106510 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-11-24 23:14:48 -0800 message: Spelling fixes. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-11-20 19:35:27 +0000 +++ admin/ChangeLog 2011-11-25 07:14:48 +0000 @@ -897,11 +897,11 @@ * FOR-RELEASE (NEW FEATURES): Completed work on this item: Rework how fringe bitmaps are defined and used. - Currently, bitmap usage and bitmap appearence are "mixed-up" in a + Currently, bitmap usage and bitmap appearance are "mixed-up" in a one-level representation. It would be cleaner to split the representation into a two-level model where first level maps bitmap usage to a bitmap name, and second level maps bitmap name to - a bitmap appearence. + a bitmap appearance. 2006-01-27 Chong Yidong === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2011-11-23 07:03:56 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2011-11-25 07:14:48 +0000 @@ -2040,7 +2040,7 @@ argument is the string of characters, the second and third arguments are numbers that indicate the beginning and end of the substring. The numbers are a count of the number of characters (including spaces and -punctuations) from the beginning of the string. +punctuation) from the beginning of the string. @need 800 For example, if you evaluate the following: === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2011-10-13 16:03:49 +0000 +++ doc/lispref/text.texi 2011-11-25 07:14:48 +0000 @@ -3762,7 +3762,7 @@ special value @code{boundary}, then any point within this special field is also considered to be ``on the boundary.'' -Commands like @kbd{C-a} with no argumemt, that normally move backward +Commands like @kbd{C-a} with no argument, that normally move backward to a specific kind of location and stay there once there, probably should specify @code{nil} for @var{escape-from-edge}. Other motion commands that check fields should probably pass @code{t}. @@ -4322,5 +4322,3 @@ code that is itself run from a modification hook, then rebind locally @code{inhibit-modification-hooks} to @code{nil}. @end defvar - - === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-24 07:44:51 +0000 +++ doc/misc/ChangeLog 2011-11-25 07:14:48 +0000 @@ -7982,7 +7982,7 @@ 2003-02-01 Michael Albinus * tramp.texi (Frequently Asked Questions): Explain a workaround if - another package loads accidently Ange-FTP. + another package loads accidentally Ange-FTP. 2003-01-24 Michael Albinus === modified file 'doc/misc/autotype.texi' --- doc/misc/autotype.texi 2011-11-20 02:29:42 +0000 +++ doc/misc/autotype.texi 2011-11-25 07:14:48 +0000 @@ -419,7 +419,7 @@ @kbd{M-x auto-insert}. When this is @code{function}, you are queried whenever @code{auto-insert} is called as a function, such as when Emacs visits an empty file and you have set the above-mentioned hook. Otherwise -you are alway queried. +you are always queried. @vindex auto-insert-prompt When querying, the variable @code{auto-insert-prompt}'s value is used as a @@ -510,7 +510,7 @@ is only done with @kbd{M-x executable-set-magic}. When this is @code{function} you are queried whenever @code{executable-set-magic} is called as a function, such as when Emacs puts a buffer in Shell script -mode. Otherwise you are alway queried. +mode. Otherwise you are always queried. @findex executable-self-display @kbd{M-x executable-self-display} adds a magic number to the buffer, which === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-11-24 07:44:51 +0000 +++ doc/misc/gnus.texi 2011-11-25 07:14:48 +0000 @@ -21279,7 +21279,7 @@ @node The swish++ Engine @subsubsection The swish++ Engine -FIXEM: Say something more here. +FIXME: Say something more here. Documentation for swish++ may be found at the swish++ sourceforge page: @uref{http://swishplusplus.sourceforge.net} @@ -21302,7 +21302,7 @@ @node The swish-e Engine @subsubsection The swish-e Engine -FIXEM: Say something more here. +FIXME: Say something more here. Documentation for swish-e may be found at the swish-e homepage @uref{http://swish-e.org} === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2011-11-19 09:18:31 +0000 +++ doc/misc/message.texi 2011-11-25 07:14:48 +0000 @@ -904,7 +904,7 @@ Until @acronym{IDNA} becomes more well known, Message queries you whether @acronym{IDNA} encoding of the domain name really should occur. Some users might not be aware that domain names can contain -non-@acronym{ASCII} now, so this gives them a safety net if they accidently +non-@acronym{ASCII} now, so this gives them a safety net if they accidentally typed a non-@acronym{ASCII} domain name. @vindex message-use-idna === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2011-11-18 08:31:02 +0000 +++ doc/misc/org.texi 2011-11-25 07:14:48 +0000 @@ -7219,7 +7219,7 @@ #+CATEGORY: Holiday %%(org-calendar-holiday) ; special function for holiday names #+CATEGORY: Ann -%%(org-anniversary 1956 5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is allways according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old +%%(org-anniversary 1956 5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is always according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old %%(org-anniversary 1869 10 2) Mahatma Gandhi would be %d years old @end example @@ -7797,8 +7797,8 @@ @item o Delete other windows. @c -@orgcmdkskc{v d,d,org-aganda-day-view} -@xorgcmdkskc{v w,w,org-aganda-day-view} +@orgcmdkskc{v d,d,org-agenda-day-view} +@xorgcmdkskc{v w,w,org-agenda-day-view} @xorgcmd{v m,org-agenda-month-view} @xorgcmd{v y,org-agenda-month-year} @xorgcmd{v SPC,org-agenda-reset-view} === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2011-11-20 02:29:42 +0000 +++ doc/misc/semantic.texi 2011-11-25 07:14:48 +0000 @@ -613,7 +613,7 @@ @c LocalWords: multitable NAvigaTOR noindent nomedian nonterm noselect @c LocalWords: nosnarf obarray OLE OO outputfile paren parsetable POINT's @c LocalWords: popup positionalonly positiononly positionormarker pre -@c LocalWords: printf printindex Programmatically pt punctuations quotemode +@c LocalWords: printf printindex Programmatically pt quotemode @c LocalWords: ref regex regexp Regexps reparse resetfile samp sb @c LocalWords: scopestart SEmantic semanticdb setfilename setq @c LocalWords: settitle setupfunction sexp sp SPC speedbar speedbar's === modified file 'doc/misc/ses.texi' --- doc/misc/ses.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/ses.texi 2011-11-25 07:14:48 +0000 @@ -446,7 +446,7 @@ execute when starting SES mode for a buffer). The variable @code{safe-functions} is a list of possibly-unsafe -functions to be treated as safe when analysing formulas and printers. +functions to be treated as safe when analyzing formulas and printers. @xref{Virus protection}. Before customizing @code{safe-functions}, think about how much you trust the person who's suggesting this change. The value @code{t} turns off all anti-virus protection. A === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2011-11-20 02:29:42 +0000 +++ doc/misc/tramp.texi 2011-11-25 07:14:48 +0000 @@ -3573,7 +3573,7 @@ When @code{tramp-verbose} is greater than or equal to 4, the messages are also written into a @value{tramp} debug buffer. This debug buffer -is useful for analysing problems; sending a @value{tramp} bug report +is useful for analyzing problems; sending a @value{tramp} bug report should be done with @code{tramp-verbose} set to a verbosity level of at least 6 (@pxref{Bug Reports}). === modified file 'etc/MH-E-NEWS' --- etc/MH-E-NEWS 2011-11-20 20:32:21 +0000 +++ etc/MH-E-NEWS 2011-11-25 07:14:48 +0000 @@ -1584,7 +1584,7 @@ MH-E now supports several spam filters including Bogofilter, SpamProbe, and SpamAssassin. Spam that is mistakenly considered to be good mail can be reclassified as spam with "J b (mh-junk-blacklist)". -Conversely, good mail that is accidently considered to be spam can be +Conversely, good mail that is accidentally considered to be spam can be reclassified with "J w (mh-junk-whitelist)" (closes SF #669518). If a message is blacklisted, and `mh-junk-mail-folder' is a string, === modified file 'leim/quail/ethiopic.el' --- leim/quail/ethiopic.el 2011-02-28 01:07:29 +0000 +++ leim/quail/ethiopic.el 2011-11-25 07:14:48 +0000 @@ -53,7 +53,7 @@ punctuation followed by zero or more ASCII spaces'. S-F5 or `M-x ethio-toggle-punctuation' - Toggles ASCII punctuations and Ethiopic punctuations for keyboard input. + Toggles ASCII punctuation and Ethiopic punctuation for keyboard input. The current mode is indicated by `.' (ASCII) or `$(3$i(B' (Ethiopic). S-SPC or `M-x ethio-insert-ethio-space' === modified file 'leim/quail/tibetan.el' --- leim/quail/tibetan.el 2011-11-17 09:09:20 +0000 +++ leim/quail/tibetan.el 2011-11-25 07:14:48 +0000 @@ -28,7 +28,7 @@ ;; Created: Feb. 17. 1997 ;; History: -;; 1997.03.13 Support for inputting special signs and punctuations added. +;; 1997.03.13 Support for inputting special signs and punctuation added. ;; (Only Ext. Wylie input) ;;; Commentary: @@ -56,7 +56,7 @@ (if (string-match "^-[dy]" quail-current-key) (setq quail-current-key (substring quail-current-key 1))) (let ((str (tibetan-transcription-to-tibetan quail-current-key))) - ;; If quail-current-key is for punctuations, it can't be + ;; If quail-current-key is for punctuation, it can't be ;; transcribed by tibetan-transcription-to-tibetan, thus STR ;; contains ASCII string now. In that case, use the current ;; characters set in quail-current-str. @@ -80,7 +80,7 @@ '(("-d" . "$(7"2(B") ("-y" . "$(7"B(B"))) -;; Punctuations are not transcribed. +;; Punctuation characters are not transcribed. (defconst tibetan-wylie-punctuation-alist '(("." . " ") === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2011-11-20 19:35:27 +0000 +++ lisp/ChangeLog.10 2011-11-25 07:14:48 +0000 @@ -5904,7 +5904,7 @@ (mis-)use tramp-current-user as indication, assuming it is set in `tramp-completion-handle-file-name-all-completions'. (tramp-send-region): Handle the case `tramp-chunksize' is equal 0. - I did it accidently. Infinite loop ... + I did it accidentally. Infinite loop ... (tramp-get-device): `tramp-make-tramp-file-name' must not be called with NIL path. It fails in case of multi-method. (tramp-file-name-for-operation): Apply `expand-file-name' for === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2011-11-20 19:35:27 +0000 +++ lisp/ChangeLog.12 2011-11-25 07:14:48 +0000 @@ -10695,7 +10695,7 @@ * net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for the prompt. If it returns earlier (when detecting an error - message), the rest of the output will merge accidently with the + message), the rest of the output will merge accidentally with the output of the next command. Reported by M Jared Finder . @@ -16181,7 +16181,7 @@ 2005-12-08 Alan Mackenzie - * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the + * progmodes/cc-awk.el: Move regexps for analyzing AWK code to near the start of the file. ^L now separate sections of the file. (c-awk-non-eol-esc-pair-re, c-awk-blank-or-comment-line-re) (c-awk-one-line-possibly-open-string-re) === modified file 'lisp/ChangeLog.3' --- lisp/ChangeLog.3 2011-11-24 01:58:14 +0000 +++ lisp/ChangeLog.3 2011-11-25 07:14:48 +0000 @@ -9536,7 +9536,7 @@ it@top level. * texnfo-upd.el (texinfo-incorporate-descriptions): Don't - accidently find a string in the description that is confused for + accidentally find a string in the description that is confused for a menu item. 1990-06-01 Robert J. Chassell (bob@wheat-chex) @@ -12454,4 +12454,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2011-11-20 03:48:53 +0000 +++ lisp/ChangeLog.8 2011-11-25 07:14:48 +0000 @@ -530,7 +530,7 @@ composition-function-table. (tibetan-composable-pattern): New variable. (tibetan-subjoined-transcription-alist): Change key "R" to "+R". - (tibetan-precomposition-rule-alist): Move punctuations to + (tibetan-precomposition-rule-alist): Move punctuation to tibetan-punctuation-transcription-alist and tibetan-obsolete-glyphs. (tibetan-punctuation-transcription-alist): New variable. === modified file 'lisp/cedet/ede/files.el' --- lisp/cedet/ede/files.el 2011-11-15 17:37:37 +0000 +++ lisp/cedet/ede/files.el 2011-11-25 07:14:48 +0000 @@ -249,7 +249,7 @@ "Return a project description object if DIR has a project. Optional argument FORCE means to ignore a hash-hit of 'nomatch. This depends on an up to date `ede-project-class-files' variable. -Any directory that contains the file .ede-ignore will allways +Any directory that contains the file .ede-ignore will always return nil." (when (not (file-exists-p (expand-file-name ".ede-ignore" dir))) (let* ((dirtest (expand-file-name dir)) === modified file 'lisp/cedet/ede/proj-shared.el' --- lisp/cedet/ede/proj-shared.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/proj-shared.el 2011-11-25 07:14:48 +0000 @@ -61,7 +61,7 @@ ; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^") ; ) ; :commands '("$(C_SHARED_LINK) %s") - ;; @TODO - addative modification of autoconf. + ;; @TODO - additive modification of autoconf. :autoconf '("AC_PROG_LIBTOOL") ) "Compiler for C sourcecode.") @@ -108,7 +108,7 @@ :variables '(("CXX_SHARED" . "g++") ("CXX_SHARED_COMPILE" . "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")) - ;; @TODO - addative modification of autoconf. + ;; @TODO - additive modification of autoconf. :autoconf '("AC_PROG_LIBTOOL") ) "Compiler for C sourcecode.") === modified file 'lisp/cedet/semantic/grammar.el' --- lisp/cedet/semantic/grammar.el 2011-08-04 00:58:07 +0000 +++ lisp/cedet/semantic/grammar.el 2011-11-25 07:14:48 +0000 @@ -104,10 +104,10 @@ ;; regexp match semicolons inside strings! semantic-lex-ignore-comments ;; Must detect prefixed list before punctuation because prefix chars - ;; are also punctuations! + ;; are also punctuation! semantic-grammar-wy---sexp-analyzer - ;; Must detect punctuations after comments because the semicolon can - ;; be a punctuation or a comment start! + ;; Must detect punctuation after comments because the semicolon can + ;; be punctuation or a comment start! semantic-grammar-wy---string-analyzer semantic-grammar-wy---block-analyzer semantic-grammar-wy---sexp-analyzer) === modified file 'lisp/cedet/semantic/lex.el' --- lisp/cedet/semantic/lex.el 2011-11-20 02:29:42 +0000 +++ lisp/cedet/semantic/lex.el 2011-11-25 07:14:48 +0000 @@ -165,7 +165,7 @@ ;; ;; %type syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string ;; -;; ;; Some punctuations based on the type defines above +;; ;; Some punctuation based on the type defines above ;; ;; %token NOT "!" ;; %token NOTEQ "!=" @@ -1313,7 +1313,7 @@ (define-lex-analyzer semantic-lex-punctuation-type "Detect and create a punctuation type token. -Recognized punctuations are defined in the current table of lexical +Recognized punctuation is defined in the current table of lexical types, as the value of the `punctuation' token type." (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+") (let* ((key (match-string 0)) === modified file 'lisp/cedet/semantic/senator.el' --- lisp/cedet/semantic/senator.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/senator.el 2011-11-25 07:14:48 +0000 @@ -179,8 +179,8 @@ (goto-char (semantic-tag-start tag)) (when (re-search-forward (concat ;; The tag name is expected to be - ;; between word delimiters, whitespaces, - ;; or punctuations. + ;; between word delimiters, whitespace, + ;; or punctuation. "\\(\\<\\|\\s-+\\|\\s.\\)" (regexp-quote name) "\\(\\>\\|\\s-+\\|\\s.\\)") === modified file 'lisp/color.el' --- lisp/color.el 2011-11-19 09:18:31 +0000 +++ lisp/color.el 2011-11-25 07:14:48 +0000 @@ -128,8 +128,8 @@ RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0, inclusive. -Return a list (HUE, SATURATION, LUMINENCE), where HUE is in radians -and both SATURATION and LUMINENCE are between 0.0 and 1.0, +Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians +and both SATURATION and LUMINANCE are between 0.0 and 1.0, inclusive." (let* ((r red) (g green) === modified file 'lisp/follow.el' --- lisp/follow.el 2011-11-20 19:35:27 +0000 +++ lisp/follow.el 2011-11-25 07:14:48 +0000 @@ -98,7 +98,7 @@ ;; (global-set-key [f7] 'follow-delete-other-windows-and-split) -;; There exist two system variables that control the appearence of +;; There exist two system variables that control the appearance of ;; lines wider than the window containing them. The default is to ;; truncate long lines whenever a window isn't as wide as the frame. ;; === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-24 07:44:51 +0000 +++ lisp/gnus/ChangeLog 2011-11-25 07:14:48 +0000 @@ -2778,7 +2778,7 @@ 2011-01-28 Lars Ingebrigtsen * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active - data if the group is unactivated. + data if the group is deactivated. 2011-01-28 Julien Danjou === modified file 'lisp/gnus/gmm-utils.el' --- lisp/gnus/gmm-utils.el 2011-11-15 07:55:13 +0000 +++ lisp/gnus/gmm-utils.el 2011-11-25 07:14:48 +0000 @@ -217,7 +217,7 @@ 'static-color 'pseudo-color))))) 'gnome 'retro) - "Prefered tool bar style." + "Preferred tool bar style." :type '(choice (const :tag "GNOME style" gnome) (const :tag "Retro look" retro)) :group 'gmm) === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-11-24 01:58:14 +0000 +++ lisp/gnus/gnus-group.el 2011-11-25 07:14:48 +0000 @@ -1354,9 +1354,9 @@ (predicate t) ; We list all groups? (t (or - (if (eq unread t) ; Unactivated? + (if (eq unread t) ; Deactivated? gnus-group-list-inactive-groups - ; We list unactivated + ; We list inactive (and (numberp unread) (> unread 0))) ; We list groups with unread articles (and gnus-list-groups-with-ticked-articles === modified file 'lisp/gnus/gnus-topic.el' --- lisp/gnus/gnus-topic.el 2011-11-14 06:27:12 +0000 +++ lisp/gnus/gnus-topic.el 2011-11-25 07:14:48 +0000 @@ -582,7 +582,7 @@ (or gnus-topic-display-empty-topics ;We want empty topics (not (zerop unread)) ;Non-empty tick ;Ticked articles - (/= point-max (point-max)))) ;Unactivated groups + (/= point-max (point-max)))) ;Inactive groups (gnus-extent-start-open (point)) (gnus-topic-insert-topic-line (car type) visiblep === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2011-11-15 17:37:37 +0000 +++ lisp/gnus/mm-decode.el 2011-11-25 07:14:48 +0000 @@ -360,7 +360,7 @@ (\"text/html\" \"text/richtext\") Adding \"image/.*\" might also be useful. Spammers use it as the -prefered part of multipart/alternative messages. See also +preferred part of multipart/alternative messages. See also `gnus-buttonized-mime-types', to which adding \"multipart/alternative\" enables you to choose manually one of two types those mails include." :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'. === modified file 'lisp/gnus/rfc2047.el' --- lisp/gnus/rfc2047.el 2011-11-15 17:37:37 +0000 +++ lisp/gnus/rfc2047.el 2011-11-25 07:14:48 +0000 @@ -586,7 +586,7 @@ ((>= column rfc2047-encode-max-chars) (when eword (cond ((string-match "\n[ \t]+\\'" eword) - ;; Reomove a superfluous empty line. + ;; Remove a superfluous empty line. (setq eword (substring eword 0 (match-beginning 0)))) ((string-match "(+\\'" eword) ;; Break the line before the open parenthesis. @@ -639,7 +639,7 @@ (setq crest " " eword (concat eword next))) (when (string-match "\n[ \t]+\\'" eword) - ;; Reomove a superfluous empty line. + ;; Remove a superfluous empty line. (setq eword (substring eword 0 (match-beginning 0)))) (rfc2047-encode-1 (length crest) (substring string index) cs encoder start " " tail === modified file 'lisp/gnus/starttls.el' --- lisp/gnus/starttls.el 2011-11-24 07:44:51 +0000 +++ lisp/gnus/starttls.el 2011-11-25 07:14:48 +0000 @@ -35,7 +35,7 @@ ;; and the second one is Simon Josefsson's starttls.el which uses ;; "gnutls-cli" from GnuTLS. ;; -;; If "starttls" is available, it is prefered by the code over +;; If "starttls" is available, it is preferred by the code over ;; "gnutls-cli", for backwards compatibility. Use ;; `starttls-use-gnutls' to toggle between implementations if you have ;; both tools installed. It is recommended to use GnuTLS, though, as === modified file 'lisp/help.el' --- lisp/help.el 2011-11-01 16:21:41 +0000 +++ lisp/help.el 2011-11-25 07:14:48 +0000 @@ -969,7 +969,7 @@ The value is the maximum height (in lines) which `resize-temp-buffer-window' will give to a window displaying a temporary buffer. It can also be a function to be called to -choose the height for such a buffer. It gets one argumemt, the +choose the height for such a buffer. It gets one argument, the buffer, and should return a positive integer. At the time the function is called, the window to be resized is selected." :type '(choice integer function) === modified file 'lisp/international/mule.el' --- lisp/international/mule.el 2011-11-20 03:48:53 +0000 +++ lisp/international/mule.el 2011-11-25 07:14:48 +0000 @@ -703,13 +703,13 @@ BOM, and on encoding, don't produce BOM bytes. If the value is t, on decoding, skip the first two-byte as BOM, and on -encoding, produce BOM bytes accoding to the value of `:endian'. +encoding, produce BOM bytes according to the value of `:endian'. If the value is cons, on decoding, check the first two-byte. If they are 0xFE 0xFF, use the car part coding system of the value. If they are 0xFF 0xFE, use the cdr part coding system of the value. Otherwise, treat them as bytes for a normal character. On encoding, -produce BOM bytes accoding to the value of `:endian'. +produce BOM bytes according to the value of `:endian'. This attribute has a meaning only when `:coding-type' is `utf-16' or `utf-8'. === modified file 'lisp/international/titdic-cnv.el' --- lisp/international/titdic-cnv.el 2011-11-20 07:30:16 +0000 +++ lisp/international/titdic-cnv.el 2011-11-25 07:14:48 +0000 @@ -128,11 +128,11 @@ \\") ("chinese-punct-b5" "$(0O:(BB" - "Input method for Chinese punctuations and symbols of Big5 + "Input method for Chinese punctuation and symbols of Big5 \(`chinese-big5-1' and `chinese-big5-2').") ("chinese-punct" "$A1j(BG" - "Input method for Chinese punctuations and symbols of GB2312 + "Input method for Chinese punctuation and symbols of GB2312 \(`chinese-gb2312').") ("chinese-py-b5" "$(03<(BB" @@ -801,36 +801,36 @@ (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y)))))) (dolist (elt dic) (insert (format "(%S\t%S)\n" (car elt) (cdr elt)))) - (let ((punctuations '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") - (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") - ("'" "$(0!e!d(B" "$(G!e!d(B") - ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") - ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") - ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") - ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") - ("?" "$(0!)!4(B" "$(G!)!4(B") - ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") - (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") - ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") - ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") - ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") - ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") - ("`" "$(0!j!k(B" "$(G!j!k(B") - ("~" "$(0"D"+",!!^!@(B" "$(G!>!^!@(B") - (")" "$(0!?!_!A(B" "$(G!?!_!A(B") - ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") - ("_" "$(0"%"&(B" "$(G"%"&(B") - ("=" "$(0"8"C(B" "$(G"8"C(B") - ("+" "$(0"0"?(B" "$(G"0"?(B")))) - (dolist (elt punctuations) + (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") + (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") + ("'" "$(0!e!d(B" "$(G!e!d(B") + ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") + ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") + ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") + ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") + ("?" "$(0!)!4(B" "$(G!)!4(B") + ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") + (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") + ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") + ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") + ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") + ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") + ("`" "$(0!j!k(B" "$(G!j!k(B") + ("~" "$(0"D"+",!!^!@(B" "$(G!>!^!@(B") + (")" "$(0!?!_!A(B" "$(G!?!_!A(B") + ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") + ("_" "$(0"%"&(B" "$(G"%"&(B") + ("=" "$(0"8"C(B" "$(G"8"C(B") + ("+" "$(0"0"?(B" "$(G"0"?(B")))) + (dolist (elt punctuation) (insert (format "(%S %S)\n" (concat "z" (car elt)) (if big5-p (nth 1 elt) (nth 2 elt)))))) (insert ")\n"))) @@ -1017,7 +1017,7 @@ of the first three letters and the last letter. For instance, \"bjdt\" inputs $A11>)5gJSL((B. -To input symbols and punctuations, type `/' followed by one of `a' to +To input symbols and punctuation, type `/' followed by one of `a' to `z', then select one of the candidates.")) (insert " '((\"\C-?\" . quail-delete-last-char) (\".\" . quail-next-translation) === modified file 'lisp/language/ethio-util.el' --- lisp/language/ethio-util.el 2011-11-14 23:59:56 +0000 +++ lisp/language/ethio-util.el 2011-11-25 07:14:48 +0000 @@ -802,7 +802,7 @@ (forward-char 1) (insert "}"))) - ;; Special Ethiopic punctuations. + ;; Special Ethiopic punctuation. (goto-char (point-min)) (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t) (cond === modified file 'lisp/language/tibet-util.el' --- lisp/language/tibet-util.el 2011-01-26 08:36:39 +0000 +++ lisp/language/tibet-util.el 2011-11-25 07:14:48 +0000 @@ -27,7 +27,7 @@ ;;; History: ;; 1997.03.13 Modification in treatment of text properties; -;; Support for some special signs and punctuations. +;; Support for some special signs and punctuation. ;; 1999.10.25 Modification for a new composition way by K.Handa. ;;; Commentary: === modified file 'lisp/language/tibetan.el' --- lisp/language/tibetan.el 2011-11-23 07:03:56 +0000 +++ lisp/language/tibetan.el 2011-11-25 07:14:48 +0000 @@ -30,7 +30,7 @@ ;;; History: -;; 1997.03.13 Modification for special signs and punctuations. +;; 1997.03.13 Modification for special signs and punctuation. ;;; Commentary: @@ -44,7 +44,7 @@ ;;; ;;; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5) -;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuations, +;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuation, ;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and ;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7![(B $(7!\(B $(7!](B $(7!^(B $(7!_(B ; Special signs. ;;;2160 $(7!`(B $(7!a(B $(7!b(B $(7!c(B $(7!d(B $(7!e(B $(7!f(B $(7!g(B $(7!h(B $(7!i(B $(7!j(B $(7!k(B $(7!l(B $(7!m(B $(7!n(B $(7!o(B ; === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-11-23 07:03:56 +0000 +++ lisp/ldefs-boot.el 2011-11-25 07:14:48 +0000 @@ -818,7 +818,7 @@ `allout-distinctive-bullets-string'. When creating a TOPIC, plain BULLETs are by default used, according to the DEPTH of the TOPIC. Choice among the distinctive BULLETs is offered when you - provide a universal argugment (\\[universal-argument]) to the + provide a universal argument (\\[universal-argument]) to the TOPIC creation command, or when explictly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2011-11-20 20:31:38 +0000 +++ lisp/mh-e/ChangeLog 2011-11-25 07:14:48 +0000 @@ -2674,7 +2674,7 @@ Follow MH-E Developers Guide conventions. Use `' quotes for Help hyperlinks such as symbols, Info nodes, or URLs. Use \" quotes for - everything else. Otherwise, you can accidently get links to + everything else. Otherwise, you can accidentally get links to nonsense symbols. 2005-12-22 Bill Wohler @@ -3456,4 +3456,3 @@ ;; sentence-end-double-space: nil ;; add-log-time-zone-rule: t ;; End: - === modified file 'lisp/net/eudc-export.el' --- lisp/net/eudc-export.el 2011-05-23 17:57:17 +0000 +++ lisp/net/eudc-export.el 2011-11-25 07:14:48 +0000 @@ -128,7 +128,7 @@ zip city state) (setq addr-components (nreverse addr-components)) ;; If not containing the zip code the last line is supposed to contain a - ;; country name and the addres is supposed to be in european style + ;; country name and the address is supposed to be in european style (if (not (string-match "[0-9][0-9][0-9]" last1)) (progn (setq state last1) === modified file 'lisp/net/secrets.el' --- lisp/net/secrets.el 2011-11-15 17:37:37 +0000 +++ lisp/net/secrets.el 2011-11-25 07:14:48 +0000 @@ -729,7 +729,7 @@ ;; Create the search buffer. (with-current-buffer (get-buffer-create "*Secrets*") (switch-to-buffer-other-window (current-buffer)) - ;; Inialize buffer with `secrets-mode'. + ;; Initialize buffer with `secrets-mode'. (secrets-mode) (secrets-show-collections)))) === modified file 'lisp/net/tramp-gvfs.el' --- lisp/net/tramp-gvfs.el 2011-11-19 09:18:31 +0000 +++ lisp/net/tramp-gvfs.el 2011-11-25 07:14:48 +0000 @@ -996,7 +996,7 @@ (let ((signal-name (dbus-event-member-name last-input-event)) (elt mount-info)) ;; Jump over the first elements of the mount info. Since there - ;; were changes in the antries, we cannot access dedicated + ;; were changes in the entries, we cannot access dedicated ;; elements. (while (stringp (car elt)) (setq elt (cdr elt))) (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) @@ -1066,7 +1066,7 @@ tramp-gvfs-interface-mounttracker "listMounts")) nil) ;; Jump over the first elements of the mount info. Since there - ;; were changes in the antries, we cannot access dedicated + ;; were changes in the entries, we cannot access dedicated ;; elements. (while (stringp (car elt)) (setq elt (cdr elt))) (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) === modified file 'lisp/net/xesam.el' --- lisp/net/xesam.el 2011-11-23 07:03:56 +0000 +++ lisp/net/xesam.el 2011-11-25 07:14:48 +0000 @@ -820,7 +820,7 @@ (with-current-buffer (generate-new-buffer (xesam-buffer-name service search)) (switch-to-buffer-other-window (current-buffer)) - ;; Inialize buffer with `xesam-mode'. `xesam-vendor' must be + ;; Initialize buffer with `xesam-mode'. `xesam-vendor' must be ;; set before calling `xesam-mode', because we want to give the ;; hook functions a chance to identify their search engine. (setq xesam-vendor (xesam-get-cached-property engine "vendor.id")) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-11-24 01:58:14 +0000 +++ lisp/org/ChangeLog 2011-11-25 07:14:48 +0000 @@ -17596,7 +17596,7 @@ 2008-06-17 Carsten Dominik * org.el (org-schedule, org-deadline): Protect scheduled and - deadline tasks against changes that accidently remove the + deadline tasks against changes that accidentally remove the repeater. Also show a message with the new date when done. 2008-06-17 Carsten Dominik === modified file 'lisp/printing.el' --- lisp/printing.el 2011-11-20 02:29:42 +0000 +++ lisp/printing.el 2011-11-25 07:14:48 +0000 @@ -547,7 +547,7 @@ ;; `pr-auto-region' Non-nil means region is automagically detected. ;; ;; `pr-auto-mode' Non-nil means major-mode specific printing is -;; prefered over normal printing. +;; preferred over normal printing. ;; ;; `pr-mode-alist' Specify an alist for a major-mode and printing ;; function. @@ -2426,7 +2426,7 @@ (defcustom pr-auto-mode t - "Non-nil means major-mode specific printing is prefered over normal printing. + "Non-nil means major-mode specific printing is preferred over normal printing. That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*' and `*-region*' commands will behave like `*-mode*' commands; otherwise, @@ -5458,7 +5458,7 @@ (defun pr-toggle-mode-menu (&optional no-menu) - "Toggle whether major-mode specific printing is prefered over normal printing." + "Toggle whether major-mode specific printing is preferred over normal printing." (interactive) (pr-toggle 'pr-auto-mode "Auto mode" 'printing 1 12 'toggle nil no-menu)) === modified file 'lisp/progmodes/cperl-mode.el' --- lisp/progmodes/cperl-mode.el 2011-11-23 07:03:56 +0000 +++ lisp/progmodes/cperl-mode.el 2011-11-25 07:14:48 +0000 @@ -7650,7 +7650,7 @@ ... &= ... Bitwise and assignment. ... * ... Multiplication. ... ** ... Exponentiation. -*NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. +*NAME Glob: all objects referred by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. &NAME(arg0, ...) Subroutine call. Arguments go to @_. ... + ... Addition. +EXPR Makes EXPR into scalar context. ++ Auto-increment (magical on strings). ++EXPR EXPR++ === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2011-11-23 07:03:56 +0000 +++ lisp/vc/ediff-util.el 2011-11-25 07:14:48 +0000 @@ -3811,7 +3811,7 @@ ;; later, and nconc above will break it. Either this or use slow ;; append instead of nconc (selected-buffers (ediff-get-selected-buffers)) - (prefered-buffer (car all-buffers)) + (preferred-buffer (car all-buffers)) visible-dired-buffers (excl-buff-name-list (mapcar @@ -3841,7 +3841,7 @@ (cond ((member (buffer-name x) excl-buff-name-list) nil) ((memq x selected-buffers) x) ((not (ediff-get-visible-buffer-window x)) nil) - ((eq x prefered-buffer) x) + ((eq x preferred-buffer) x) ;; if prev selected buffer is dired, look only at ;; dired. ((eq use-dired-major-mode 'yes) === modified file 'lisp/w32-fns.el' --- lisp/w32-fns.el 2011-11-20 19:35:27 +0000 +++ lisp/w32-fns.el 2011-11-25 07:14:48 +0000 @@ -384,7 +384,7 @@ ;; ;; If Unicode Windows charset is not defined, use ansi fonts. ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) -;; Prefered names +;; Preferred names (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936) (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) === modified file 'src/ChangeLog.10' --- src/ChangeLog.10 2011-11-23 07:03:56 +0000 +++ src/ChangeLog.10 2011-11-25 07:14:48 +0000 @@ -1003,7 +1003,7 @@ (syms_of_xdisp): DEFVAR_LISP and initialize it. Update doc string to describe new value `grow-only', and use of C-l. (display_tool_bar_line): Only use default face for border below - toolbar if not grow-only (to get acceptable visual appearence). + toolbar if not grow-only (to get acceptable visual appearance). Explicitly set visible_height for empty toolbar lines. (redisplay_tool_bar): Handle `grow-only' setting. Check and clear minimize_tool_bar_window_p flag. === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2011-11-20 03:48:53 +0000 +++ src/ChangeLog.8 2011-11-25 07:14:48 +0000 @@ -8018,7 +8018,7 @@ * xterm.c (x_scroll_run): Renamed from do_line_dance. - * xdisp.c (redisplay_window): For window-based redisplay, alway + * xdisp.c (redisplay_window): For window-based redisplay, always try try_window_id. * xterm.c (struct glyph_string): New member two_byte_p that is === modified file 'src/callint.c' --- src/callint.c 2011-10-08 21:07:23 +0000 +++ src/callint.c 2011-11-25 07:14:48 +0000 @@ -78,7 +78,7 @@ C -- Command name: symbol with interactive function definition. d -- Value of point as number. Does not do I/O. D -- Directory name. -e -- Parametrized event (i.e., one that's a list) that invoked this command. +e -- Parameterized event (i.e., one that's a list) that invoked this command. If used more than once, the Nth `e' returns the Nth parameterized event. This skips events that are integers or symbols. f -- Existing file name. === modified file 'src/ccl.c' --- src/ccl.c 2011-11-20 07:30:16 +0000 +++ src/ccl.c 2011-11-25 07:14:48 +0000 @@ -561,7 +561,7 @@ If VALn is lambda, move to the next map set like reaching to the end of the current map set. - If VALn is a symbol, call the CCL program refered by it. + If VALn is a symbol, call the CCL program referred by it. Then, use reg[rrr] as a mapped value except for -1, -2 and -3. Such special values are regarded as nil, t, and lambda respectively. === modified file 'src/cm.h' --- src/cm.h 2011-03-19 22:46:50 +0000 +++ src/cm.h 2011-11-25 07:14:48 +0000 @@ -66,7 +66,7 @@ location */ unsigned int cm_autolf:1; /* \r performs a \r\n (rn) */ - /* Parametrized capabilities. This needs to be a struct since + /* Parameterized capabilities. This needs to be a struct since the costs are accessed through pointers. */ #if 0 === modified file 'src/fringe.c' --- src/fringe.c 2011-11-23 07:03:56 +0000 +++ src/fringe.c 2011-11-25 07:14:48 +0000 @@ -35,7 +35,7 @@ Logical bitmaps are used internally to denote things like 'end-of-buffer', 'left-truncation', 'overlay-arrow', etc. - Physical bitmaps specify the visual appearence of the bitmap, + Physical bitmaps specify the visual appearance of the bitmap, e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc. User defined bitmaps are physical bitmaps. === modified file 'src/process.c' --- src/process.c 2011-11-21 20:39:44 +0000 +++ src/process.c 2011-11-25 07:14:48 +0000 @@ -3717,7 +3717,7 @@ doc: /* Return information about network interface named IFNAME. The return value is a list (ADDR BCAST NETMASK HWADDR FLAGS), where ADDR is the layer 3 address, BCAST is the layer 3 broadcast address, -NETMASK is the layer 3 network mask, HWADDR is the layer 2 addres, and +NETMASK is the layer 3 network mask, HWADDR is the layer 2 address, and FLAGS is the current flags of the interface. */) (Lisp_Object ifname) { ------------------------------------------------------------ revno: 106509 fixes bug(s): http://debbugs.gnu.org/10112 committer: Juri Linkov branch nick: trunk timestamp: Thu 2011-11-24 21:02:39 +0200 message: * src/image.c (imagemagick_load_image): Move `MagickSetResolution' down after the `MagickPingImage' call. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-23 16:09:08 +0000 +++ src/ChangeLog 2011-11-24 19:02:39 +0000 @@ -1,3 +1,8 @@ +2011-11-24 Juri Linkov + + * image.c (imagemagick_load_image): Move `MagickSetResolution' down + after the `MagickPingImage' call. (Bug#10112) + 2011-11-23 Chong Yidong * window.c (Fcoordinates_in_window_p): Accept only live windows. === modified file 'src/image.c' --- src/image.c 2011-11-20 02:29:42 +0000 +++ src/image.c 2011-11-24 19:02:39 +0000 @@ -7618,7 +7618,7 @@ image = image_spec_value (img->spec, QCindex, NULL); ino = INTEGERP (image) ? XFASTINT (image) : 0; ping_wand = NewMagickWand (); - MagickSetResolution (ping_wand, 2, 2); + if (filename != NULL) { status = MagickPingImage (ping_wand, filename); @@ -7628,6 +7628,8 @@ status = MagickPingImageBlob (ping_wand, contents, size); } + MagickSetResolution (ping_wand, 2, 2); + if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand))) { image_error ("Invalid image number `%s' in image `%s'", ------------------------------------------------------------ revno: 106508 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-11-24 06:24:59 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-23 11:20:43 +0000 +++ lisp/mail/rmail.el 2011-11-24 11:24:59 +0000 @@ -4527,7 +4527,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5ecb69456c4d86a4e905eb3008602a95") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2cb1f29b88b0c724fdba389fd7b98b00") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ ------------------------------------------------------------ revno: 106507 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-11-24 06:19:06 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2011-10-12 10:18:25 +0000 +++ autogen/config.in 2011-11-24 11:19:06 +0000 @@ -900,7 +900,7 @@ /* Define to 1 if you have the XkbGetKeyboard function. */ #undef HAVE_XKBGETKEYBOARD -/* Define to 1 if you have the Xpm libary (-lXpm). */ +/* Define to 1 if you have the Xpm library (-lXpm). */ #undef HAVE_XPM /* Define to 1 if you have the `XrmSetDatabase' function. */ ------------------------------------------------------------ revno: 106506 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-11-24 00:21:03 -0800 message: Give some autoloaded things doc-strings. * lisp/lpr.el (lpr-windows-system, lpr-lp-system): * lisp/mail/binhex.el (binhex-begin-line): * lisp/progmodes/grep.el (grep-history, grep-find-history): * lisp/textmodes/flyspell.el: * lisp/vc/pcvs-defs.el (cvs-global-menu): * lisp/vc/vc-bzr.el (vc-bzr-admin-checkout-format-file): * lisp/vc/vc-mtn.el (vc-mtn-admin-dir, vc-mtn-admin-format): * lisp/vc/vc-cvs.el (vc-cvs-registered): Give them basic doc-strings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 07:44:51 +0000 +++ lisp/ChangeLog 2011-11-24 08:21:03 +0000 @@ -1,5 +1,14 @@ 2011-11-24 Glenn Morris + * lpr.el (lpr-windows-system, lpr-lp-system): + * mail/binhex.el (binhex-begin-line): + * progmodes/grep.el (grep-history, grep-find-history): + * textmodes/flyspell.el: + * vc/pcvs-defs.el (cvs-global-menu): + * vc/vc-bzr.el (vc-bzr-admin-checkout-format-file): + * vc/vc-mtn.el (vc-mtn-admin-dir, vc-mtn-admin-format): + * vc/vc-cvs.el (vc-cvs-registered): Give them basic doc-strings. + * net/tls.el: Fix case of "GnuTLS". * paths.el (rmail-file-name): Format doc-string for make-docfile. === modified file 'lisp/lpr.el' --- lisp/lpr.el 2011-05-06 16:38:02 +0000 +++ lisp/lpr.el 2011-11-24 08:21:03 +0000 @@ -33,11 +33,13 @@ ;;;###autoload (defvar lpr-windows-system - (memq system-type '(ms-dos windows-nt))) + (memq system-type '(ms-dos windows-nt)) + "Non-nil if running on MS-DOS or MS Windows.") ;;;###autoload (defvar lpr-lp-system - (memq system-type '(usg-unix-v hpux irix))) + (memq system-type '(usg-unix-v hpux irix)) + "Non-nil if running on a system type that uses the \"lp\" command.") (defgroup lpr nil === modified file 'lisp/mail/binhex.el' --- lisp/mail/binhex.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/binhex.el 2011-11-24 08:21:03 +0000 @@ -79,10 +79,11 @@ ;;;###autoload (defconst binhex-begin-line - "^:...............................................................$") + "^:...............................................................$" + "Regular expression matching the start of a BinHex encoded region.") (defconst binhex-body-line "^[^:]...............................................................$") -(defconst binhex-end-line ":$") +(defconst binhex-end-line ":$") ; unused (defvar binhex-temporary-file-directory (cond ((fboundp 'temp-directory) (temp-directory)) === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2011-11-15 07:55:13 +0000 +++ lisp/progmodes/grep.el 2011-11-24 08:21:03 +0000 @@ -438,9 +438,9 @@ ;; History of grep commands. ;;;###autoload -(defvar grep-history nil) +(defvar grep-history nil "History list for grep.") ;;;###autoload -(defvar grep-find-history nil) +(defvar grep-find-history nil "History list for grep-find.") ;; History of lgrep and rgrep regexp and files args. (defvar grep-regexp-history nil) === modified file 'lisp/textmodes/flyspell.el' --- lisp/textmodes/flyspell.el 2011-11-18 08:31:02 +0000 +++ lisp/textmodes/flyspell.el 2011-11-24 08:21:03 +0000 @@ -466,7 +466,7 @@ ;;*---------------------------------------------------------------------*/ ;;* flyspell-mode ... */ ;;*---------------------------------------------------------------------*/ -;;;###autoload(defvar flyspell-mode nil) +;;;###autoload(defvar flyspell-mode nil "Non-nil if Flyspell mode is enabled.") ;;;###autoload (define-minor-mode flyspell-mode "Toggle on-the-fly spell checking (Flyspell mode). === modified file 'lisp/vc/pcvs-defs.el' --- lisp/vc/pcvs-defs.el 2011-11-17 09:09:20 +0000 +++ lisp/vc/pcvs-defs.el 2011-11-24 08:21:03 +0000 @@ -493,7 +493,8 @@ (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) - (fset 'cvs-global-menu m))) + (fset 'cvs-global-menu m)) + "Global menu used by PCL-CVS.") ;; cvs-1.10 and above can take file arguments in other directories === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2011-11-02 01:58:59 +0000 +++ lisp/vc/vc-bzr.el 2011-11-24 08:21:03 +0000 @@ -124,7 +124,8 @@ ;; Used in the autoloaded vc-bzr-registered; see below. ;;;###autoload (defconst vc-bzr-admin-checkout-format-file - (concat vc-bzr-admin-dirname "/checkout/format")) + (concat vc-bzr-admin-dirname "/checkout/format") + "Name of the format file in a .bzr directory.") (defconst vc-bzr-admin-dirstate (concat vc-bzr-admin-dirname "/checkout/dirstate")) (defconst vc-bzr-admin-branch-format-file === modified file 'lisp/vc/vc-cvs.el' --- lisp/vc/vc-cvs.el 2011-01-25 04:08:28 +0000 +++ lisp/vc/vc-cvs.el 2011-11-24 08:21:03 +0000 @@ -189,7 +189,8 @@ ;;; State-querying functions ;;; -;;;###autoload (defun vc-cvs-registered (f) +;;;###autoload(defun vc-cvs-registered (f) +;;;###autoload "Return non-nil if file F is registered with CVS." ;;;###autoload (when (file-readable-p (expand-file-name ;;;###autoload "CVS/Entries" (file-name-directory f))) ;;;###autoload (load "vc-cvs") === modified file 'lisp/vc/vc-mtn.el' --- lisp/vc/vc-mtn.el 2011-11-20 03:48:53 +0000 +++ lisp/vc/vc-mtn.el 2011-11-24 08:21:03 +0000 @@ -59,9 +59,10 @@ (setq vc-handled-backends (delq 'Mtn vc-handled-backends))) ;;;###autoload -(defconst vc-mtn-admin-dir "_MTN") +(defconst vc-mtn-admin-dir "_MTN" "Name of the monotone directory.") ;;;###autoload -(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format")) +(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format") + "Name of the monotone directory's format file.") ;;;###autoload (defun vc-mtn-registered (file) ;;;###autoload (if (vc-find-root file vc-mtn-admin-format) ------------------------------------------------------------ revno: 106505 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 23:44:51 -0800 message: Fix case of "GnuTLS" in docs. * doc/misc/gnus.texi, doc/misc/smtpmail.texi: * etc/NEWS: * lisp/gnus/starttls.el, lisp/net/tls.el: Fix case of "GnuTLS". diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-24 02:22:09 +0000 +++ doc/misc/ChangeLog 2011-11-24 07:44:51 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * gnus.texi, smtpmail.texi: Fix case of "GnuTLS". + 2011-11-24 Juanma Barranquero * makefile.w32-in: Update dependencies. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-11-23 07:03:56 +0000 +++ doc/misc/gnus.texi 2011-11-24 07:44:51 +0000 @@ -13761,7 +13761,7 @@ @findex nntp-open-tls-stream @item nntp-open-tls-stream Opens a connection to a server over a @dfn{secure} channel. To use -this you must have @uref{http://www.gnu.org/software/gnutls/, GNUTLS} +this you must have @uref{http://www.gnu.org/software/gnutls/, GnuTLS} installed. You then define a server as follows: @lisp @@ -27801,7 +27801,7 @@ @acronym{TLS} wrapper shipped with Gnus @acronym{TLS}/@acronym{SSL} is now supported in @acronym{IMAP} and -@acronym{NNTP} via @file{tls.el} and GNUTLS. +@acronym{NNTP} via @file{tls.el} and GnuTLS. @item Improved anti-spam features. === modified file 'doc/misc/smtpmail.texi' --- doc/misc/smtpmail.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/smtpmail.texi 2011-11-24 07:44:51 +0000 @@ -233,7 +233,7 @@ @enumerate @item -The GNUTLS command line tool @samp{gnutls-cli}, you can get it from +The GnuTLS command line tool @samp{gnutls-cli}, you can get it from @url{http://www.gnu.org/software/gnutls/}. This is the recommended tool, mainly because it can verify the server certificates. === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-11-23 07:03:56 +0000 +++ etc/NEWS.22 2011-11-24 07:44:51 +0000 @@ -2558,10 +2558,10 @@ *** Minor Improvements -**** The STARTTLS wrapper (starttls.el) can now use GNUTLS +**** The STARTTLS wrapper (starttls.el) can now use GnuTLS instead of the OpenSSL based `starttls' tool. For backwards compatibility, it prefers `starttls', but you can toggle -`starttls-use-gnutls' to switch to GNUTLS (or simply remove the +`starttls-use-gnutls' to switch to GnuTLS (or simply remove the `starttls' tool). **** Do not allow debugger output history variable to grow without bounds. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 07:32:40 +0000 +++ lisp/ChangeLog 2011-11-24 07:44:51 +0000 @@ -1,5 +1,7 @@ 2011-11-24 Glenn Morris + * net/tls.el: Fix case of "GnuTLS". + * paths.el (rmail-file-name): Format doc-string for make-docfile. * version.el (emacs-build-system): Give it a doc-string. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-24 01:58:14 +0000 +++ lisp/gnus/ChangeLog 2011-11-24 07:44:51 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * starttls.el: Fix case of "GnuTLS". + 2011-11-24 Juanma Barranquero * gnus-group.el (gnus-group-highlight): Fix typo. === modified file 'lisp/gnus/starttls.el' --- lisp/gnus/starttls.el 2011-08-20 00:20:39 +0000 +++ lisp/gnus/starttls.el 2011-11-24 07:44:51 +0000 @@ -5,7 +5,7 @@ ;; Author: Daiki Ueno ;; Author: Simon Josefsson ;; Created: 1999/11/20 -;; Keywords: TLS, SSL, OpenSSL, GNUTLS, mail, news +;; Keywords: TLS, SSL, OpenSSL, GnuTLS, mail, news ;; This file is part of GNU Emacs. @@ -33,15 +33,15 @@ ;; implementations both called "starttls.el". The first one is Daiki ;; Ueno's starttls.el which uses his own "starttls" command line tool, ;; and the second one is Simon Josefsson's starttls.el which uses -;; "gnutls-cli" from GNUTLS. +;; "gnutls-cli" from GnuTLS. ;; ;; If "starttls" is available, it is prefered by the code over ;; "gnutls-cli", for backwards compatibility. Use ;; `starttls-use-gnutls' to toggle between implementations if you have -;; both tools installed. It is recommended to use GNUTLS, though, as +;; both tools installed. It is recommended to use GnuTLS, though, as ;; it performs more verification of the certificates. -;; The GNUTLS support requires GNUTLS 0.9.90 (released 2003-10-08) or +;; The GnuTLS support requires GnuTLS 0.9.90 (released 2003-10-08) or ;; later, from , or "starttls" ;; from . @@ -121,8 +121,8 @@ :group 'mail) (defcustom starttls-gnutls-program "gnutls-cli" - "Name of GNUTLS command line tool. -This program is used when GNUTLS is used, i.e. when + "Name of GnuTLS command line tool. +This program is used when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil." :version "22.1" :type 'string @@ -136,7 +136,7 @@ :group 'starttls) (defcustom starttls-use-gnutls (not (executable-find starttls-program)) - "*Whether to use GNUTLS instead of the `starttls' command." + "*Whether to use GnuTLS instead of the `starttls' command." :version "22.1" :type 'boolean :group 'starttls) @@ -150,7 +150,7 @@ (defcustom starttls-extra-arguments nil "Extra arguments to `starttls-program'. -These apply when GNUTLS is used, i.e. when `starttls-use-gnutls' is non-nil. +These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil. For example, non-TLS compliant servers may require '(\"--protocols\" \"ssl3\"). Invoke \"gnutls-cli --help\" to @@ -167,8 +167,8 @@ (defcustom starttls-connect "- Simple Client Mode:\n\n" "*Regular expression indicating successful connection. -The default is what GNUTLS's \"gnutls-cli\" outputs." - ;; GNUTLS cli.c:main() prints this string when it is starting to run +The default is what GnuTLS's \"gnutls-cli\" outputs." + ;; GnuTLS cli.c:main() prints this string when it is starting to run ;; in the application read/write phase. If the logic, or the string ;; itself, is modified, this must be updated. :version "22.1" @@ -177,8 +177,8 @@ (defcustom starttls-failure "\\*\\*\\* Handshake has failed" "*Regular expression indicating failed TLS handshake. -The default is what GNUTLS's \"gnutls-cli\" outputs." - ;; GNUTLS cli.c:do_handshake() prints this string on failure. If the +The default is what GnuTLS's \"gnutls-cli\" outputs." + ;; GnuTLS cli.c:do_handshake() prints this string on failure. If the ;; logic, or the string itself, is modified, this must be updated. :version "22.1" :type 'regexp @@ -186,8 +186,8 @@ (defcustom starttls-success "- Compression: " "*Regular expression indicating completed TLS handshakes. -The default is what GNUTLS's \"gnutls-cli\" outputs." - ;; GNUTLS cli.c:do_handshake() calls, on success, +The default is what GnuTLS's \"gnutls-cli\" outputs." + ;; GnuTLS cli.c:do_handshake() calls, on success, ;; common.c:print_info(), that unconditionally print this string ;; last. If that logic, or the string itself, is modified, this ;; must be updated. @@ -283,7 +283,7 @@ Third arg is name of the host to connect to, or its IP address. Fourth arg PORT is an integer specifying a port to connect to. If `starttls-use-gnutls' is nil, this may also be a service name, but -GNUTLS requires a port number." +GnuTLS requires a port number." (if starttls-use-gnutls (starttls-open-stream-gnutls name buffer host port) (message "Opening STARTTLS connection to `%s:%s'" host (format "%s" port)) === modified file 'lisp/net/tls.el' --- lisp/net/tls.el 2011-01-25 04:08:28 +0000 +++ lisp/net/tls.el 2011-11-24 07:44:51 +0000 @@ -123,7 +123,7 @@ (defcustom tls-success "- Handshake was completed\\|SSL handshake has read " "Regular expression indicating completed TLS handshakes. -The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's +The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's \"openssl s_client\" outputs." :version "22.1" :type 'regexp @@ -150,7 +150,7 @@ (defcustom tls-untrusted "- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)" "Regular expression indicating failure of TLS certificate verification. -The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's +The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's \"openssl s_client\" return in the event of unsuccessful verification." :type 'regexp