From: Juanma Barranquero Date: Tue, 15 Nov 2011 00:54:19 +0000 (+0100) Subject: Fix typos. X-Git-Tag: emacs-pretest-24.0.92~182 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d26e0b62b7d01e3cb6eb57943269b8f25e53cd6;p=emacs.git Fix typos. --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ec12b77e826..10e62b7d25f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-11-15 Juanma Barranquero + + * ede.texi (project-am-texinfo): Fix typo. + 2011-11-14 Juanma Barranquero * ediff.texi (Hooks): diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 13b640a09fe..fc85f325a54 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -3273,7 +3273,7 @@ Return the default macro to 'edit' for this object type. @end deffn @deffn Method project-compile-target-command :AFTER this -Default target t- use when compling a texinfo file. +Default target t- use when compiling a texinfo file. @end deffn @deffn Method ede-documentation :AFTER this diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dcd72b8a5fb..c6f5f3bfd4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-11-15 Juanma Barranquero + + * epg.el (epg-start-decrypt, epg-start-verify, epg-start-sign) + (epg-start-encrypt, epg-start-export-keys, epg-start-import-keys) + (epg-start-receive-keys, epg-start-delete-keys, epg-start-sign-keys) + (epg-start-generate-key, epg-context-set-progress-callback): Fix typos. + 2011-11-15 Glenn Morris * simple.el (mark-whole-buffer): Doc fix. (Bug#10023) diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index 76bac50c4b8..08bd70926b4 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 @@ -5283,7 +5283,7 @@ (disabled-command-function): Function renamed from `disabled-command-hook'. Adapt code to name change of the variable. -2004-08-07 Satyaki Das (tiny change) +2004-08-07 Satyaki Das * simple.el (completion-root-regexp): New defvar. (completion-setup-function): Use it instead of a literal string. diff --git a/lisp/allout.el b/lisp/allout.el index 9eeddb207ff..df2a21ffb2c 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -2525,7 +2525,7 @@ Outermost is first." (defun allout-mark-active-p () "True if the mark is currently or always active." ;; `(cond (boundp...))' (or `(if ...)') invokes special byte-compiler - ;; provisions, at least in fsf emacs to prevent warnings about lack of, + ;; provisions, at least in GNU Emacs to prevent warnings about lack of, ;; eg, region-active-p. (cond ((boundp 'mark-active) mark-active) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 0d621ad640a..7d70e83200d 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2011-11-15 Juanma Barranquero + + * ede/project-am.el (project-compile-target-command): Fix typo. + 2011-11-14 Juanma Barranquero * ede/auto.el (ede-project-autoload): diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el index ec54d8151bc..c1e656e8459 100644 --- a/lisp/cedet/ede/project-am.el +++ b/lisp/cedet/ede/project-am.el @@ -836,7 +836,7 @@ nil means that this buffer belongs to no-one." (oref this :name)) (defmethod project-compile-target-command ((this project-am-texinfo)) - "Default target t- use when compling a texinfo file." + "Default target t- use when compiling a texinfo file." (let ((n (oref this :name))) (if (string-match "\\.texi?\\(nfo\\)?" n) (setq n (replace-match ".info" t t n))) diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 52bfaab5d25..0e7657642c2 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -637,7 +637,7 @@ SYMBOL is a function that can be overridden." (defun mode-local-print-bindings (table) "Print bindings in TABLE." - (let (us ;; List of unpecified symbols + (let (us ;; List of unspecified symbols mc ;; List of mode local constants mv ;; List of mode local variables ov ;; List of overloaded functions diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index c80dd31a8f0..fcab8b57c1e 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -871,7 +871,7 @@ Otherwise return the normal value." (abbreviate-file-name file))) ;; Sit for VAL milliseconds. XEmacs doesn't support the millisecond arg -;; in sit-for, so this function smoothes out the differences. +;; in sit-for, so this function smooths out the differences. (defsubst viper-sit-for-short (val &optional nodisp) (sit-for (/ val 1000.0) nodisp)) diff --git a/lisp/epg.el b/lisp/epg.el index 9ca07e213b4..00c00f9c9d3 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -356,7 +356,7 @@ query by itself and Emacs can intercept them." PROGRESS-CALLBACK is either a function, or a cons-cell whose car is a function and cdr is a callback data. -The function gets five arguments: the context, the operation +The function gets six arguments: the context, the operation description, the character to display a progress unit, the current amount done, the total amount to be done, and the callback data (if any)." @@ -2031,7 +2031,7 @@ CIPHER must be a file data object. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-decrypt-file' or `epg-decrypt-string' instead." (unless (epg-data-file cipher) @@ -2097,7 +2097,7 @@ For a normal or a cleartext signature, SIGNED-TEXT should be nil. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-verify-file' or `epg-verify-string' instead." (epg-context-set-operation context 'verify) @@ -2195,7 +2195,7 @@ Otherwise, it makes a cleartext signature. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-sign-file' or `epg-sign-string' instead." (epg-context-set-operation context 'sign) @@ -2299,7 +2299,7 @@ If RECIPIENTS is nil, it performs symmetric encryption. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-encrypt-file' or `epg-encrypt-string' instead." (epg-context-set-operation context 'encrypt) @@ -2414,7 +2414,7 @@ If RECIPIENTS is nil, it performs symmetric encryption." If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-export-keys-to-file' or `epg-export-keys-to-string' instead." (epg-context-set-operation context 'export-keys) @@ -2457,7 +2457,7 @@ KEYS is a data object. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-import-keys-from-file' or `epg-import-keys-from-string' instead." (epg-context-set-operation context 'import-keys) @@ -2498,7 +2498,7 @@ KEY-ID-LIST is a list of key IDs. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-receive-keys' instead." (epg-context-set-operation context 'receive-keys) @@ -2526,7 +2526,7 @@ KEYS is a list of key IDs" If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-delete-keys' instead." (epg-context-set-operation context 'delete-keys) @@ -2558,7 +2558,7 @@ If you are unsure, use synchronous version of this function If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-sign-keys' instead." (epg-context-set-operation context 'sign-keys) @@ -2593,7 +2593,7 @@ PARAMETERS specifies parameters for the key. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-generate-key-from-file' or `epg-generate-key-from-string' instead." (epg-context-set-operation context 'generate-key) diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index f73d2af949c..1e90b33a23b 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -826,7 +826,7 @@ * (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space * erc.el: - * Changed menu-definition to use easymenu (hopefully this now works under Xemacs) + * Changed menu-definition to use easymenu (hopefully this now works under XEmacs) * Fix for custom problem with :must-match on XEmacs (thanks shapr) * Added /COUNTRY command using (what-domain) from package mail-extr (shapr) * Fix for case-sensitivity problem with pals (they are now all downcased) diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02 index 09ab1cb3796..d1b05a23140 100644 --- a/lisp/erc/ChangeLog.02 +++ b/lisp/erc/ChangeLog.02 @@ -1373,7 +1373,7 @@ * erc-menu.el: * changed how we check if we should activate "Track hidden channels" and - whether it should be selected - fixes a bug Xemacs where whole menu bar + whether it should be selected - fixes a bug XEmacs where whole menu bar does not work if menu is loaded * erc-menu.el: @@ -1545,7 +1545,7 @@ * added s461 to english catalog - * fixed bug where Xemacs would not quit if erc-quit-reason was + * fixed bug where XEmacs would not quit if erc-quit-reason was set to erc-quit-reason-various and assoc-default was not defined 2002-06-04 Andreas Fuchs diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 74f2ab442b9..43d0247bce6 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -1600,7 +1600,8 @@ * erc-dcc.el: * erc-dcc-ipv4-regexp: New constant * (erc-ip-to-decimal): Use it. - * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp: * erc-dcc-host: :type + * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp: + * erc-dcc-host: :type * (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE. * Some docstring/comment fixes. @@ -1610,7 +1611,7 @@ * erc-dcc.el: * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), - and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it! + and saves correctly (tried with 21.3.50)). Thanks to Eli for suggesting it! * Added :start-time plist property/value to GET handling so that we can calculate elapsed-time. * Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...) diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04 index 7db040fd23f..ff47372b8e3 100644 --- a/lisp/erc/ChangeLog.04 +++ b/lisp/erc/ChangeLog.04 @@ -136,7 +136,7 @@ 2004-12-14 Diane Murray * erc.el: The last change to `erc-mode-line-format' introduced a - bug in Xemacs - it can't handle the #(" "...) strings at all. The + bug in XEmacs - it can't handle the #(" "...) strings at all. The following changes fix the bug and simplify the mode-line handling considerably. (erc-mode-line-format): Now defined as a string which will be formatted using `format-spec' and take the place of diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0a6e3a426a1..77f2235e790 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2011-11-15 Juanma Barranquero + + * shr-color.el (shr-color-visible-distance-min) + (shr-color-relative-to-absolute, set-minimum-interval) + (shr-color-visible): Fix typos. + 2011-11-03 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el index 36dd65f4a2d..4fd35659e08 100644 --- a/lisp/gnus/shr-color.el +++ b/lisp/gnus/shr-color.el @@ -41,7 +41,7 @@ Must be between 0 and 100." (defcustom shr-color-visible-distance-min 5 "Minimum color distance between two colors to be considered visible. -This value is used to compare result for `ciede2000'. Its an +This value is used to compare result for `ciede2000'. It's an absolute value without any unit." :group 'shr :type 'integer) @@ -198,7 +198,8 @@ absolute value without any unit." Each entry should have the form (COLOR-NAME . HEXADECIMAL-COLOR).") (defun shr-color-relative-to-absolute (number) - "Convert a relative NUMBER to absolute. If NUMBER is absolute, return NUMBER. + "Convert a relative NUMBER to absolute. +If NUMBER is absolute, return NUMBER. This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"." (let ((string-length (- (length number) 1))) ;; Is this a number with %? @@ -269,7 +270,7 @@ Like rgb() or hsl()." (defun set-minimum-interval (val1 val2 min max interval &optional fixed) "Set minimum interval between VAL1 and VAL2 to INTERVAL. The values are bound by MIN and MAX. -If FIXED is t, then val1 will not be touched." +If FIXED is t, then VAL1 will not be touched." (let ((diff (abs (- val1 val2)))) (unless (>= diff interval) (if fixed @@ -319,10 +320,10 @@ If FIXED is t, then val1 will not be touched." (defun shr-color-visible (bg fg &optional fixed-background) "Check that BG and FG colors are visible if they are drawn on each other. -Return (bg fg) if they are. If they are too similar, two new +Return (bg fg) if they are. If they are too similar, two new colors are returned instead. If FIXED-BACKGROUND is set, and if the color are not visible, a -new background color will not be computed. Only the foreground +new background color will not be computed. Only the foreground color will be adapted to be visible on BG." ;; Convert fg and bg to CIE Lab (let ((fg-norm (color-name-to-rgb fg)) @@ -334,7 +335,7 @@ color will be adapted to be visible on BG." (bg-lab (apply 'color-srgb-to-lab bg-norm)) ;; Compute color distance using CIE DE 2000 (fg-bg-distance (color-cie-de2000 fg-lab bg-lab)) - ;; Compute luminance distance (substract L component) + ;; Compute luminance distance (subtract L component) (luminance-distance (abs (- (car fg-lab) (car bg-lab))))) (if (and (>= fg-bg-distance shr-color-visible-distance-min) (>= luminance-distance shr-color-visible-luminance-min)) diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 827ce047591..4ba5e847981 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -3289,7 +3289,7 @@ (mh-tick-add-overlay, mh-tick-remove-overlay, mh-notate-tick): These functions aren't needed any more, since overlays aren't used any more. Also overlays aren't portable to XEmacs, so nasty - conditional code that used overlays in Emacs and extents in Xemacs + conditional code that used overlays in Emacs and extents in XEmacs have been eliminated. (mh-toggle-tick): Generalize it to work on a range of messages like the other interactive messages. @@ -9445,7 +9445,7 @@ Non-fatal depencencies on the mm-decode, mm-uu and mm-view libraries. -2002-07-15 Satyaki Das +2002-07-15 Satyaki Das * mh-utils.el (mh-require, mh-autoload): Remove these macros. (mh-decode-mime): Initialized to t iff the mm-decode library is @@ -9455,8 +9455,8 @@ 2002-07-15 Mark D Baushke * mh-utils.el (mh-update-scan-format): Rewrite for compatibility - with Xemacs as replace-match appears not to have identical - functionality with FSF emacs. + with XEmacs as replace-match appears not to have identical + functionality with GNU Emacs. (mh-scan-msg-format-regexp): Deleted. This regexp is now hardcoded into the mh-update-scan-format function. @@ -10337,7 +10337,7 @@ arguments in XEmacs. (mh-send-letter): sendmail-coding-system not bound in XEmacs. (mh-send-letter): default-buffer-file-coding-system not bound in - Xemacs. + XEmacs. * mh-e.el (mh-delete-msg, mh-refile-msg, mh-undo): transient-mark-mode not bound in XEmacs. The feature of diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index d19ba47aa3f..d55e5ce23b4 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -71,7 +71,7 @@ ;; / can delimit regexes or be a division operator. By default we assume ;; that it is a division sign, and fix the regexp operator cases with ;; `font-lock-syntactic-keywords'. - (modify-syntax-entry ?/ "." st) ; ACM 2002/4/27. + (modify-syntax-entry ?/ "." st) ; ACM 2002/4/27. (modify-syntax-entry ?* "." st) (modify-syntax-entry ?+ "." st) (modify-syntax-entry ?- "." st) @@ -195,7 +195,7 @@ ;; Matches the inside of an AWK regexp (i.e. without the enclosing /s) (defconst c-awk-regexp-without-end-re (concat "/" c-awk-regexp-innards-re)) -;; Matches an AWK regexp up to, but not including, any terminating /. +;; Matches an AWK regexp up to, but not including, any terminating /. (defconst c-awk-one-line-possibly-open-regexp-re (concat "/\\(" c-awk-non-eol-esc-pair-re "\\|" c-awk-regexp-one-line-possibly-open-char-list-re @@ -256,7 +256,7 @@ ;; ACM, 2002/5/29: -;; +;; ;; The next section of code is about determining whether or not an AWK ;; statement is complete or not. We use this to indent the following line. ;; The determination is pretty straightforward in C, where a statement ends @@ -382,7 +382,7 @@ ;; Kludge: If c-backward-syntactic-ws gets stuck at a BOL, it is likely ;; that the previous line contains an unterminated string (without \). In ;; this case, assume that the previous line's c-awk-NL-prop is a $. - ;; + ;; ;; POINT MUST BE AT THE START OF A LINE when calling this function. This ;; is to ensure that the various backward-comment functions will work ;; properly. @@ -425,13 +425,13 @@ ;; Calculate and set the value of the c-awk-NL-prop on the immediately ;; preceding EOL. This may also involve doing the same for several ;; preceding EOLs. - ;; + ;; ;; NOTE that if the property was already set, we return it without ;; recalculation. (This is by accident rather than design.) - ;; + ;; ;; Return the property which got set (or was already set) on the previous ;; line. Return nil if we hit BOB. - ;; + ;; ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. ;; ;; This function might do hidden buffer changes. @@ -492,7 +492,7 @@ ;; if necessary. (As a special case, the property doesn't get set on an ;; empty line at EOB (there's no position to set the property on), but the ;; function returns the property value an EOL would have got.) - ;; + ;; ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. ;; ;; This function might do hidden buffer changes. @@ -566,7 +566,7 @@ ;; this, a new newline inserted after an old newline (e.g. by C-j) would ;; inherit any c-awk-NL-prop from the old newline. This would be a Bad ;; Thing. This function's action is required by c-put-char-property. - (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in Xemacs + (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in XEmacs (not (assoc 'c-awk-NL-prop text-property-default-nonsticky))) (setq text-property-default-nonsticky (cons '(c-awk-NL-prop . t) text-property-default-nonsticky)))) @@ -611,7 +611,7 @@ ;; Go back to the start of the (apparent) current line (or the start of the ;; line containing POS), returning the buffer position of that point. I.e., ;; go back to the last line which doesn't have an escaped EOL before it. -;; +;; ;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any ;; comment, string or regexp. IT MAY WELL BE that this function should not be ;; executed on a narrowed buffer. @@ -823,14 +823,14 @@ ;; Don't overlook the possibility of the buffer change being the "recapturing" ;; of a previously escaped newline. -;; ACM 2008-02-05: +;; ACM 2008-02-05: (defun c-awk-extend-and-syntax-tablify-region (beg end old-len) ;; Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put ;; `syntax-table' properties on this region. ;; ;; This function is called from an after-change function, BEG END and ;; OLD-LEN being the standard parameters. - ;; + ;; ;; Point is undefined both before and after this function call, the buffer ;; has been widened, and match-data saved. The return value is ignored. ;; @@ -848,7 +848,7 @@ ;; Awk regexps written with help from Peter Galbraith ;; . ;; Take GNU Emacs's 'words out of the following regexp-opts. They dont work -;; in Xemacs 21.4.4. acm 2002/9/19. +;; in XEmacs 21.4.4. acm 2002/9/19. (defconst awk-font-lock-keywords (eval-when-compile (list diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index fd32e5e956c..81d1c0d2f32 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2032,7 +2032,7 @@ comment at the start of cc-engine.el for more info." (defconst c-state-cache-too-far 5000) ;; A maximum comfortable scanning distance, e.g. between ;; `c-state-cache-good-pos' and "HERE" (where we call c-parse-state). When -;; this distance is exceeded, we take "emergency meausures", e.g. by clearing +;; this distance is exceeded, we take "emergency measures", e.g. by clearing ;; the cache and starting again from point-min or a beginning of defun. This ;; value can be tuned for efficiency or set to a lower value for testing. @@ -4219,9 +4219,9 @@ comment at the start of cc-engine.el for more info." ;; complicated anyway. In this case, lim is only used to detect ;; cpp directives. ;; -;; Note that there is a bug in Xemacs's buffer-syntactic-context when used in +;; Note that there is a bug in XEmacs's buffer-syntactic-context when used in ;; conjunction with syntax-table-properties. The bug is present in, e.g., -;; Xemacs 21.4.4. It manifested itself thus: +;; XEmacs 21.4.4. It manifested itself thus: ;; ;; Starting with an empty AWK Mode buffer, type ;; /regexp/ { @@ -4235,7 +4235,7 @@ comment at the start of cc-engine.el for more info." ;; ;; The workaround for this is for the AWK Mode initialisation to switch the ;; defalias for c-in-literal to c-slow-in-literal. This will slow down other -;; cc-modes in Xemacs whenever an awk-buffer has been initialised. +;; cc-modes in XEmacs whenever an awk-buffer has been initialised. ;; ;; (Alan Mackenzie, 2003/4/30). diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index a6bf241f0db..d93d174047b 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -484,7 +484,7 @@ that requires a literal mode spec at compile time." (make-local-variable 'comment-start) (make-local-variable 'comment-end) (make-local-variable 'comment-start-skip) - + (make-local-variable 'paragraph-start) (make-local-variable 'paragraph-separate) (make-local-variable 'paragraph-ignore-fill-prefix) @@ -660,7 +660,7 @@ compatible with old code; callers should always specify it." (when (eq (car elt) 'c-file-style) (setq cownt (1+ cownt)))) cownt)) - + (defun c-before-hack-hook () "Set the CC Mode style and \"offsets\" when in the buffer's local variables. They are set only when, respectively, the pseudo variables @@ -860,7 +860,7 @@ Note that the style variables are always made local to the buffer." ;; (i) Extend the font lock region to cover all changed preprocessor ;; regions; it does this by setting the variables `c-new-BEG' and ;; `c-new-END' to the new boundaries. - ;; + ;; ;; (ii) "Neutralize" every preprocessor line wholly or partially in the ;; extended changed region. "Restore" lines which were CPP lines before the ;; change and are no longer so; these can be located from the Buffer local @@ -1562,7 +1562,7 @@ Key bindings: (c-common-init 'awk-mode) (c-awk-unstick-NL-prop) - ;; Prevent Xemacs's buffer-syntactic-context being used. See the comment + ;; Prevent XEmacs's buffer-syntactic-context being used. See the comment ;; in cc-engine.el, just before (defun c-fast-in-literal ... (defalias 'c-in-literal 'c-slow-in-literal) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 0556741b65b..13858ad0da1 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1512,7 +1512,7 @@ the last)." (defvar cperl-font-locking nil) ;; NB as it stands the code in cperl-mode assumes this only has one -;; element. If Xemacs 19 support were dropped, this could all be simplified. +;; element. If XEmacs 19 support were dropped, this could all be simplified. (defvar cperl-compilation-error-regexp-alist ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS). '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]" diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index ecd3b4af360..00466b8b1e7 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -292,7 +292,7 @@ STRING should be given if the last search was by `string-match' on STRING." "Filter `easy-menu-define' MENU to support new features." (cond ((not (featurep 'xemacs)) menu) ;; GNU Emacs - passthru - ;; Xemacs doesn't support :help. Strip it. + ;; XEmacs doesn't support :help. Strip it. ;; Recursively filter the a submenu ((listp menu) (mapcar 'verilog-easy-menu-filter menu)) @@ -737,7 +737,7 @@ See `compilation-error-regexp-alist' for the formatting. For Emacs 22+.") (defvar verilog-error-regexp-xemacs-alist ;; Emacs form is '((v-tool "re" 1 2) ...) ;; XEmacs form is '(verilog ("re" 1 2) ...) - ;; So we can just map from Emacs to Xemacs + ;; So we can just map from Emacs to XEmacs (cons 'verilog (mapcar 'cdr verilog-error-regexp-emacs-alist)) "List of regexps for Verilog compilers. See `compilation-error-regexp-alist-alist' for the formatting. For XEmacs.") diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 0bb96b55c30..00e4a1f62c8 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -2196,7 +2196,7 @@ 1999-09-14 Gerd Moellmann - * sound.c (Fplay_sound): Remove usused variables. + * sound.c (Fplay_sound): Remove unused variables. (be2hs): Put in #if 0 because it's currently not used. 1999-09-14 Ken Raeburn diff --git a/src/ralloc.c b/src/ralloc.c index 50d322523c1..62189ad8fc7 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -219,13 +219,13 @@ find_heap (POINTER address) If enough space is not presently available in our reserve, this means getting more page-aligned space from the system. If the returned space is not contiguous to the last heap, allocate a new heap, and append it + to the heap list. - obtain does not try to keep track of whether space is in use - or not in use. It just returns the address of SIZE bytes that - fall within a single heap. If you call obtain twice in a row - with the same arguments, you typically get the same value. - to the heap list. It's the caller's responsibility to keep - track of what space is in use. + obtain does not try to keep track of whether space is in use or not + in use. It just returns the address of SIZE bytes that fall within a + single heap. If you call obtain twice in a row with the same arguments, + you typically get the same value. It's the caller's responsibility to + keep track of what space is in use. Return the address of the space if all went well, or zero if we couldn't allocate the memory. */ @@ -389,7 +389,7 @@ find_bloc (POINTER *ptr) while (p != NIL_BLOC) { /* Consistency check. Don't return inconsistent blocs. - Don't abort here, as callers might be expecting this, but + Don't abort here, as callers might be expecting this, but callers that always expect a bloc to be returned should abort if one isn't to avoid a memory corruption bug that is difficult to track down. */ @@ -1180,7 +1180,7 @@ r_alloc_reset_variable (POINTER *old, POINTER *new) /* Find the bloc that corresponds to the data pointed to by pointer. find_bloc cannot be used, as it has internal consistency checks - which fail when the variable needs reseting. */ + which fail when the variable needs resetting. */ while (bloc != NIL_BLOC) { if (bloc->data == *new) diff --git a/src/xterm.h b/src/xterm.h index e10a6bc34f0..1d2ce9a2d3c 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -330,7 +330,7 @@ struct x_display_info ptrdiff_t x_dnd_atoms_length; /* Extended window manager hints, Atoms supported by the window manager and - atoms for settig the window type. */ + atoms for setting the window type. */ Atom Xatom_net_supported, Xatom_net_supporting_wm_check; Atom *net_supported_atoms; int nr_net_supported_atoms;