From c80e3b4aed2e70eb6d8445d786c0df770094e9e1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 4 Dec 2011 00:02:42 -0800 Subject: Spelling fixes. --- lisp/textmodes/artist.el | 6 +++--- lisp/textmodes/ispell.el | 4 ++-- lisp/textmodes/reftex-dcr.el | 2 +- lisp/textmodes/table.el | 4 ++-- lisp/textmodes/texinfmt.el | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'lisp/textmodes') diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 0efabc2135a..bd1fcc43d22 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -3960,11 +3960,11 @@ The 2-point shape SHAPE is drawn from X1, Y1 to X2, Y2." ;; Implementation note: This really should honor the interval-fn entry ;; in the master table, `artist-mt', which would mean leaving a timer ;; that calls `draw-fn' every now and then. That timer would then have -;; to be cancelled and reinstalled whenever the user moves the cursor. +;; to be canceled and reinstalled whenever the user moves the cursor. ;; This could be done, but what if the user suddenly switches to another ;; drawing mode, or even kills the buffer! In the mouse case, it is much ;; simpler: when at the end of `artist-mouse-draw-continously', the -;; user has released the button, so the timer will always be cancelled +;; user has released the button, so the timer will always be canceled ;; at that point. (defun artist-key-draw-continously (x y) "Draw current continuous shape at X,Y." @@ -5589,7 +5589,7 @@ The event, EV, is the mouse event." ;; of drawing mode. ;; ;; You should provide these functions. You might think that -;; only you is using your type of mode, so noone will be able +;; only you is using your type of mode, so no one will be able ;; to switch to another operation of the same type of mode, ;; but someone else might base a new drawing mode upon your ;; work. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index d0967d63740..ba7b84fe1dd 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -2499,7 +2499,7 @@ scrolling the current window. Leave the new window selected." ;; hidden by new window, scroll it to just below new win ;; otherwise set top line of other win so it doesn't scroll. (if (< oldot top) (setq top oldot)) - ;; if frame is unsplitable, temporarily disable that... + ;; if frame is unsplittable, temporarily disable that... (if (cdr (assq 'unsplittable (frame-parameters (selected-frame)))) (let ((frame (selected-frame))) (modify-frame-parameters frame '((unsplittable . nil))) @@ -3979,7 +3979,7 @@ Both should not be used to define a buffer-local dictionary." ; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg ; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc ; LocalWords: fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg -; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable +; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict ; LocalWords: lns XEmacs HTML casechars Multibyte ;;; ispell.el ends here diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index ff6ffffc382..2aecc34e2b0 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -212,7 +212,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (add-hook 'pre-command-hook 'reftex-highlight-shall-die) (when (eq how 'tmp-window) - ;; Resize window and arrange restauration + ;; Resize window and arrange restoration (shrink-window (1- (- (window-height) 9))) (recenter '(4)) (add-hook 'pre-command-hook 'reftex-restore-window-conf)) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 65f6d98ef79..1a3c5c22815 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -4293,7 +4293,7 @@ cache buffer into the designated cell in the table buffer." (car (table--get-coordinate (cdr (table--horizontal-cell-list nil t)))) (1+ (cdr (table--get-coordinate (cdr (table--vertical-cell-list nil t)))))))) -(defun table-call-interactively (function &optional recoard-flag keys) +(defun table-call-interactively (function &optional record-flag keys) "Call FUNCTION, or a table version of it if applicable. See `call-interactively' for full description of the arguments." (let ((table-func (intern-soft (format "*table--cell-%s" function)))) @@ -4301,7 +4301,7 @@ See `call-interactively' for full description of the arguments." (if (and table-func (table--point-in-cell-p)) table-func - function) recoard-flag keys))) + function) record-flag keys))) (defun table-funcall (function &rest arguments) "Call FUNCTION, or a table version of it if applicable. diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index a337d6f9f40..b186b02851d 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -2088,11 +2088,11 @@ This command is executed when texinfmt sees @item inside @multitable." (table-entry-height 0) ;; unformatted row looks like: A1 @tab A2 @tab A3 ;; extract-row command deletes the source line in the table. - (unformated-row (texinfo-multitable-extract-row))) + (unformatted-row (texinfo-multitable-extract-row))) ;; Use a temporary buffer (set-buffer (get-buffer-create texinfo-multitable-buffer-name)) (delete-region (point-min) (point-max)) - (insert unformated-row) + (insert unformatted-row) (goto-char (point-min)) ;; 1. Check for correct number of @tab in line. (let ((tab-number 1)) ; one @tab between two columns -- cgit v1.2.3 From fa46310344375ef5c114cbb94d4acea39ac29239 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 5 Dec 2011 00:55:25 -0800 Subject: Spelling fixes. --- doc/misc/eshell.texi | 2 +- doc/misc/gnus.texi | 2 +- etc/NEWS.23 | 2 +- etc/srecode/doc-cpp.srt | 2 +- etc/srecode/doc-default.srt | 2 +- etc/srecode/doc-java.srt | 2 +- leim/quail/croatian.el | 2 +- leim/quail/czech.el | 2 +- leim/quail/greek.el | 4 ++-- leim/quail/persian.el | 4 ++-- lisp/ChangeLog | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.2 | 2 +- lisp/align.el | 2 +- lisp/allout-widgets.el | 2 +- lisp/allout.el | 2 +- lisp/ansi-color.el | 2 +- lisp/calendar/solar.el | 2 +- lisp/cedet/semantic/db-find.el | 12 ++++++------ lisp/cedet/semantic/debug.el | 2 +- lisp/cedet/srecode/args.el | 3 +-- lisp/cedet/srecode/insert.el | 2 +- lisp/dired.el | 2 +- lisp/emulation/cua-rect.el | 4 ++-- lisp/emulation/viper-cmd.el | 6 +++--- lisp/eshell/em-rebind.el | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/gs.el | 4 ++-- lisp/hilit-chg.el | 2 +- lisp/htmlfontify.el | 2 +- lisp/international/ccl.el | 2 +- lisp/language/ethio-util.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/net/netrc.el | 2 +- lisp/net/network-stream.el | 2 +- lisp/net/tramp-gvfs.el | 2 +- lisp/net/tramp.el | 4 ++-- lisp/net/xesam.el | 4 ++-- lisp/progmodes/cc-defs.el | 2 +- lisp/progmodes/cc-engine.el | 4 ++-- lisp/progmodes/vhdl-mode.el | 2 +- lisp/ps-mule.el | 6 +++--- lisp/reveal.el | 4 ++-- lisp/term/rxvt.el | 2 +- lisp/term/xterm.el | 2 +- lisp/textmodes/picture.el | 2 +- lisp/view.el | 2 +- oldXMenu/X10.h | 2 +- oldXMenu/XMenu.h | 4 ++-- src/fileio.c | 2 +- src/ftxfont.c | 9 +++++---- src/nsterm.m | 2 +- src/regex.c | 2 +- src/regex.h | 4 ++-- src/textprop.c | 4 ++-- src/w32select.c | 7 +++---- src/w32term.c | 2 +- src/xdisp.c | 2 +- src/xselect.c | 8 ++++---- src/xterm.c | 2 +- 60 files changed, 89 insertions(+), 90 deletions(-) (limited to 'lisp/textmodes') diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index b0090f0fb84..7c178757927 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -608,7 +608,7 @@ scrolls back. @item Using C-p and C-n with rebind gets into a locked state -This happened a few times in Emacs 21, but has been unreproducible +This happened a few times in Emacs 21, but has been irreproducible since. @item If an interactive process is currently running, @kbd{M-!} doesn't work diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 69b17a94d68..5ae86c4e631 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -8976,7 +8976,7 @@ Translate many non-@acronym{ASCII} characters into their @acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}). This is mostly useful if you're on a terminal that has a limited font and doesn't show accented characters, ``advanced'' punctuation, and the -like. For instance, @samp{»} is tranlated into @samp{>>}, and so on. +like. For instance, @samp{»} is translated into @samp{>>}, and so on. @item W Y f @kindex W Y f (Summary) diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 4e541c0deb3..6f1b50e8c7a 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -903,7 +903,7 @@ mode-line information (e.g. waiting for a VC command to finish). *** The mode-line tooltips have been improved to provide more details. -*** The VC, line/colum number and minor mode indicators on the mode +*** The VC, line/column number and minor mode indicators on the mode line are now interactive: mouse-1 can be used on them to pop up a menu. ** File deletion can make use of the Recycle Bin or system Trash folder. diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index 957986e8eda..a9ea16d1811 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt @@ -43,7 +43,7 @@ Recycle doxygen comment code from the more general template set." ---- template variable-same-line-comment :tag -"A comment occurring after a veriable declaration. +"A comment occurring after a variable declaration. Recycle doxygen comment code from the more general template set." ---- {{>:declaration:doxygen-variable-same-line}} diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index 24741fa7741..ac8d8bc1ac2 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt @@ -43,7 +43,7 @@ template function-comment :tag :indent :blank ---- template variable-same-line-comment :tag -"A comment occurring after a veriable declaration." +"A comment occurring after a variable declaration." ---- {{comment_start}} {{?DOC}} {{comment_end}} ---- diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index c6d2ef1fd54..aeae1c2c389 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt @@ -44,7 +44,7 @@ Recycle javadoc comment code from the more general template set." ---- template variable-same-line-comment :tag -"A comment occurring after a veriable declaration. +"A comment occurring after a variable declaration. Recycle javadoc comment code from the more general template set." ---- {{>:declaration:javadoc-variable-same-line}} diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el index 7f394979261..885ac238398 100644 --- a/leim/quail/croatian.el +++ b/leim/quail/croatian.el @@ -1,4 +1,4 @@ -;;; quail/croatian.el -- Quail package for inputing Croatian -*-coding: iso-8859-2;-*- +;;; quail/croatian.el -- Quail package for inputting Croatian -*-coding: iso-8859-2;-*- ;; Copyright (C) 2003-2011 Free Software Foundation, Inc. diff --git a/leim/quail/czech.el b/leim/quail/czech.el index 334045eac32..fc1fb5f6e1f 100644 --- a/leim/quail/czech.el +++ b/leim/quail/czech.el @@ -461,7 +461,7 @@ keyboard from the obsolete `emacs-czech' package. All digits except of `1' are replaced by Czech characters as on the standard Czech keyboard. `[' and `]' are replaced with `,Bz(B' and `,By(B', respectively. -There are two dead keys on `=' and `+'. Characters with diaresis are +There are two dead keys on `=' and `+'. Characters with diaereses are accessible through `+='. All other keys are the same as on standard US keyboard." nil t nil nil t nil nil nil nil nil t) diff --git a/leim/quail/greek.el b/leim/quail/greek.el index ab82775ff0e..407b52f1f39 100644 --- a/leim/quail/greek.el +++ b/leim/quail/greek.el @@ -1147,7 +1147,7 @@ nil t t nil nil nil nil nil nil nil t) In the right of ,Fk(B key is a combination key, where ,F4(B acute - ,F((B diaresis + ,F((B diaeresis e.g. ,F4(B + ,Fa(B -> ,F\(B @@ -1289,7 +1289,7 @@ e.g. In the right of ,Fk(B key is a combination key, where ,F4(B acute - ,F((B diaresis + ,F((B diaeresis e.g. ,Fa(B + ,F4(B -> ,F\(B diff --git a/leim/quail/persian.el b/leim/quail/persian.el index b664eb5995b..572c9127f9d 100644 --- a/leim/quail/persian.el +++ b/leim/quail/persian.el @@ -194,11 +194,11 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards. ;;; ;;; This translit keyboard is designed to be intuitive such that ;;; mapping are easy and natural to remember for a persian writer. -;;; For some persian characters there are multiple ways of inputing +;;; For some persian characters there are multiple ways of inputting ;;; the same character. ;;; ;;; The letter 'h' is used for a number of two character mappings, -;;; this means that some character sequence inputs need to be repeated +;;; this means that some character sequence inputs need to be repeated ;;; followed by a backspace followed by the 'h'. ;;; For example: سحر = 's' 's' '' 'h' 'h' 'r' ;;; In practice such sequences are rare. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 413a2947a58..ef91deddc1d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5370,7 +5370,7 @@ * net/network-stream.el (network-stream-open-starttls): Support upgrading to STARTTLS always, even if we don't have built-in support. - (open-network-stream): Add the :always-query-capabilies keyword. + (open-network-stream): Add the :always-query-capabilities keyword. * mail/smtpmail.el: Rewritten to do opportunistic STARTTLS upgrades with `open-network-stream', and rely solely on diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 0e6a27e0776..0b96f4a36eb 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -10869,7 +10869,7 @@ 2007-09-23 Glenn Morris - * ses.el (ses-calculate-cell): Don't evaluate unsafe formulae. + * ses.el (ses-calculate-cell): Don't evaluate unsafe formulas. 2007-09-23 Dan Nicolaescu diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 65005a4ba47..957c9c7deff 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -60,7 +60,7 @@ 1988-08-03 Robert J. Chassell (bob@frosted-flakes.ai.mit.edu) - * texinfo.el: Changed fill-colum from 75 to 72. The larger + * texinfo.el: Changed fill-column from 75 to 72. The larger fill-column causes numerous overfull hboxes in TeX when you are writing Emacs Lisp code that will be formatted as a Texinfo example. diff --git a/lisp/align.el b/lisp/align.el index a386b7a82ba..214c3add93f 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -109,7 +109,7 @@ ;; simple algorithm that understand only basic regular expressions. ;; Parts of the code were broken up and included in vhdl-mode.el ;; around this time. After several comments from users, and a need to -;; find a more robust, performant algorithm, 2.0 was born in late +;; find a more robust, higher performing algorithm, 2.0 was born in late ;; 1998. Many different approaches were taken (mostly due to the ;; complexity of TeX tables), but finally a scheme was discovered ;; which worked fairly well for most common usage cases. Development diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index dfd9adad2a7..715879534b0 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -108,7 +108,7 @@ inhibition of allout-widgets-mode." ;;;_ > allout-widgets-setup (varname value) ;;;###autoload (defun allout-widgets-setup (varname value) - "Commission or decommision allout-widgets-mode along with allout-mode. + "Commission or decommission allout-widgets-mode along with allout-mode. Meant to be used by customization of `allout-widgets-auto-activation'." (set-default varname value) diff --git a/lisp/allout.el b/lisp/allout.el index 68330aa538b..9289e38b418 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1872,7 +1872,7 @@ at the beginning of the current entry. Extending Allout -Allout exposure and authoring activites all have associated +Allout exposure and authoring activities all have associated hooks, by which independent code can cooperate with allout without changes to the allout core. Here are key ones: diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 4d6f02a40b7..08b569de333 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -413,7 +413,7 @@ start of the region and set the face with which to start. Set (setq ansi-color-context-region nil)))))) ;; This function helps you look for overlapping overlays. This is -;; usefull in comint-buffers. Overlapping overlays should not happen! +;; useful in comint-buffers. Overlapping overlays should not happen! ;; A possible cause for bugs are the markers. If you create an overlay ;; up to the end of the region, then that end might coincide with the ;; process-mark. As text is added BEFORE the process-mark, the overlay diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 84a1544d709..b841ed4ab73 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -962,7 +962,7 @@ Accurate to within a minute between 1951 and 2050." (defun solar-mean-equinoxes/solstices (k year) "Julian day of mean equinox/solstice K for YEAR. K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter -solstice. These formulae are only to be used between 1000 BC and 3000 AD." +solstice. These formulas are only to be used between 1000 BC and 3000 AD." (let ((y (/ year 1000.0)) (z (/ (- year 2000) 1000.0))) (if (< year 1000) ; actually between -1000 and 1000 diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 4d5d8f35f51..58fca963a58 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -210,7 +210,7 @@ This class will cache data derived during various searches.") "Synchronize the search index IDX with some NEW-TAGS." ;; Reset our parts. (semantic-reset idx) - ;; Notify dependants by clearning their indicies. + ;; Notify dependants by clearing their indices. (semanticdb-notify-references (oref idx table) (lambda (tab me) @@ -224,7 +224,7 @@ This class will cache data derived during various searches.") (if (semantic-find-tags-by-class 'include new-tags) (progn (semantic-reset idx) - ;; Notify dependants by clearning their indicies. + ;; Notify dependants by clearing their indices. (semanticdb-notify-references (oref idx table) (lambda (tab me) @@ -234,7 +234,7 @@ This class will cache data derived during various searches.") (when (oref idx type-cache) (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags) ;; If the synchronize returns true, we need to notify. - ;; Notify dependants by clearning their indicies. + ;; Notify dependants by clearing their indices. (semanticdb-notify-references (oref idx table) (lambda (tab me) @@ -405,10 +405,10 @@ Default action as described in `semanticdb-find-translate-path'." ;; do a caching lookup. (let ((index (semanticdb-get-table-index table))) (if (semanticdb-find-need-cache-update-p table) - ;; Lets go look up our indicies + ;; Let's go look up our indices. (let ((ans (semanticdb-find-translate-path-includes--internal path))) (oset index include-path ans) - ;; Once we have our new indicies set up, notify those + ;; Once we have our new indices set up, notify those ;; who depend on us if we found something for them to ;; depend on. (when ans (semanticdb-refresh-references table)) @@ -575,7 +575,7 @@ a new path from the provided PATH." (setq ans (semanticdb-file-table (car systemdb) ;; I would expect most omniscient to return the same - ;; thing reguardless of filename, but we may have +o ;; thing regardless of filename, but we may have ;; one that can return a table of all things the ;; current file needs. (buffer-file-name (current-buffer)))) diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index 45b807df12b..6db47f8b0be 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -175,7 +175,7 @@ TOKEN is a lexical token." "For IFACE, highlight NONTERM in the parser buffer. NONTERM is the name of the rule currently being processed that shows up as a nonterminal (or tag) in the source buffer. -If RULE and MATCH indicies are specified, highlight those also." +If RULE and MATCH indices are specified, highlight those also." (set-buffer (oref iface :parser-buffer)) (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer))) diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el index d8e02f978b2..73445fbf13d 100644 --- a/lisp/cedet/srecode/args.el +++ b/lisp/cedet/srecode/args.el @@ -32,7 +32,7 @@ ;;; :blank ;; ;; Using :blank means that the template should force blank lines -;; before and after the template, reguardless of where the insertion +;; before and after the template, regardless of where the insertion ;; is occurring. (defun srecode-semantic-handle-:blank (dict) "Add macros into the dictionary DICT specifying blank line spacing. @@ -185,4 +185,3 @@ do not contain any text from preceding or following text." (provide 'srecode/args) ;;; srecode/args.el ends here - diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 60f277b2c9f..bbf8b881c4d 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -312,7 +312,7 @@ occur in your template.") (setq doit nil))) (goto-char pm) ) - ;; Do indentation reguardless of the newline. + ;; Do indentation regardless of the newline. (when (and (eq i t) inbuff) (indent-according-to-mode) (goto-char pm)) diff --git a/lisp/dired.el b/lisp/dired.el index 4970b14e7b4..52bd67751d4 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2678,7 +2678,7 @@ Anything else means ask for each directory." (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*") ;; Delete file, possibly delete a directory and all its files. -;; This function is usefull outside of dired. One could change it's name +;; This function is useful outside of dired. One could change it's name ;; to e.g. recursive-delete-file and put it somewhere else. (defun dired-delete-file (file &optional recursive trash) "\ Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 76cab39f5b2..00aec2d0bf9 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1258,7 +1258,7 @@ The numbers are formatted according to the FORMAT string." (untabify (point-min) (point-max))) (defun cua-text-fill-rectangle (width text) - "Replace rectagle with filled TEXT read from minibuffer. + "Replace rectangle with filled TEXT read from minibuffer. A numeric prefix argument is used a new width for the filled rectangle." (interactive (list (prefix-numeric-value current-prefix-arg) @@ -1269,7 +1269,7 @@ A numeric prefix argument is used a new width for the filled rectangle." (lambda () (insert text)))) (defun cua-refill-rectangle (width) - "Fill contents of current rectagle. + "Fill contents of current rectangle. A numeric prefix argument is used as new width for the filled rectangle." (interactive "P") (cua--rectangle-aux-replace diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 78bc09af136..b6d487704f4 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1979,7 +1979,7 @@ Undo previous insertion and inserts new." ;; Quote region by each line with a user supplied string. (defun viper-quote-region () (let ((quote-str viper-quote-string) - (donot-change-dafault t)) + (donot-change-default t)) (setq quote-str (viper-read-string-with-history "Quote string: " @@ -1991,9 +1991,9 @@ Undo previous insertion and inserts new." ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") ((memq major-mode '(c-mode cc-mode c++-mode)) "//") ((memq major-mode '(sh-mode shell-mode)) "#") - (t (setq donot-change-dafault nil) + (t (setq donot-change-default nil) quote-str)))) - (or donot-change-dafault + (or donot-change-default (setq viper-quote-string quote-str)) (viper-enlarge-region (point) (mark t)) (if (> (point) (mark t)) (exchange-point-and-mark)) diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index 2c346dfcd3d..b6f12e1ff2e 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -144,7 +144,7 @@ This is default behavior of shells like bash." ;;; Functions: (defun eshell-rebind-initialize () - "Initialize the inputing code." + "Initialize the inputting code." (unless eshell-non-interactive-p (add-hook 'eshell-mode-hook 'eshell-setup-input-keymap nil t) (make-local-variable 'eshell-previous-point) diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 6b11a956a99..893ee88e98d 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -5094,7 +5094,7 @@ 2003-02-02 Katsumi Yamaoka * nnheader.el (nnheader-directory-separator-character): Change the - way to compute the dafault value. + way to compute the default value. 2003-02-02 Jesper Harder diff --git a/lisp/gs.el b/lisp/gs.el index 2eba7af71ae..b86632f7637 100644 --- a/lisp/gs.el +++ b/lisp/gs.el @@ -96,7 +96,7 @@ FILE is the value to substitute for the place-holder `'." (declare-function x-display-pixel-width "xfns.c" (&optional terminal)) (defun gs-width-in-pt (frame pixel-width) - "Return, on FRAME, pixel width PIXEL-WIDTH tranlated to pt." + "Return, on FRAME, pixel width PIXEL-WIDTH translated to pt." (let ((mm (* (float pixel-width) (/ (float (x-display-mm-width frame)) (float (x-display-pixel-width frame)))))) @@ -106,7 +106,7 @@ FILE is the value to substitute for the place-holder `'." (declare-function x-display-pixel-height "xfns.c" (&optional terminal)) (defun gs-height-in-pt (frame pixel-height) - "Return, on FRAME, pixel height PIXEL-HEIGHT tranlated to pt." + "Return, on FRAME, pixel height PIXEL-HEIGHT translated to pt." (let ((mm (* (float pixel-height) (/ (float (x-display-mm-height frame)) (float (x-display-pixel-height frame)))))) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 0dee4157d78..50e631a95c5 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -367,7 +367,7 @@ buffer with the contents of a file ;;;###autoload (define-minor-mode highlight-changes-visible-mode - "Toggle visiblility of highlighting due to Highlight Changes mode. + "Toggle visibility of highlighting due to Highlight Changes mode. With a prefix argument ARG, enable Highlight Changes Visible mode if ARG is positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 126b616a644..b0fd37abd36 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -580,7 +580,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." (color-values colour) ;;(message "[%S]" window-system) (x-color-values colour)) - ;; blarg - tty colours are no good - go fetch some X colours: + ;; blarg - tty colors are no good - go fetch some X colors: (hfy-fallback-colour-values colour)))) (defvar hfy-cperl-mode-kludged-p nil) diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 9614479072a..457fe84c0b1 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -1433,7 +1433,7 @@ REG := r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7 ARG := REG | integer OPERATOR := - ;; Normal arithmethic operators (same meaning as C code). + ;; Normal arithmetic operators (same meaning as C code). + | - | * | / | % ;; Bitwise operators (same meaning as C code) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 1d93d981f8e..306a7bee9dc 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -890,7 +890,7 @@ Otherwise, [0-9A-F]." ;;;###autoload (defun ethio-find-file nil - "Transliterate file content into Ethiopic dependig on filename suffix." + "Transliterate file content into Ethiopic depending on filename suffix." (cond ((string-match "\\.sera$" (buffer-file-name)) diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 008eb92dbbc..2a339504409 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -386,7 +386,7 @@ character MAA-SAKOD-n.") "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string. Only the first syllable is transcribed. The value has the form: (START END LAO-STRING), where -START and END are the beggining and end positions of the Roman Lao syllable, +START and END are the beginning and end positions of the Roman Lao syllable, LAO-STRING is the Lao character transcription of it. Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index b04863b5fc0..80836b03978 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -237,7 +237,7 @@ MODE can be \"login\" or \"password\", suitable for passing to ;;;###autoload (defun netrc-credentials (machine &rest ports) "Return a user name/password pair. -Port specifications will be prioritised in the order they are +Port specifications will be prioritized in the order they are listed in the PORTS list." (let ((list (netrc-parse)) found) diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index e27b4541ab5..9c07953c9c9 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -115,7 +115,7 @@ values: capability command, and should return the command to switch on STARTTLS if the server supports STARTTLS, and nil otherwise. -:always-query-capabilies says whether to query the server for +:always-query-capabilities says whether to query the server for capabilities, even if we're doing a `plain' network connection. :client-certificate should either be a list where the first diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index df841bade79..27dff3aa8d9 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -188,7 +188,7 @@ ;; STRING stable_name ;; STRING x_content_types Since GVFS 1.0 only !!! ;; STRING icon -;; STRING prefered_filename_encoding +;; STRING preferred_filename_encoding ;; BOOLEAN user_visible ;; ARRAY BYTE fuse_mountpoint ;; STRUCT mount_spec diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c89b61c2eb1..2848211fae9 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -298,8 +298,8 @@ shouldn't return t when it isn't." (search-forward-regexp "Missing ControlMaster argument" nil t)))) (defcustom tramp-default-method - ;; An external copy method seems to be preferred, because it is much - ;; more performant for large files, and it hasn't too serious delays + ;; An external copy method seems to be preferred, because it performs + ;; much better for large files, and it hasn't too serious delays ;; for small files. But it must be ensured that there aren't ;; permanent password queries. Either a password agent like ;; "ssh-agent" or "Pageant" shall run, or the optional diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index ab817a43885..279ea54e4cc 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -279,8 +279,8 @@ fields are supported.") (defun xesam-dbus-call-method (&rest args) "Apply a D-Bus method call. -`dbus-call-method' is to be preferred, because it is more -performant. If the target D-Bus service is owned by Emacs, this +`dbus-call-method' is preferred, because it performs better. +If the target D-Bus service is owned by Emacs, this is not applicable, and `dbus-call-method-non-blocking' must be used instead. ARGS are identical to the argument list of both functions." diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index c91fe13543a..2991b511830 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -473,7 +473,7 @@ various buffer change hooks." (let ((saved-undo-list (elt saved-state 0))) (if (eq buffer-undo-list saved-undo-list) - ;; No change was done afterall. + ;; No change was done after all. (setq buffer-undo-list (cdr saved-undo-list)) (if keep diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 9544c4f8728..cd483d20f2f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -6832,7 +6832,7 @@ comment at the start of cc-engine.el for more info." got-suffix-after-parens (eq (char-after got-suffix-after-parens) ?\()) ;; Got a type, no declarator but a paren suffix. I.e. it's a - ;; normal function call afterall (or perhaps a C++ style object + ;; normal function call after all (or perhaps a C++ style object ;; instantiation expression). (throw 'at-decl-or-cast nil)))) @@ -9151,7 +9151,7 @@ comment at the start of cc-engine.el for more info." 'label)) (if (eq step 'up) (setq placeholder (point)) - ;; There was no containing statement afterall. + ;; There was no containing statement after all. (goto-char placeholder))))) placeholder)) (if (looking-at c-block-stmt-2-key) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 0cf01b1228f..a81cc107ce3 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4266,7 +4266,7 @@ Usage: CODE BEAUTIFICATION: `C-c M-b' and `C-c C-b' beautify the code of a region or of the entire - buffer respectively. This inludes indentation, alignment, and case + buffer respectively. This includes indentation, alignment, and case fixing. Code beautification can also be run non-interactively using the command: diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index c8bdc271f5f..db5b57f8585 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -932,7 +932,7 @@ the sequence." (list ps-mule-bitmap-prologue))) (defun ps-mule-generate-bitmap-font (font-spec size relative-compose - baselie-offset bbx) + baseline-offset bbx) (let* ((id (ps-mule-font-spec-id font-spec)) (bytes (ps-mule-font-spec-bytes font-spec)) output-list) @@ -941,7 +941,7 @@ the sequence." (list (format "/E%02X [ 0 1 255 {pop /.notdef} for ] def\n" id) (format "%%%% %s\n" (ps-mule-font-spec-name font-spec)) (format "/F%02X %f %S %d E%02X NBF\n" id size - relative-compose baselie-offset id))) + relative-compose baseline-offset id))) (setq output-list (list (list (format "/E%02X [ 0 1 255 { pop 0 } for ] def\n" id)) (list (format "/V%02X [" id)) @@ -950,7 +950,7 @@ the sequence." (format "/F%02X E%02X V%02X NPF\n" id id id)))) (aset ps-mule-bitmap-font-record id (vector (= bytes 1) output-list - size relative-compose baselie-offset bbx)) + size relative-compose baseline-offset bbx)) (if ps-mule-bitmap-dict-list output-list (setq ps-mule-bitmap-dict-list (list "/BitmapDict <<\n" ">> def\n")) diff --git a/lisp/reveal.el b/lisp/reveal.el index ea46cfd1dd3..c776ab72969 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -189,12 +189,12 @@ Each element has the form (WINDOW . OVERLAY).") ;;;###autoload (define-minor-mode reveal-mode - "Toggle decloaking of invisible text near point (Reveal mode). + "Toggle uncloaking of invisible text near point (Reveal mode). With a prefix argument ARG, enable Reveal mode if ARG is positive, and disable it otherwise. If called from Lisp, enable Reveal mode if ARG is omitted or nil. -Reveral mode is a buffer-local minor mode. When enabled, it +Reveal mode is a buffer-local minor mode. When enabled, it reveals invisible text around point." :group 'reveal :lighter (global-reveal-mode nil " Reveal") diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index c784892ce6b..c64dc0e7a19 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -228,7 +228,7 @@ for the currently selected frame." ;; 216 non-gray colors first (let ((r 0) (g 0) (b 0)) (while (> ncolors 24) - ;; This and other formulae taken from 256colres.pl and + ;; This and other formulas taken from 256colres.pl and ;; 88colres.pl in the xterm distribution. (tty-color-define (format "color-%d" (- 256 ncolors)) (- 256 ncolors) diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index c2856660ea8..f9d11cb2685 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -637,7 +637,7 @@ versions of xterm." ;; 216 non-gray colors first (let ((r 0) (g 0) (b 0)) (while (> ncolors 24) - ;; This and other formulae taken from 256colres.pl and + ;; This and other formulas taken from 256colres.pl and ;; 88colres.pl in the xterm distribution. (tty-color-define (format "color-%d" (- 256 ncolors)) (- 256 ncolors) diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 678d48758da..3356ce195f2 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -742,7 +742,7 @@ by supplying an argument. Entry to this mode calls the value of `picture-mode-hook' if non-nil. Note that Picture mode commands will work outside of Picture mode, but -they are not defaultly assigned to keys." +they are not by default assigned to keys." (interactive) (if (eq major-mode 'picture-mode) (error "You are already editing a picture") diff --git a/lisp/view.el b/lisp/view.el index 7703719ba40..0d8ad3336f9 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -496,7 +496,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'." "Update `view-return-to-alist' of buffer BUFFER. Remove from `view-return-to-alist' all entries referencing dead windows. Optional argument ITEM non-nil means add ITEM to -`view-return-to-alist' after purging. For a decsription of items +`view-return-to-alist' after purging. For a description of items that can be added see the RETURN-TO-ALIST argument of the function `view-mode-exit'. If `view-return-to-alist' contains an entry for the selected window, purge that entry from diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h index c30632b9d68..5e4ca068ba5 100644 --- a/oldXMenu/X10.h +++ b/oldXMenu/X10.h @@ -51,7 +51,7 @@ XDrawFilled so it shouldn't be defined. */ typedef struct _XAssoc { struct _XAssoc *next; /* Next object in this bucket. */ - struct _XAssoc *prev; /* Previous obejct in this bucket. */ + struct _XAssoc *prev; /* Previous object in this bucket. */ Display *display; /* Display which owns the id. */ XID x_id; /* X Window System id. */ void *data; /* Pointer to untyped memory. */ diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index aa27211c05c..8e4292f5088 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h @@ -152,8 +152,8 @@ typedef struct _xmselect { * */ typedef enum _xmstyle { - LEFT, /* Left oriented obejct. */ - RIGHT, /* Right oriented obejct. */ + LEFT, /* Left oriented object. */ + RIGHT, /* Right oriented object. */ CENTER /* Center oriented object. */ } XMStyle; diff --git a/src/fileio.c b/src/fileio.c index c0f6c1d2e8e..fb021cee5a4 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4186,7 +4186,7 @@ variable `last-coding-system-used' to the coding system actually used. */) /* If REPLACE is non-nil and we succeeded in not replacing the beginning or end of the buffer text with the file's contents, call format-decode with `point' positioned at the beginning - of the buffer and `inserted' equalling the number of + of the buffer and `inserted' equaling the number of characters in the buffer. Otherwise, format-decode might fail to correctly analyze the beginning or end of the buffer. Hence we temporarily save `point' and `inserted' here and diff --git a/src/ftxfont.c b/src/ftxfont.c index 608cfd8d44d..e04e802a3db 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -48,8 +48,8 @@ static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long); static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, unsigned, int, int, XPoint *, int, int *, int); -static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC, - int, int, int); +static void ftxfont_draw_background (FRAME_PTR, struct font *, GC, + int, int, int); struct ftxfont_frame_data { @@ -219,7 +219,8 @@ ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsign } static void -ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) +ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y, + int width) { XGCValues xgcv; @@ -296,7 +297,7 @@ ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b BLOCK_INPUT; if (with_background) - ftxfont_draw_backgrond (f, font, s->gc, x, y, s->width); + ftxfont_draw_background (f, font, s->gc, x, y, s->width); code = alloca (sizeof (unsigned) * len); for (i = 0; i < len; i++) code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) diff --git a/src/nsterm.m b/src/nsterm.m index 5e19a397c34..17fd5a93f63 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2108,7 +2108,7 @@ ns_scroll_run (struct window *w, struct run *run) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; diff --git a/src/regex.c b/src/regex.c index b7699378f5a..0ba05a95fdb 100644 --- a/src/regex.c +++ b/src/regex.c @@ -53,7 +53,7 @@ (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) #endif -/* For platform which support the ISO C amendement 1 functionality we +/* For platform which support the ISO C amendment 1 functionality we support user defined character classes. */ #if WIDE_CHAR_SUPPORT /* Solaris 2.5 has a bug: must be included before . */ diff --git a/src/regex.h b/src/regex.h index eba62f2e769..32ccfb7ddef 100644 --- a/src/regex.h +++ b/src/regex.h @@ -582,7 +582,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); } #endif /* C++ */ -/* For platform which support the ISO C amendement 1 functionality we +/* For platform which support the ISO C amendment 1 functionality we support user defined character classes. */ #if WIDE_CHAR_SUPPORT /* Solaris 2.5 has a bug: must be included before . */ @@ -592,7 +592,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); #if WIDE_CHAR_SUPPORT /* The GNU C library provides support for user-defined character classes - and the functions from ISO C amendement 1. */ + and the functions from ISO C amendment 1. */ # ifdef CHARCLASS_NAME_MAX # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX # else diff --git a/src/textprop.c b/src/textprop.c index 29425f7a550..a1c7593f568 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1625,7 +1625,7 @@ Return t if any property was actually removed, nil otherwise. */) DEFUN ("text-property-any", Ftext_property_any, Stext_property_any, 4, 5, 0, - doc: /* Check text from START to END for property PROPERTY equalling VALUE. + doc: /* Check text from START to END for property PROPERTY equaling VALUE. If so, return the position of the first character whose property PROPERTY is `eq' to VALUE. Otherwise return nil. If the optional fifth argument OBJECT is a buffer (or nil, which means @@ -1661,7 +1661,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */ DEFUN ("text-property-not-all", Ftext_property_not_all, Stext_property_not_all, 4, 5, 0, - doc: /* Check text from START to END for property PROPERTY not equalling VALUE. + doc: /* Check text from START to END for property PROPERTY not equaling VALUE. If so, return the position of the first character whose property PROPERTY is not `eq' to VALUE. Otherwise, return nil. If the optional fifth argument OBJECT is a buffer (or nil, which means diff --git a/src/w32select.c b/src/w32select.c index e3225c3f996..392cb07a96d 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -39,7 +39,7 @@ along with GNU Emacs. If not, see . */ * * When copying or cutting (sending data to the OS), the data is * announced and stored internally, but only actually rendered on - * request. The requester determines the format provided. The + * request. The requestor determines the format provided. The * {next-}selection-coding-system is only used, when its corresponding * clipboard type matches the type requested. * @@ -335,7 +335,7 @@ render_all (Lisp_Object ignore) OpenClipboard (NULL); - /* There is no usefull means to report errors here, there are none + /* There is no useful means to report errors here, there are none expected anyway, and even if there were errors, they wouldn't do any harm. So we just go ahead and do what has to be done without bothering with error handling. */ @@ -750,7 +750,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, else { /* Advertise all supported formats so that whatever the - requester chooses, only one encoding step needs to be + requestor chooses, only one encoding step needs to be made. This is intentionally different from what we do in the handler for WM_RENDERALLFORMATS. */ SetClipboardData (CF_UNICODETEXT, NULL); @@ -1138,4 +1138,3 @@ globals_of_w32select (void) clipboard_owner = create_owner (); } - diff --git a/src/w32term.c b/src/w32term.c index a2ccdd21f7d..6df218326d1 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2665,7 +2665,7 @@ x_scroll_run (struct window *w, struct run *run) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; diff --git a/src/xdisp.c b/src/xdisp.c index 52f73785e2d..3ac5651975b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1915,7 +1915,7 @@ get_glyph_string_clip_rects (struct glyph_string *s, NativeRectangle *rects, int environments with anti-aliased text: if the same text is drawn onto the same place multiple times, it gets thicker. If the overlap we are processing is for the erased cursor, we - take the intersection with the rectagle of the cursor. */ + take the intersection with the rectangle of the cursor. */ if (s->for_overlaps & OVERLAPS_ERASED_CURSOR) { XRectangle rc, r_save = r; diff --git a/src/xselect.c b/src/xselect.c index 4bfab4143cc..f9ebdf730d4 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -516,7 +516,7 @@ static struct selection_data *converted_selections; static Atom conversion_fail_tag; /* Used as an unwind-protect clause so that, if a selection-converter signals - an error, we tell the requester that we were unable to do what they wanted + an error, we tell the requestor that we were unable to do what they wanted before we throw to top-level or go into the debugger or whatever. */ static Lisp_Object @@ -693,7 +693,7 @@ x_reply_selection_request (struct input_event *event, bytes_remaining = cs->size; bytes_remaining *= format_bytes; - /* Wait for the requester to ack by deleting the property. + /* Wait for the requestor to ack by deleting the property. This can run Lisp code (process handlers) or signal. */ if (! had_errors) { @@ -732,7 +732,7 @@ x_reply_selection_request (struct input_event *event, if (had_errors) break; - /* Wait for the requester to ack this chunk by deleting + /* Wait for the requestor to ack this chunk by deleting the property. This can run Lisp code or signal. */ TRACE1 ("Waiting for increment ACK (deletion of %s)", XGetAtomName (display, cs->property)); @@ -740,7 +740,7 @@ x_reply_selection_request (struct input_event *event, } /* Now write a zero-length chunk to the property to tell the - requester that we're done. */ + requestor that we're done. */ BLOCK_INPUT; if (! waiting_for_other_props_on_window (display, window)) XSelectInput (display, window, 0L); diff --git a/src/xterm.c b/src/xterm.c index 290acdd9ca4..abe52238415 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -3317,7 +3317,7 @@ x_scroll_run (struct window *w, struct run *run) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; -- cgit v1.2.3 From a98edce9ec1f519ad23ba7dc32ce54f15841eaa5 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 6 Dec 2011 02:30:54 +0100 Subject: Fix typos. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus-faq.texi | 16 ++++++++-------- lisp/ChangeLog | 4 ++++ lisp/ChangeLog.12 | 2 +- lisp/ChangeLog.7 | 4 ++-- lisp/cedet/ChangeLog | 4 ++++ lisp/cedet/semantic/bovine/c.el | 4 ++-- lisp/dired.el | 2 +- lisp/gnus/gnus-sum.el | 2 +- lisp/mh-e/ChangeLog.1 | 4 ++-- lisp/org/ChangeLog | 5 +++++ lisp/org/ob-ref.el | 2 +- lisp/org/ob.el | 4 ++-- lisp/org/org-publish.el | 2 +- lisp/progmodes/cc-vars.el | 2 +- lisp/textmodes/table.el | 4 ++-- lisp/url/ChangeLog | 2 +- src/data.c | 2 +- src/font.h | 4 ++-- 19 files changed, 45 insertions(+), 28 deletions(-) (limited to 'lisp/textmodes') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index f94153479a8..5d8e05806e0 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Juanma Barranquero + + * gnus-faq.texi (FAQ 2-1, FAQ 3-8, FAQ 4-14, FAQ 9-1): Fix typos. + 2011-11-24 Glenn Morris * gnus.texi, smtpmail.texi: Fix case of "GnuTLS". diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index b5bb75f7284..ace7bb42c21 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -266,9 +266,9 @@ and how to prevent it? @subsubheading Answer This message means that the last time you used Gnus, it -wasn't properly exited and therefor couldn't write its -informations to disk (e.g. which messages you read), you -are now asked if you want to restore those informations +wasn't properly exited and therefore couldn't write its +information to disk (e.g. which messages you read), you +are now asked if you want to restore that information from the auto-save file. To prevent this message make sure you exit Gnus @@ -563,7 +563,7 @@ However, the first thing to do is to tell Gnus in which way it should store the mail, in Gnus terminology which back end to use. Gnus supports many different back ends, the most commonly used one is nnml. It stores every mail in one file -and is therefor quite fast. However you might prefer a one +and is therefore quite fast. However you might prefer a one file per group approach if your file system has problems with many small files, the nnfolder back end is then probably the choice for you. To use nnml add the following to ~/.gnus.el: @@ -580,7 +580,7 @@ As you might have guessed, if you want nnfolder, it's @end example @noindent -Now we need to tell Gnus, where to get it's mail from. If +Now we need to tell Gnus, where to get its mail from. If it's a POP3 server, then you need something like this: @example @@ -1104,11 +1104,11 @@ I don't like the way the Summary buffer looks, how to tweak it? @subsubheading Answer You've got to play around with the variable -gnus-summary-line-format. It's value is a string of +gnus-summary-line-format. Its value is a string of symbols which stand for things like author, date, subject etc. A list of the available specifiers can be found in the manual node "Summary Buffer Lines" and the often forgotten -node "Formatting Variables" and it's sub-nodes. There +node "Formatting Variables" and its sub-nodes. There you'll find useful things like positioning the cursor and tabulators which allow you a summary in table form, but sadly hard tabulators are broken in 5.8.8. @@ -2190,7 +2190,7 @@ Starting Gnus is really slow, how to speed it up? @subsubheading Answer -The reason for this could be the way Gnus reads it's +The reason for this could be the way Gnus reads its active file, see the node "The Active File" in the Gnus manual for things you might try to speed the process up. An other idea would be to byte compile your ~/.gnus.el (say diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2bc6b658823..6657a9da7d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Juanma Barranquero + + * textmodes/table.el (table-shorten-cell): Fix typo. + 2011-12-05 Christopher Genovese (tiny change) * emacs-lisp/assoc.el (aput): Fix return value (bug#10146) diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 2a5a20181e1..b97555f1e9d 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -6278,7 +6278,7 @@ Register changes using allout-exposure-change-hook. Disregard aberrant topics. (allout-shift-in): With universal-argument, make topic a peer of - it's former offspring. Simplify the code by separating out + its former offspring. Simplify the code by separating out allout-shift-out functionality. (allout-shift-out): With universal-argument, make offspring peers of their former container, and its siblings. Implement the diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 25a80567069..37387121777 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -12129,7 +12129,7 @@ * cc-mode.el (c-buffer-is-cc-mode): Definition moved here from cc-vars.el. Also, - put permanent-local property on variable so it's value won't get + put permanent-local property on variable so its value won't get killed by kill-all-local-variables. * cc-mode.el (c++-mode, java-mode, objc-mode, idl-mode): @@ -19534,7 +19534,7 @@ the innermost test. This catches GNU-style comments. * cc-mode.el (c-add-syntax): - Move macro definition to before it's first use. + Move macro definition to before its first use. * cc-mode.el (c-submit-bug-report): Capture buffer local variable values which are diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index f3ff89ddd7f..ccc81e6613e 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2011-12-06 Juanma Barranquero + + * semantic/bovine/c.el (semantic-tag-abstract-p): Fix typo. + 2011-11-26 Chong Yidong * semantic/wisent/python-wy.el: diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index fe659d118e1..4da23498cfc 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -816,7 +816,7 @@ now. ;; ;; will create 2 toplevel tags, one is type A, and the other variable B ;; where the :type of B is just a type tag A that is a prototype, and - ;; the actual struct info of A is it's own toplevel tag. + ;; the actual struct info of A is its own toplevel tag. (when (or (semantic-tag-of-class-p tag 'function) (semantic-tag-of-class-p tag 'variable)) (let* ((basetype (semantic-tag-type tag)) @@ -1311,7 +1311,7 @@ Optional PARENT and COLOR as specified with "Return non-nil if TAG is considered abstract. PARENT is tag's parent. In C, a method is abstract if it is `virtual', which is already -handled. A class is abstract iff it's destructor is virtual." +handled. A class is abstract iff its destructor is virtual." (cond ((eq (semantic-tag-class tag) 'type) (require 'semantic/find) diff --git a/lisp/dired.el b/lisp/dired.el index 52bd67751d4..3a82ebcf504 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2678,7 +2678,7 @@ Anything else means ask for each directory." (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*") ;; Delete file, possibly delete a directory and all its files. -;; This function is useful outside of dired. One could change it's name +;; This function is useful outside of dired. One could change its name ;; to e.g. recursive-delete-file and put it somewhere else. (defun dired-delete-file (file &optional recursive trash) "\ Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 71081063715..10d1b467c37 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -2969,7 +2969,7 @@ When FORCE, rebuild the tool bar." 'gnus-summary-mode-map))) (when map ;; Need to set `gnus-summary-tool-bar-map' because `gnus-article-mode' - ;; uses it's value. + ;; uses its value. (setq gnus-summary-tool-bar-map map)))) (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map)) diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 871b84dd039..65ffb0375ab 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -428,7 +428,7 @@ 2004-11-08 Satyaki Das * mh-acros.el (mh-funcall-if-exists): In XEmacs, presence of a - function at compile time doesn't guarantee it's existence at run + function at compile time doesn't guarantee its existence at run time. So make the macro handle that situation better. 2004-11-05 Satyaki Das @@ -10195,7 +10195,7 @@ 2002-04-02 Peter S Galbraith * mh-e.el: 'defvar mh-folder-unseen-seq-name' called a function to - set it's value, and this happens also on byte-compilation (where + set its value, and this happens also on byte-compilation (where it can fail if the user's MH environment is not setup correctly). I now set the value of mh-folder-unseen-seq-name at runtime when I first need it. This should fix Debian bugs diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index cb518f97a19..555709f1fa8 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,8 @@ +2011-12-06 Juanma Barranquero + + * ob.el (org-babel-expand-body:generic, org-babel-number-p): + * ob-ref.el (org-babel-ref-parse): Fix typos. + 2011-11-24 Juanma Barranquero * ob.el (org-babel-execute-src-block): Fix typo. diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el index d0a2c14bee9..1e14021a364 100644 --- a/lisp/org/ob-ref.el +++ b/lisp/org/ob-ref.el @@ -69,7 +69,7 @@ "Parse a variable ASSIGNMENT in a header argument. If the right hand side of the assignment has a literal value return that value, otherwise interpret as a reference to an -external resource and find it's value using +external resource and find its value using `org-babel-ref-resolve'. Return a list with two elements. The first element of the list will be the name of the variable, and the second will be an emacs-lisp representation of the value of diff --git a/lisp/org/ob.el b/lisp/org/ob.el index f34d1fbda9e..8bba4672169 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el @@ -464,7 +464,7 @@ block." (defun org-babel-expand-body:generic (body params &optional var-lines) "Expand BODY with PARAMS. -Expand a block of code with org-babel according to it's header +Expand a block of code with org-babel according to its header arguments. This generic implementation of body expansion is called for languages which have not defined their own specific org-babel-expand-body:lang function." @@ -2045,7 +2045,7 @@ appropriate." cell)) (defun org-babel-number-p (string) - "If STRING represents a number return it's value." + "If STRING represents a number return its value." (if (and (string-match "^-?[0-9]*\\.?[0-9]*$" string) (= (length (substring string (match-beginning 0) (match-end 0))) diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index 61edef50738..7a0d7b56e22 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el @@ -715,7 +715,7 @@ If :auto-sitemap is set, publish the sitemap too. If :makeindex is set, also produce a file theindex.org." (mapc (lambda (project) - ;; Each project uses it's own cache file: + ;; Each project uses its own cache file: (org-publish-initialize-cache (car project)) (let* ((project-plist (cdr project)) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 549f94387d2..a4338a3193b 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -586,7 +586,7 @@ in a mode hook, you have to call `c-setup-doc-comment-style' afterwards to redo that work." ;; Symbols other than those documented above may be used on this ;; variable. If a variable exists that has that name with - ;; "-font-lock-keywords" appended, it's value is prepended to the + ;; "-font-lock-keywords" appended, its value is prepended to the ;; font lock keywords list. If it's a function then it's called and ;; the result is prepended. :type '(radio diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 1a3c5c22815..6f9e592d8ed 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -345,7 +345,7 @@ ;; Above code is well known ~/.emacs idiom for customizing a mode ;; specific keymap however it does not work for this package. This is ;; because there is no table mode in effect. This package does not -;; use a local map therefor you must modify `table-cell-map' +;; use a local map therefore you must modify `table-cell-map' ;; explicitly. The correct way of achieving above task is: ;; ;; (add-hook 'table-cell-map-hook @@ -2155,7 +2155,7 @@ specified." (defun table-shorten-cell (n) "Shorten the current cell by N lines by shrinking the cell vertically. Shortening is done by removing blank lines from the bottom of the cell -and possibly from the top of the cell as well. Therefor, the cell +and possibly from the top of the cell as well. Therefore, the cell must have some bottom/top blank lines to be shorten effectively. This is applicable to all the cells aligned horizontally with the current one because they are also shortened in order to keep the rectangular diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index b4cd24cc6b9..db28770ad0e 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -2448,7 +2448,7 @@ * lisp/url-nfs.el (url-nfs-create-wrapper): New function to create wrappers onto the appropriate file-based URLs for file-name-handlers. - * lisp/url-ftp.el: Moved the FTP stuff into it's own file - it + * lisp/url-ftp.el: Moved the FTP stuff into its own file - it might get messy with file-name-handlers and things. * lisp/url-http.el (url-http-clean-headers): Fix problem when diff --git a/src/data.c b/src/data.c index e8d2b43198f..0ebb17a2e01 100644 --- a/src/data.c +++ b/src/data.c @@ -839,7 +839,7 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents) case Lisp_Fwd_Kboard_Obj: /* We used to simply use current_kboard here, but from Lisp - code, it's value is often unexpected. It seems nicer to + code, its value is often unexpected. It seems nicer to allow constructions like this to work as intuitively expected: (with-selected-frame frame diff --git a/src/font.h b/src/font.h index 42fc050b670..8ca7c9c19c4 100644 --- a/src/font.h +++ b/src/font.h @@ -705,7 +705,7 @@ struct font_driver /* Chain of font drivers. There's one global font driver list - (font_driver_list in font.c). In addition, each frame has it's own + (font_driver_list in font.c). In addition, each frame has its own font driver list at FRAME_PTR->font_driver_list. */ struct font_driver_list @@ -721,7 +721,7 @@ struct font_driver_list /* Chain of arbitrary data specific to each font driver. Each frame - has it's own font data list at FRAME_PTR->font_data_list. */ + has its own font data list at FRAME_PTR->font_data_list. */ struct font_data_list { -- cgit v1.2.3 From e5d84bfe065f1d8172165ee2bdd15193f7447d8a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 10 Dec 2011 12:49:33 +0200 Subject: Fix documentation and one misfeature of Texinfo mode update commands. lisp/textmodes/texnfo-upd.el: Update commentary. Add a warning not to use texinfo-update-node and commands that call it if the Texinfo file uses @node lines without next/prev/up pointers. (texinfo-all-menus-update, texinfo-master-menu) (texinfo-update-node, texinfo-every-node-update) (texinfo-multiple-files-update): Doc fix. Warn against updating all the @node lines. (texinfo-master-menu): Only call texinfo-update-node if the prefix argument is numeric. See also this thread: http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00156.html. Fixes: debbugs:2975 --- lisp/ChangeLog | 13 ++++++ lisp/textmodes/texnfo-upd.el | 95 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 87 insertions(+), 21 deletions(-) (limited to 'lisp/textmodes') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed5af2e2b20..3d1f85ea73e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2011-12-10 Eli Zaretskii + + * textmodes/texnfo-upd.el: Update commentary. Add a warning not + to use texinfo-update-node and commands that call it if the + Texinfo file uses @node lines without next/prev/up pointers. + (texinfo-all-menus-update, texinfo-master-menu) + (texinfo-update-node, texinfo-every-node-update) + (texinfo-multiple-files-update): Doc fix. Warn against updating + all the @node lines. + (texinfo-master-menu): Only call texinfo-update-node if the prefix + argument is numeric. (Bug#2975) See also this thread: + http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00156.html. + 2011-12-09 Manuel Gómez (tiny change) * speedbar.el (speedbar-supported-extension-expressions): diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index 047bba72ccd..e21e8ba7623 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -23,7 +23,9 @@ ;;; Commentary: -;; Known bug: update commands fail to ignore @ignore. +;; Known bug: update commands fail to ignore @ignore, and fail to DTRT +;; with the @if... directives (so expect trouble when the manual uses +;; different @node lines or @menu items in @iftex and in @ifnottex). ;; Summary: how to use the updating commands @@ -37,6 +39,16 @@ ;; With a prefix argument, the `texinfo-update-node' and ;; `texinfo-make-menu' functions do their jobs in the region. ;; +;; Important note: We do NOT recommend use of these commands to update +;; the `Next', `Previous' and `Up' pointers on @node lines. Most +;; manuals, including those whose Texinfo files adhere to the strucure +;; described below, don't need these pointers, because makeinfo will +;; generate them automatically (see the node "makeinfo Pointer +;; Creation" in the Texinfo manual). By contrast, due to known bugs +;; described above, texinfo-update-node etc. could produce incorrect +;; pointers, and thus make a perfectly valid Texinfo file into an +;; invalid one. You _have_ been warned! +;; ;; In brief, the functions for creating or updating nodes and menus, are: ;; ;; texinfo-update-node (&optional beginning end) @@ -89,6 +101,16 @@ ;; It does not matter whether the `@node' line has pre-existing ;; `Next', `Previous', or `Up' pointers in it. They are removed. +;; Warning: Since the pre-existing pointers are replaced with the ones +;; computed by `texinfo-update-node', and since this function has +;; known bugs with the more advanced Texinfo features (see above), it +;; could produce an invalid Texinfo file. You are well advised not to +;; use this function, except if you know what you are doing and +;; exercise extreme caution. Keep in mind that most manuals do not +;; need the `Next', `Previous', and `Up' pointers to be present on the +;; @node lines; makeinfo will automatically generate them when it +;; produces the Info or HTML versions of the manual. + ;; The `texinfo-every-node-update' function runs `texinfo-update-node' ;; on the whole buffer. @@ -119,12 +141,15 @@ ;; on the whole buffer. ;; The `texinfo-master-menu' function creates an extended menu located -;; after the top node. (The file must have a top node.) The function -;; first updates all the regular menus in the buffer (incorporating the -;; descriptions from pre-existing menus), and then constructs a master -;; menu that includes every entry from every other menu. (However, the -;; function cannot update an already existing master menu; if one -;; exists, it must be removed before calling the function.) +;; after the top node. (The file must have a top node.) This +;; function works only on Texinfo files all of whose @node lines are +;; present in a single file; use `texinfo-multiple-files-update' for +;; multi-file manuals. The function first updates all the regular +;; menus in the buffer (incorporating the descriptions from +;; pre-existing menus), and then constructs a master menu that +;; includes every entry from every other menu. (However, the function +;; cannot update an already existing master menu; if one exists, it +;; must be removed before calling the function.) ;; The `texinfo-indent-menu-description' function indents every ;; description in the menu following point, to the specified column. @@ -142,7 +167,7 @@ ;; as node names in pre-existing `@node' lines that lack names. ;; ;; Since node names should be more concise than section or chapter -;; titles, node names so inserted will need to be edited manually. +;; titles, you will usually want to manually edit node names so inserted. ;;; Code: @@ -330,8 +355,13 @@ at the level specified by LEVEL. Point is left at the end of menu." "Update every regular menu in a Texinfo file. Update pre-existing master menu, if there is one. +Only single-file manuals are supported by this function. For +multi-file manuals, use `texinfo-multiple-files-update'. + If called with a non-nil argument, this function first updates all the -nodes in the buffer before updating the menus. +nodes in the buffer before updating the menus. Do NOT invoke this +command with an argument if your Texinfo file uses @node lines without +the `Next', `Previous', and `Up' pointers! Indents the first line of descriptions, and leaves trailing whitespace in a menu that lacks descriptions, so descriptions will format well. @@ -843,17 +873,25 @@ second and subsequent lines of a multi-line description." (defun texinfo-master-menu (update-all-nodes-menus-p) "Make a master menu for a whole Texinfo file. -Non-nil argument (prefix, if interactive) means first update all -existing nodes and menus. Remove pre-existing master menu, if there is one. +Remove pre-existing master menu, if there is one. + +This function supports only single-file manuals. For multi-file +manuals, use `texinfo-multiple-files-update'. + +Non-nil, non-numeric argument (C-u prefix, if interactive) means +first update all existing menus in the buffer (incorporating +descriptions from pre-existing menus) before it constructs the +master menu. If the argument is numeric (e.g., \"C-u 2\"), +update all existing nodes as well, by calling +\`texinfo-update-node' on the entire file. Warning: do NOT +invoke with a numeric argument if your Texinfo file uses @node +lines without the `Next', `Previous', `Up' pointers, as the +result could be an invalid Texinfo file! This function creates a master menu that follows the top node. The master menu includes every entry from all the other menus. It replaces any existing ordinary menu that follows the top node. -If called with a non-nil argument, this function first updates all the -menus in the buffer (incorporating descriptions from pre-existing -menus) before it constructs the master menu. - The function removes the detailed part of an already existing master menu. This action depends on the pre-existing master menu using the standard `texinfo-master-menu-header'. @@ -909,10 +947,11 @@ section titles are often too short to explain a node well." (if update-all-nodes-menus-p (progn - (message "Making a master menu in %s ...first updating all nodes... " - (buffer-name)) - (texinfo-update-node (point-min) (point-max)) - + (when (numberp update-all-nodes-menus-p) + (message + "Making a master menu in %s ...first updating all nodes... " + (buffer-name)) + (texinfo-update-node (point-min) (point-max))) (message "Updating all menus in %s ... " (buffer-name)) (texinfo-make-menu (point-min) (point-max)))) @@ -1207,6 +1246,11 @@ end of that region; it limits the search." "Without any prefix argument, update the node in which point is located. Interactively, a prefix argument means to operate on the region. +Warning: do NOT use this function if your Texinfo file uses @node +lines without the `Next', `Previous', `Up' pointers, because the +result could be an invalid Texinfo file due to known deficiencies +in this command: it does not support @ignore and @if* directives. + The functions for creating or updating nodes and menus, and their keybindings, are: @@ -1246,7 +1290,12 @@ which menu descriptions are indented. Its default value is 32." (message "Done...nodes updated in region. You may save the buffer.")))))) (defun texinfo-every-node-update () - "Update every node in a Texinfo file." + "Update every node in a Texinfo file. + +Warning: do NOT use this function if your Texinfo file uses @node +lines without the `Next', `Previous', `Up' pointers, because the +result could be an invalid Texinfo file due to known deficiencies +in this command: it does not support @ignore and @if* directives." (interactive) (save-excursion (texinfo-update-node (point-min) (point-max)) @@ -1934,7 +1983,11 @@ With optional UPDATE-EVERYTHING argument (numeric prefix arg, if interactive), update all the menus and all the `Next', `Previous', and `Up' pointers of all the files included in OUTER-FILE before inserting a master menu in OUTER-FILE. Also, update the `Top' level node -pointers of OUTER-FILE. +pointers of OUTER-FILE. Do NOT invoke this command with a numeric prefix +arg, if your files use @node lines without the `Next', `Previous', `Up' +pointers, because this could produce invalid Texinfo files due to known +deficiencies in `texinfo-update-node': it does not support the @ignore +and @if... directives. Notes: -- cgit v1.2.3 From b8830d2864fa513f951bcaf392bd577b0315b7ad Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 10 Dec 2011 14:22:25 +0200 Subject: Fix bug #2975 with insufficient docs of texinfo-master-menu. lisp/textmodes/texnfo-upd.el: Correct outdated description about texinfo-master-menu. (texinfo-master-menu): Explain better in the doc string what the function really does. (texinfo-insert-master-menu-list): Improve the error message displayed if there's no menu in the Top node. --- lisp/ChangeLog | 7 ++++++- lisp/textmodes/texnfo-upd.el | 37 ++++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 16 deletions(-) (limited to 'lisp/textmodes') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d1f85ea73e..74fc51c5e69 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,12 +3,17 @@ * textmodes/texnfo-upd.el: Update commentary. Add a warning not to use texinfo-update-node and commands that call it if the Texinfo file uses @node lines without next/prev/up pointers. + Correct outdated description about texinfo-master-menu. (texinfo-all-menus-update, texinfo-master-menu) (texinfo-update-node, texinfo-every-node-update) (texinfo-multiple-files-update): Doc fix. Warn against updating all the @node lines. (texinfo-master-menu): Only call texinfo-update-node if the prefix - argument is numeric. (Bug#2975) See also this thread: + argument is numeric. Explain better in the doc string what the + function really does. + (texinfo-insert-master-menu-list): Improve the error message + displayed if there's no menu in the Top node. + (Bug#2975) See also this thread: http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00156.html. 2011-12-09 Manuel Gómez (tiny change) diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index e21e8ba7623..d674b3a397e 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -142,14 +142,14 @@ ;; The `texinfo-master-menu' function creates an extended menu located ;; after the top node. (The file must have a top node.) This -;; function works only on Texinfo files all of whose @node lines are +;; function works only on Texinfo files all of whose menus are ;; present in a single file; use `texinfo-multiple-files-update' for -;; multi-file manuals. The function first updates all the regular -;; menus in the buffer (incorporating the descriptions from -;; pre-existing menus), and then constructs a master menu that -;; includes every entry from every other menu. (However, the function -;; cannot update an already existing master menu; if one exists, it -;; must be removed before calling the function.) +;; multi-file manuals. The function constructs a master menu that +;; includes every entry from every other menu. Use this command to +;; create or update the @detailmenu menu after you've created or +;; updated all the menus in the file, including the menu in the Top +;; node, using the `texinfo-make-menu' or the `texinfo-all-menus-update' +;; command. ;; The `texinfo-indent-menu-description' function indents every ;; description in the menu following point, to the specified column. @@ -878,6 +878,16 @@ Remove pre-existing master menu, if there is one. This function supports only single-file manuals. For multi-file manuals, use `texinfo-multiple-files-update'. +This function creates or updates the @detailmenu section of a +master menu that follows the Top node. It replaces any existing +detailed menu that follows the top node. The detailed menu +includes every entry from all the other menus. By default, the +existing menus, including the menu in the Top node, are not +updated according to the buffer contents, so all the menus should +be updated first using `texinfo-make-menu' or +`texinfo-all-menus-update', which see. Alternatively, invoke +this function with a prefix argument, see below. + Non-nil, non-numeric argument (C-u prefix, if interactive) means first update all existing menus in the buffer (incorporating descriptions from pre-existing menus) before it constructs the @@ -888,13 +898,10 @@ invoke with a numeric argument if your Texinfo file uses @node lines without the `Next', `Previous', `Up' pointers, as the result could be an invalid Texinfo file! -This function creates a master menu that follows the top node. The -master menu includes every entry from all the other menus. It -replaces any existing ordinary menu that follows the top node. - -The function removes the detailed part of an already existing master -menu. This action depends on the pre-existing master menu using the -standard `texinfo-master-menu-header'. +The function removes and recreates the detailed part of an already +existing master menu. This action assumes that the pre-existing +master menu uses the standard `texinfo-master-menu-header' for the +detailed menu. The master menu has the following format, which is adapted from the recommendation in the Texinfo Manual: @@ -1017,7 +1024,7 @@ However, there does not need to be a title field." (let ((first-chapter (save-excursion (re-search-forward "^@node\\|^@include") (point)))) (unless (re-search-forward "^@menu" first-chapter t) - (error "Buffer lacks ordinary `Top' menu in which to insert master"))) + (error "Buffer lacks a menu in its first node; create it, then run me again"))) (beginning-of-line) (delete-region ; buffer must have ordinary top menu (point) -- cgit v1.2.3 From 301b181a14b0f698c6aae05522e6f3401ea45a3c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 16 Dec 2011 22:51:13 -0800 Subject: Spelling fixes. --- doc/emacs/cal-xtra.texi | 4 ++-- doc/emacs/maintaining.texi | 4 ++-- doc/misc/dbus.texi | 2 +- lisp/ansi-color.el | 2 +- lisp/cedet/semantic/wisent/comp.el | 2 +- lisp/international/mule-cmds.el | 2 +- lisp/language/cyrillic.el | 4 ++-- lisp/progmodes/prolog.el | 6 +++--- lisp/progmodes/python.el | 2 +- lisp/progmodes/verilog-mode.el | 18 +++++++++--------- lisp/textmodes/artist.el | 2 +- lisp/textmodes/fill.el | 4 ++-- lisp/vc/emerge.el | 2 +- lisp/window.el | 2 +- src/dbusbind.c | 2 +- src/w32term.c | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) (limited to 'lisp/textmodes') diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index 6d20c92a6d9..2d2b32943f5 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -41,12 +41,12 @@ customize the variables @code{calendar-intermonth-header} and @vindex calendar-holiday-marker @vindex diary-entry-marker -@vindex calenday-today-marker +@vindex calendar-today-marker The variable @code{calendar-holiday-marker} specifies how to mark a date as being a holiday. Its value may be a single-character string to insert next to the date, or a face name to use for displaying the date. Likewise, the variable @code{diary-entry-marker} specifies how to mark a -date that has diary entries, and @code{calenday-today-marker} is used by +date that has diary entries, and @code{calendar-today-marker} is used by the function @code{calendar-mark-today} to mark today's date. By default, the calendar uses faces named @code{holiday}, @code{diary}, and @code{calendar-today} for these purposes. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index eed14c07216..9d788fa7192 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -511,7 +511,7 @@ that system; otherwise, prompt for a repository type, create a new repository, and register the VC fileset with it. @item -If each file is registed and unlocked, lock it and make it writable, +If each file is registered and unlocked, lock it and make it writable, so that you can begin to edit it. @item @@ -1880,7 +1880,7 @@ directory where the tags file was initially written. This way, you can move an entire directory tree containing both the tags file and the source files, and the tags file will still refer correctly to the source files. If the tags file is @file{-} or is in the @file{/dev} directory, -however, the file names are +however, the file names are made relative to the current working directory. This is useful, for example, when writing the tags to @file{/dev/stdout}. diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 06a52107d71..f515109bf76 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -1677,7 +1677,7 @@ Establish the connection to D-Bus @var{bus}. @var{bus} can be either the symbol @code{:system} or the symbol @code{:session}, or it can be a string denoting the address of the -corresponding bus. For the system and session busses, this function +corresponding bus. For the system and session buses, this function is called when loading @file{dbus.el}, there is no need to call it again. diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 08b569de333..abb6a961018 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -585,7 +585,7 @@ ANSI-CODE is used as an index into the vector." "Create a new face by applying all the parameters in ESCAPE-SEQ. Should any of the parameters result in the default face (usually this is -the parameter 0), then the effect of all previous parameters is cancelled. +the parameter 0), then the effect of all previous parameters is canceled. ESCAPE-SEQ is a SGR control sequences such as \\033[34m. The parameter 34 is used by `ansi-color-get-face-1' to return a face definition." diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index 884342a1df2..0aff8325252 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -51,7 +51,7 @@ ;; name space. Elisp dynamic binding allows that ;-) ;; Here are simple macros to easily define and use set of variables -;; binded locally, without all these "reference to free variable" +;; bound locally, without all these "reference to free variable" ;; compiler warnings! (defmacro wisent-context-name (name) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 0a5d6ed954c..0d3f079866e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1031,7 +1031,7 @@ It is highly recommended to fix it before writing to a file." and try again)? " coding-system auto-cs)) (error "Save aborted")))) (when (and tick (/= tick (buffer-chars-modified-tick))) - (error "Cancelled because the buffer was modified")) + (error "Canceled because the buffer was modified")) coding-system))) (setq select-safe-coding-system-function 'select-safe-coding-system) diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 8fb7fae720d..c0f857cadee 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -126,7 +126,7 @@ Support for Russian using koi8-r and the russian-computer input method.") (define-coding-system 'koi8-u "KOI8-U 8-bit encoding for Cyrillic (MIME: KOI8-U)" :coding-type 'charset - :mnemonic ?U + :mnemonic ?U :charset-list '(koi8-u) :mime-charset 'koi8-u) @@ -246,7 +246,7 @@ Support for Russian using koi8-r and the russian-computer input method.") (ctext-non-standard-encodings "microsoft-cp1251") (input-method . "bulgarian-bds") (documentation - . "Support for Bulgrian with windows-1251 character set.")) + . "Support for Bulgarian with windows-1251 character set.")) '("Cyrillic")) (set-language-info-alist diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 5b229cc0c24..0efc2ca231b 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -147,9 +147,9 @@ ;; o Introduced three new customizable variables: electric colon ;; (`prolog-electric-colon-flag', default nil), electric dash ;; (`prolog-electric-dash-flag', default nil), and a possibility -;; to prevent the predicate template insertion from adding commata +;; to prevent the predicate template insertion from adding commas ;; (`prolog-electric-dot-full-predicate-template', defaults to t -;; since it seems quicker to me to just type those commata). A +;; since it seems quicker to me to just type those commas). A ;; trivial adaptation of a patch by Markus Triska. ;; o Improved the behavior of electric if-then-else to only skip ;; forward if the parenthesis/semicolon is preceded by @@ -512,7 +512,7 @@ It does not apply in strings and comments." (defcustom prolog-electric-dot-full-predicate-template nil "*If nil, electric dot inserts only the current predicate's name and `(' for recursive calls or new clause heads. Non-nil means to also -insert enough commata to cover the predicate's arity and `)', +insert enough commas to cover the predicate's arity and `)', and dot and newline for recursive calls." :group 'prolog-keyboard :type 'boolean) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index fbf7c3c42f7..6081d8e838b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2343,7 +2343,7 @@ Interactively, prompt for the name with completion." ;;;; Bicycle Repair Man support (autoload 'pymacs-load "pymacs" nil t) -(autoload 'brm-init "bikemacs") +(autoload 'brm-init "bikeemacs") (defvar brm-menu) ;; I'm not sure how useful BRM really is, and it's certainly dangerous diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 3ae66a477e8..87c678890de 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -981,7 +981,7 @@ of each Verilog file that requires it, rather than being set globally." "*If true, AUTORESET will reset those signals which were assigned with blocking assignments (=) even in a block with non-blocking assignments (<=). - + If nil, all blocking assigned signals are ignored when any non-blocking assignment is in the AUTORESET block. This allows blocking assignments to be used for temporary values and not have @@ -2011,7 +2011,7 @@ find the errors." "`uvm_component_utils" "`uvm_create" "`uvm_create_on" - "`uvm_create_seq" ;; Undocumented in 1.1 + "`uvm_create_seq" ;; Undocumented in 1.1 "`uvm_declare_p_sequencer" "`uvm_declare_sequence_lib" ;; Deprecated in 1.1 "`uvm_do" @@ -7505,7 +7505,7 @@ Signals must be in standard (base vector) form." (nreverse out-list))) (defun verilog-signals-combine-bus (in-list) - "Return a list of signals in IN-LIST, with busses combined. + "Return a list of signals in IN-LIST, with buses combined. Duplicate signals are also removed. For example A[2] and A[1] become A[2:1]." (let (combo buswarn out-list @@ -9907,7 +9907,7 @@ If optional WHITESPACE true, ignore whitespace." (p2 (with-current-buffer b2 (goto-char (point-min)))) (maxp1 (with-current-buffer b1 (point-max))) (maxp2 (with-current-buffer b2 (point-max))) - (op1 -1) (op2 -1) + (op1 -1) (op2 -1) progress size) (while (not (and (eq p1 op1) (eq p2 op2))) ;; If both windows have whitespace optionally skip over it. @@ -10100,7 +10100,7 @@ instantiating the resulting module. Long lines are split based on the `fill-column', see \\[set-fill-column]. Limitations: - Concatenation and outputting partial busses is not supported. + Concatenation and outputting partial buses is not supported. Typedefs must match `verilog-typedef-regexp', which is disabled by default. @@ -10958,7 +10958,7 @@ the datatype of the declarations. Limitations: This ONLY detects outputs of AUTOINSTants (see `verilog-read-sub-decls'), - and all busses must have widths, such as those from AUTOINST, or using [] + and all buses must have widths, such as those from AUTOINST, or using [] in AUTO_TEMPLATEs. This does NOT work on memories or SystemVerilog .name connections, @@ -11315,7 +11315,7 @@ Limitations: If placed inside the parenthesis of a module declaration, it creates Verilog 2001 style, else uses Verilog 1995 style. - Concatenation and outputting partial busses is not supported. + Concatenation and outputting partial buses is not supported. Module names must be resolvable to filenames. See `verilog-auto-inst'. @@ -11439,7 +11439,7 @@ Limitations: If placed inside the parenthesis of a module declaration, it creates Verilog 2001 style, else uses Verilog 1995 style. - Concatenation and outputting partial busses is not supported. + Concatenation and outputting partial buses is not supported. Module names must be resolvable to filenames. See `verilog-auto-inst'. @@ -11490,7 +11490,7 @@ Limitations: If placed inside the parenthesis of a module declaration, it creates Verilog 2001 style, else uses Verilog 1995 style. - Concatenation and outputting partial busses is not supported. + Concatenation and outputting partial buses is not supported. Module names must be resolvable to filenames. See `verilog-auto-inst'. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index bd1fcc43d22..2e90a4bf241 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -4455,7 +4455,7 @@ If N is negative, move backward." "Set current fill character to be C." (interactive "cType fill char (type RET to turn off): ") (cond ((eq c ?\r) (setq artist-fill-char-set nil) - (message "Fill cancelled")) + (message "Fill canceled")) (t (setq artist-fill-char-set t) (setq artist-fill-char c) (message "Fill set to \"%c\"" c)))) diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index b8614b16f82..610b0c71357 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -82,7 +82,7 @@ reinserts the fill prefix in each resulting line." (setq fill-prefix nil))) (if fill-prefix (message "fill-prefix: \"%s\"" fill-prefix) - (message "fill-prefix cancelled"))) + (message "fill-prefix canceled"))) (defcustom adaptive-fill-mode t "Non-nil means determine a paragraph's fill prefix from its text." @@ -383,7 +383,7 @@ and `fill-nobreak-invisible'." "Char-table of characters that don't use space between words.") (progn - ;; Register `kinsoku' for scripts HAN, KANA, BOPOMPFO, and CJK-MISS. + ;; Register `kinsoku' for scripts HAN, KANA, BOPOMOFO, and CJK-MISC. ;; Also tell that they don't use space between words. (map-char-table #'(lambda (key val) diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index 3ba5bcdb90a..bc4b0725c4e 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -1754,7 +1754,7 @@ to the left margin, if they are in windows." ;; If there are min-lines lines above and below the region, then don't do ;; anything. ;; If not, recenter the region to make it so. -;; If that isn't possible, remove context lines balancedly from top and bottom +;; If that isn't possible, remove context lines evenly from top and bottom ;; so the entire region shows. ;; If that isn't possible, show the top of the region. ;; BEG must be at the beginning of a line. diff --git a/lisp/window.el b/lisp/window.el index dcf7394b204..8fbc8b8ace4 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3713,7 +3713,7 @@ value can be also stored on disk and read back in a new session." (if (window-sizable-p window (- size) horizontal 'safe) (let* ((window-combination-limit (assq 'combination-limit item))) - ;; We must inherit the combiantion limit, otherwise + ;; We must inherit the combination limit, otherwise ;; we might mess up handling of atomic and side ;; window. (setq new (split-window window size horizontal))) diff --git a/src/dbusbind.c b/src/dbusbind.c index 7984be3564b..c5448ee5e7a 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -968,7 +968,7 @@ DEFUN ("dbus-init-bus", Fdbus_init_bus, Sdbus_init_bus, 1, 1, 0, connection = xd_initialize (bus, TRUE); /* Add the watch functions. We pass also the bus as data, in order - to distinguish between the busses in xd_remove_watch. */ + to distinguish between the buses in xd_remove_watch. */ if (!dbus_connection_set_watch_functions (connection, xd_add_watch, xd_remove_watch, diff --git a/src/w32term.c b/src/w32term.c index 6df218326d1..532ff64fe66 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3286,7 +3286,7 @@ w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, ***********************************************************************/ /* Handle mouse button event on the tool-bar of frame F, at - frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress + frame-relative coordinates X/Y. EVENT_TYPE is either ButtonPress or ButtonRelease. */ static void -- cgit v1.2.3 From 99d990817cac77ba755b4e31722c44f6f6bbe3b0 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 18 Dec 2011 22:21:24 -0800 Subject: Spelling fixes. --- admin/grammars/bovine-grammar.el | 2 +- admin/grammars/js.wy | 2 +- doc/lispref/spellfile | 1 - doc/misc/idlwave.texi | 2 +- etc/NEWS.19 | 2 +- leim/ChangeLog | 2 +- leim/quail/hanja3.el | 2 +- lisp/ChangeLog.12 | 2 +- lisp/allout.el | 10 +++++----- lisp/cedet/data-debug.el | 4 ++-- lisp/cedet/semantic/analyze/debug.el | 2 +- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/font-lock.el | 2 +- lisp/gnus/ChangeLog | 2 +- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-msg.el | 2 +- lisp/gnus/gnus-spec.el | 4 ++-- lisp/gnus/gnus-win.el | 4 ++-- lisp/gnus/message.el | 2 +- lisp/mail/rmailmm.el | 2 +- lisp/progmodes/sql.el | 2 +- lisp/progmodes/verilog-mode.el | 2 +- lisp/reveal.el | 2 +- lisp/simple.el | 6 +++--- lisp/textmodes/rst.el | 2 +- lisp/textmodes/texnfo-upd.el | 2 +- lisp/vc/vc-hg.el | 2 +- src/ccl.c | 4 ++-- src/w32term.c | 2 +- src/xterm.c | 2 +- test/indent/prolog.prolog | 2 +- 31 files changed, 40 insertions(+), 41 deletions(-) (limited to 'lisp/textmodes') diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el index eda7b42adbd..a7fe955acf4 100644 --- a/admin/grammars/bovine-grammar.el +++ b/admin/grammars/bovine-grammar.el @@ -298,7 +298,7 @@ VALUE is a value, or range of values to match against. For example, a SYMBOL might need to match \"foo\". Some TYPES will not have matching criteria. -LAMBDA is a lambda expression which is evaled with the text of the +LAMBDA is a lambda expression which is evalled with the text of the type when it is found. It is passed the list of all buffer text elements found since the last lambda expression. It should return a semantic element (see below.) diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index a13abf56e6e..ffa324806cf 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy @@ -66,7 +66,7 @@ ;; Other Goals %start FormalParameterList -;; with the terminals stuff, I used the javacript.y names, +;; with the terminals stuff, I used the javascript.y names, ;; but the semantic/wisent/java-tags.wy types ;; when possible ;; ------------------ diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile index e0d77ee0541..18fb633acfd 100644 --- a/doc/lispref/spellfile +++ b/doc/lispref/spellfile @@ -337,7 +337,6 @@ fset fstab ftp fu -funtions garbles gc gcpro diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 5149eb91651..c7495d8cc93 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -669,7 +669,7 @@ We have already used the routine info display in the first part of this tutorial. This was the invoked using @kbd{C-c ?}, and displays information about the IDL routine near the cursor position. Wouldn't it be nice to have the same kind of information available for your own -routines and for the huge amount of code in major libraries like JHUPL +routines and for the huge amount of code in major libraries like JHUAPL or the IDL-Astro library? In many cases, you may already have this information. Files named @file{.idlwave_catalog} in library directories contain scanned information on the routines in that directory; many diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 849566e6238..df6c4893f87 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -6114,7 +6114,7 @@ When you have edited both buffers as you wish, merge them with C-x 6 1. This copies the text from the right-hand buffer as a second column in the other buffer. To go back to two-column editing, use C-x 6 s. -Use C-x 6 d to disassociate the two buffers, leaving each as it +Use C-x 6 d to dissociate the two buffers, leaving each as it stands. (If the other buffer, the one that was not current when you type C-x 6 d, is empty, C-x 6 d kills it.) diff --git a/leim/ChangeLog b/leim/ChangeLog index 95a3671bdd1..57c5a406785 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1895,7 +1895,7 @@ * Makefile.in (${TIT}): To byte-compile quail packages, use just built quail. -1997-12-09 Koaunghi Un +1997-12-09 Koaunghi Un * quail/hanja3.el: New file. diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el index aa0fc7948af..dae716c7a8b 100644 --- a/leim/quail/hanja3.el +++ b/leim/quail/hanja3.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1997, 1999, 2001-2011 Free Software Foundation, Inc. -;; Author: Koaunghi Un +;; Author: Koaunghi Un ;; Keywords: mule, quail, multilingual, input method, Korean, Hanja ;; This file is part of GNU Emacs. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index b97555f1e9d..0dd5a6ec7a3 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -18459,7 +18459,7 @@ reveal-open-spots, so as to be more reliable. There were several tricky corner cases where an open spot might be lost, or where a closed spot might end up on the list of open spots. - Only reveal text that's ellipsised. + Only reveal text that's ellipsized. 2005-11-07 Carsten Dominik diff --git a/lisp/allout.el b/lisp/allout.el index 9289e38b418..480c22d31e0 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -3334,7 +3334,7 @@ coordinating with allout activity.") (run-hooks 'allout-post-undo-hook) (cond ((and (= buffer-saved-size -1) allout-auto-save-temporarily-disabled) - ;; user possibly undid a decryption, deinhibit auto-save: + ;; user possibly undid a decryption, disinhibit auto-save: (allout-maybe-resume-auto-save-info-after-encryption)) ((save-excursion (save-restriction @@ -5871,7 +5871,7 @@ encryption. Further, encrypting with a KEYMODE-CUE universal argument greater than 4 - eg, preceded by a doubled Ctrl-U - causes association of the specified recipients with the file, replacing those currently -associated with it. This can be used to deassociate any +associated with it. This can be used to dissociate any recipients with the file, by selecting no recipients in the dialog. @@ -5912,7 +5912,7 @@ encryption. Further, encrypting with a KEYMODE-CUE universal argument greater than 4 - eg, preceded by a doubled Ctrl-U - causes association of the specified recipients with the file, replacing those currently -associated with it. This can be used to deassociate any +associated with it. This can be used to dissociate any recipients with the file, by selecting no recipients in the dialog. @@ -6045,7 +6045,7 @@ encryption. Further, encrypting with a KEYMODE-CUE universal argument greater than 4 - eg, preceded by a doubled Ctrl-U - causes association of the specified recipients with the file, replacing those currently -associated with it. This can be used to deassociate any +associated with it. This can be used to dissociate any recipients with the file, by selecting no recipients in the dialog. @@ -6661,7 +6661,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t." (if (/= arg 1) (condition-case nil (line-move (1- arg)) (error nil))) - ;; Move to beginning-of-line, ignoring fields and invisibles. + ;; Move to beginning-of-line, ignoring fields and invisible text. (skip-chars-backward "^\n") (while (and (not (bobp)) (let ((prop diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index 329d1c608c2..d553c433fc4 100644 --- a/lisp/cedet/data-debug.el +++ b/lisp/cedet/data-debug.el @@ -1060,11 +1060,11 @@ If the result is a list or vector, then use the data debugger to display it." (setq values (cons (eval expr) values)) (let ((old-value (make-symbol "t")) new-value) ;; Bind debug-on-error to something unique so that we can - ;; detect when evaled code changes it. + ;; detect when evalled code changes it. (let ((debug-on-error old-value)) (setq values (cons (eval expr) values)) (setq new-value debug-on-error)) - ;; If evaled code has changed the value of debug-on-error, + ;; If evalled code has changed the value of debug-on-error, ;; propagate that change to the global binding. (unless (eq old-value new-value) (setq debug-on-error new-value)))) diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el index b02358b7243..ce8e79b19dc 100644 --- a/lisp/cedet/semantic/analyze/debug.el +++ b/lisp/cedet/semantic/analyze/debug.el @@ -70,7 +70,7 @@ (let ((pentry (nth idx pf)) (ptentry (nth idx pft))) (if (or (stringp pentry) (not ptentry)) - ;; Found someting ok. stop + ;; Found something ok. Stop. (setq stop t) (setq idx (1+ idx))))) ;; We found the first non-tag entry. What is the situation? diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 9aa230cfe9b..29c5f3f092b 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2637,7 +2637,7 @@ If FORM is a lambda or a macro, byte-compile it as a function." (setq form (cdr form))) (setq form (car form))) (if (and (eq (car-safe form) 'list) - ;; The spec is evaled in callint.c in dynamic-scoping + ;; The spec is evalled in callint.c in dynamic-scoping ;; mode, so just leaving the form unchanged would mean ;; it won't be eval'd in the right mode. (not lexical-binding)) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index c319974fb41..2db0d809275 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -294,7 +294,7 @@ If a number, only buffers greater than this size have fontification messages." ;; and they give users another mechanism for changing face appearance. ;; We now allow a FACENAME in `font-lock-keywords' to be any expression that ;; returns a face. So the easiest thing is to continue using these variables, -;; rather than sometimes evaling FACENAME and sometimes not. sm. +;; rather than sometimes evalling FACENAME and sometimes not. sm. ;; Note that in new code, in the vast majority of cases there is no ;; need to create variables that specify face names. Simply using diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ee7442c55e1..c26c0a0a5b1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -21339,7 +21339,7 @@ (gnus-agent-cat-groups): Use eval-and-compile, not eval-when-compile, to define gnus-agent-set-cat-groups as the setf method of gnus-agent-cat-groups even when the buffer has been - evaled. + evalled. (gnus-agent-save-active, gnus-agent-save-active-1): Merge to delete gnus-agent-save-active-1. (gnus-agent-save-groups): Delete. Identical to diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 555c715bc2f..ea0710bf026 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -669,7 +669,7 @@ non-nil. If the match is a string, it is used as a regexp match on the article. If the match is a symbol, that symbol will be funcalled from the buffer of the article to be saved with the newsgroup as the -parameter. If it is a list, it will be evaled in the same buffer. +parameter. If it is a list, it will be evalled in the same buffer. If this form or function returns a string, this string will be used as a possible file name; and if it returns a non-nil list, that list will be diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 58373525f96..6ff1023383b 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1784,7 +1784,7 @@ this is a reply." (and header (string-match (nth 2 match) header))))))) (t - ;; This is a form to be evaled. + ;; This is a form to be evalled. (eval match))))) ;; We have a match, so we set the variables. (dolist (attribute style) diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el index 2345c4fc141..4c5715c67f9 100644 --- a/lisp/gnus/gnus-spec.el +++ b/lisp/gnus/gnus-spec.el @@ -52,7 +52,7 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway." (defvar gnus-group-indentation "") ;; Format specs. The chunks below are the machine-generated forms -;; that are to be evaled as the result of the default format strings. +;; that are to be evalled as the result of the default format strings. ;; We write them in here to get them byte-compiled. That way the ;; default actions will be quite fast, while still retaining the full ;; flexibility of the user-defined format specs. @@ -690,7 +690,7 @@ are supported for %s." (not (and (featurep 'xemacs) gnus-use-correct-string-widths))) (insert (number-to-string pad-width))) - ;; Create the form to be evaled. + ;; Create the form to be evalled. (if (or max-width cut-width ignore-value (and (featurep 'xemacs) gnus-use-correct-string-widths)) diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index ecd5b3b525b..f0009830b44 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el @@ -242,7 +242,7 @@ See the Gnus manual for an explanation of the syntax used.") (let* ((current-window (or (get-buffer-window (current-buffer)) (selected-window))) (window (or window current-window))) (select-window window) - ;; The SPLIT might be something that is to be evaled to + ;; The SPLIT might be something that is to be evalled to ;; return a new SPLIT. (while (and (not (assq (car split) gnus-window-to-buffer)) (symbolp (car split)) (fboundp (car split))) @@ -447,7 +447,7 @@ should have point." (when (consp (car split)) (push 1.0 split) (push 'vertical split)) - ;; The SPLIT might be something that is to be evaled to + ;; The SPLIT might be something that is to be evalled to ;; return a new SPLIT. (while (and (not (assq (car split) gnus-window-to-buffer)) (symbolp (car split)) (fboundp (car split))) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 8fbd2c765fe..5198618c2c3 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4409,7 +4409,7 @@ This function could be useful in `message-setup-hook'." ;; A simple function. ((functionp action) (funcall action)) - ;; Something to be evaled. + ;; Something to be evalled. (t (eval action)))))) diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index d01cfc7f2c8..03023b07527 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -320,7 +320,7 @@ The value is a vector [INDEX HEADER TAGLINE BODY END], where (setq index 2)) ;; If the tagline is displayed, get past it to the body. (if (rmail-mime-display-tagline current) - ;; The next foward-line call must be in sync with how + ;; The next forward-line call must be in sync with how ;; `rmail-mime-insert-tagline' formats the tagline. The ;; body begins after the empty line that ends the tagline. (forward-line 3)) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 03e095b6bfc..60ba768a80e 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -4224,7 +4224,7 @@ The default comes from `process-coding-system-alist' and "^\\(.+\\) (hex ..)$" "SET \\1") - ;; FEDDBACK ON for 99 or more rows + ;; FEEDBACK ON for 99 or more rows ;; feedback OFF (sql-redirect-value sqlbuf diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 87c678890de..52e7b6e2429 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -10932,7 +10932,7 @@ Typing \\[verilog-auto] will make this into: (defun verilog-auto-logic () "Expand AUTOLOGIC statements, as part of \\[verilog-auto]. Make wire statements using the SystemVerilog logic keyword. -This is currently equivelent to: +This is currently equivalent to: /*AUTOWIRE*/ diff --git a/lisp/reveal.el b/lisp/reveal.el index c776ab72969..8b4ac22a717 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -106,7 +106,7 @@ Each element has the form (WINDOW . OVERLAY).") (let ((inv (overlay-get ol 'invisible)) open) (when (and inv ;; There's an `invisible' property. Make sure it's - ;; actually invisible, and ellipsised. + ;; actually invisible, and ellipsized. (and (consp buffer-invisibility-spec) (cdr (assq inv buffer-invisibility-spec))) (or (setq open diff --git a/lisp/simple.el b/lisp/simple.el index c9ac32e0f9e..b7165c9f6a9 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1225,11 +1225,11 @@ this command arranges for all errors to enter the debugger." (push (eval eval-expression-arg lexical-binding) values) (let ((old-value (make-symbol "t")) new-value) ;; Bind debug-on-error to something unique so that we can - ;; detect when evaled code changes it. + ;; detect when evalled code changes it. (let ((debug-on-error old-value)) (push (eval eval-expression-arg lexical-binding) values) (setq new-value debug-on-error)) - ;; If evaled code has changed the value of debug-on-error, + ;; If evalled code has changed the value of debug-on-error, ;; propagate that change to the global binding. (unless (eq old-value new-value) (setq debug-on-error new-value)))) @@ -4729,7 +4729,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t." (let ((line-move-visual nil)) (line-move (1- arg) t))) - ;; Move to beginning-of-line, ignoring fields and invisibles. + ;; Move to beginning-of-line, ignoring fields and invisible text. (skip-chars-backward "^\n") (while (and (not (bobp)) (invisible-p (1- (point)))) (goto-char (previous-char-property-change (point))) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 64dffe78d50..f2dba1575c2 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -243,7 +243,7 @@ (define-key map [(control ?=)] 'rst-adjust) ;; (Does not work on the Mac OSX.) ;; Display the hierarchy of decorations implied by the current document contents. (define-key map [(control c) (control h)] 'rst-display-decorations-hierarchy) - ;; Homogeneize the decorations in the document. + ;; Homogenize the decorations in the document. (define-key map [(control c) (control s)] 'rst-straighten-decorations) ;; (define-key map [(control c) (control s)] 'rst-straighten-deco-spacing) diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index d674b3a397e..69d68a76d4b 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -1165,7 +1165,7 @@ error if the node is not the top node and a section is not found." "texinfo-specific-section-type: Chapter or section not found")))))) (defun texinfo-hierarchic-level () - "Return the general hierarchal level of the next node in a texinfo file. + "Return the general hierarchical level of the next node in a texinfo file. Thus, a subheading or appendixsubsec is of type subsection." (let ((case-fold-search t)) (cadr (assoc diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 0516abbf024..7b90536a31b 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -216,7 +216,7 @@ highlighting the Log View buffer." ((eq state ?R) 'removed) ((eq state ?!) 'missing) ((eq state ??) 'unregistered) - ((eq state ?C) 'up-to-date) ;; Older mercurials use this + ((eq state ?C) 'up-to-date) ;; Older mercurial versions use this. (t 'up-to-date))))))) (defun vc-hg-working-revision (file) diff --git a/src/ccl.c b/src/ccl.c index 491b925d75c..65a6dcfcb85 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -210,8 +210,8 @@ static Lisp_Object Vccl_program_table; #define CCL_WriteArrayReadJump 0x0B /* Write an array element, read, and jump: 1:A--D--D--R--E--S--S-rrrXXXXX 2:LENGTH - 3:ELEMENET[0] - 4:ELEMENET[1] + 3:ELEMENT[0] + 4:ELEMENT[1] ... N:A--D--D--R--E--S--S-rrrYYYYY ------------------------------ diff --git a/src/w32term.c b/src/w32term.c index 532ff64fe66..29ac9d119b4 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3556,7 +3556,7 @@ x_scroll_bar_remove (struct scroll_bar *bar) /* Destroy the window. */ my_destroy_window (f, SCROLL_BAR_W32_WINDOW (bar)); - /* Disassociate this scroll bar from its window. */ + /* Dissociate this scroll bar from its window. */ XWINDOW (bar->window)->vertical_scroll_bar = Qnil; UNBLOCK_INPUT; diff --git a/src/xterm.c b/src/xterm.c index 1f995b3c1a0..e2f356db7b0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -5151,7 +5151,7 @@ x_scroll_bar_remove (struct scroll_bar *bar) XDestroyWindow (FRAME_X_DISPLAY (f), bar->x_window); #endif - /* Disassociate this scroll bar from its window. */ + /* Dissociate this scroll bar from its window. */ XWINDOW (bar->window)->vertical_scroll_bar = Qnil; UNBLOCK_INPUT; diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog index 6cb5535fe8d..8af21877b59 100644 --- a/test/indent/prolog.prolog +++ b/test/indent/prolog.prolog @@ -200,7 +200,7 @@ elaborate(fix(F,T,B,E), Env, Ee) :- elaborate(let(F,T,app(fix,lambda(F,T,B)),E), Env, Ee). %% elab_bindings(+TS, +Env, -TS). -%% Applique `elaborate' sur l'environnment de type TS. +%% Applique `elaborate' sur l'environnement de type TS. elab_tenv([], _, []). elab_tenv([(X,T)|TS], Env, [(X, Tg)|TSe]) :- elaborate(T, Env, Te), -- cgit v1.2.3 From 6196cffecf7dcc2a777025137db6ab77ff45a105 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 21 Dec 2011 01:58:39 -0800 Subject: Spelling fixes. --- doc/misc/auth.texi | 2 +- lisp/ChangeLog.12 | 2 +- lisp/calc/calc-alg.el | 2 +- lisp/calendar/holidays.el | 2 +- lisp/gnus/nndiary.el | 4 ++-- lisp/international/robin.el | 6 +++--- lisp/net/ntlm.el | 2 +- lisp/net/tramp.el | 2 +- lisp/progmodes/ada-stmt.el | 2 +- lisp/term.el | 4 ++-- lisp/textmodes/remember.el | 2 +- src/print.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) (limited to 'lisp/textmodes') diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index b64562f6875..60bb6e7cdac 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -281,7 +281,7 @@ for any of the prompts. Note that the password needs to be evaluated if it's a function. It's wrapped in a function to provide some security. -Later, after a successful login, @code{nnimal.el} calls the +Later, after a successful login, @code{nnimap.el} calls the @code{:save-function} like so: @example diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 0dd5a6ec7a3..55335533b7a 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -27413,7 +27413,7 @@ which has been added in Emacs 21.1. (c-mode, c++-mode, objc-mode, java-mode, idl-mode, pike-mode) (awk-mode): Use it. - (make-local-hook): Suppress warning about obsoleteness. + (make-local-hook): Suppress warning about obsolescence. * progmodes/cc-engine.el, cc-align.el, cc-cmds.el (c-append-backslashes-forward, c-delete-backslashes-forward) diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el index 274f399fe6a..5ad1e58b45c 100644 --- a/lisp/calc/calc-alg.el +++ b/lisp/calc/calc-alg.el @@ -1841,7 +1841,7 @@ expr)))) ;;; Simplify a polynomial in list form by stripping off high-end zeros. -;;; This always leaves the constant part, i.e., nil->nil and nonnil->nonnil. +;;; This always leaves the constant part, i.e., nil->nil and non-nil->non-nil. (defun math-poly-simplify (p) (and p (if (Math-zerop (nth (1- (length p)) p)) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 3ba1078f62d..42c95f39faa 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -723,7 +723,7 @@ STRING)). Returns nil if it is not visible in the current calendar window." (let ((m displayed-month) (y displayed-year)) (calendar-increment-month m y (- 11 month)) - (if (> m 9) ; is november visible? + (if (> m 9) ; Is November visible? (list (list (list month day y) string))))) (defun holiday-float (month dayname n string &optional day) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 25557ad7119..29f0695c74e 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -1161,7 +1161,7 @@ all. This may very well take some time.") (defun nndiary-parse-schedule-value (str min-or-values max) ;; Parse the schedule string STR, or signal an error. - ;; Signals are caught by `nndary-schedule'. + ;; Signals are caught by `nndiary-schedule'. (if (string-match "[ \t]*\\*[ \t]*" str) ;; unspecified nil @@ -1204,7 +1204,7 @@ all. This may very well take some time.") ;; - Returns nil if `*' ;; - Otherwise returns a list of integers and/or ranges (BEG . END) ;; The exception is the Timze-Zone value which is always of the form (STR). - ;; Signals are caught by `nndary-schedule'. + ;; Signals are caught by `nndiary-schedule'. (let ((header (format "^X-Diary-%s: \\(.*\\)$" head))) (goto-char (point-min)) (if (not (re-search-forward header nil t)) diff --git a/lisp/international/robin.el b/lisp/international/robin.el index 443a292f4c1..c50277686ff 100644 --- a/lisp/international/robin.el +++ b/lisp/international/robin.el @@ -50,9 +50,9 @@ ;; identified by a string called package name. Use robin-define-package ;; to define a robin package. -;; (robin-define-package NAME DOCTSTRING -;; (INPUT1 OUPUT1) -;; (INPUT2 OUPUT2) +;; (robin-define-package NAME DOCSTRING +;; (INPUT1 OUTPUT1) +;; (INPUT2 OUTPUT2) ;; ...) ;; NAME is a string identifying the robin package. It often starts with a diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el index 9af148e8faa..8bcb1ef2966 100644 --- a/lisp/net/ntlm.el +++ b/lisp/net/ntlm.el @@ -440,7 +440,7 @@ length of STR is LEN." (defun ntlm-smb-dohash (in key forw) "Return the hash value for a string IN and a string KEY. -Length of IN and KEY are 64. FORW non nill means forward, nil means +Length of IN and KEY are 64. FORW non-nil means forward, nil means backward." (let (pk1 ;string of length 56 c ;string of length 28 diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 2848211fae9..473ba00fbc2 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3506,7 +3506,7 @@ If the `tramp-methods' entry does not exist, return nil." (cond ((char-equal other-write ?w) (tramp-compat-octal-to-decimal "00002")) ((char-equal other-write ?-) 0) - (t (error "Nineth char `%c' must be one of `w-'" other-write))) + (t (error "Ninth char `%c' must be one of `w-'" other-write))) (cond ((char-equal other-execute-or-sticky ?x) (tramp-compat-octal-to-decimal "00001")) diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el index e48055c9f50..b33da441eeb 100644 --- a/lisp/progmodes/ada-stmt.el +++ b/lisp/progmodes/ada-stmt.el @@ -56,7 +56,7 @@ ;; BUGS: ;;;> I have the following suggestions for the function template: 1) I ;;;> don't want it automatically assigning it a name for the return variable. I -;;;> never want it to be called "Result" because that is nondescriptive. If you +;;;> never want it to be called "Result" because that is nondescript. If you ;;;> must define a variable, give me the ability to specify its name. ;;;> ;;;> 2) You do not provide a type for variable 'Result'. Its type is the same diff --git a/lisp/term.el b/lisp/term.el index 484bc36363e..47cda9beeed 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -37,8 +37,8 @@ ;; -------------------------------------- ;; ;; While the message passing and the colorization surely introduce some -;; overhead this has became so small that IMHO is surely outweighted by -;; the benefits you get but, as usual, YMMV +;; overhead this has became so small that IMHO it is surely outweighed by +;; the benefits you get but, as usual, YMMV. ;; ;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to ;; make a choice: on my Linux box this choice allows me to run all the diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el index 07a4fae9c30..c184a90dfc2 100644 --- a/lisp/textmodes/remember.el +++ b/lisp/textmodes/remember.el @@ -474,7 +474,7 @@ If this is nil, then `diary-file' will be used instead." (replace-match (let ((style (if (boundp 'calendar-date-style) calendar-date-style - ;; Don't complain about obsoleteness. + ;; Don't complain about obsolescence. (if (with-no-warnings european-calendar-style) 'european 'american)))) diff --git a/src/print.c b/src/print.c index fc36d29da7c..8e4a38c4ae9 100644 --- a/src/print.c +++ b/src/print.c @@ -620,7 +620,7 @@ A printed representation of an object is text which describes that object. */) printcharfun = Vprin1_to_string_buffer; PRINTPREPARE; print (object, printcharfun, NILP (noescape)); - /* Make Vprin1_to_string_buffer be the default buffer after PRINTFINSH */ + /* Make Vprin1_to_string_buffer be the default buffer after PRINTFINISH */ PRINTFINISH; } -- cgit v1.2.3