[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106379: Fix typos.
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106379: Fix typos. |
|
Date: |
Tue, 15 Nov 2011 01:54:19 +0100 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106379
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-15 01:54:19 +0100
message:
Fix typos.
modified:
doc/misc/ChangeLog
doc/misc/ede.texi
lisp/ChangeLog
lisp/ChangeLog.11
lisp/allout.el
lisp/cedet/ChangeLog
lisp/cedet/ede/project-am.el
lisp/cedet/mode-local.el
lisp/emulation/viper-util.el
lisp/epg.el
lisp/erc/ChangeLog.01
lisp/erc/ChangeLog.02
lisp/erc/ChangeLog.03
lisp/erc/ChangeLog.04
lisp/gnus/ChangeLog
lisp/gnus/shr-color.el
lisp/mh-e/ChangeLog.1
lisp/progmodes/cc-awk.el
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-mode.el
lisp/progmodes/cperl-mode.el
lisp/progmodes/verilog-mode.el
src/ChangeLog.8
src/ralloc.c
src/xterm.h
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2011-11-14 23:59:56 +0000
+++ b/doc/misc/ChangeLog 2011-11-15 00:54:19 +0000
@@ -1,3 +1,7 @@
+2011-11-15 Juanma Barranquero <address@hidden>
+
+ * ede.texi (project-am-texinfo): Fix typo.
+
2011-11-14 Juanma Barranquero <address@hidden>
* ediff.texi (Hooks):
=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2011-05-10 13:57:12 +0000
+++ b/doc/misc/ede.texi 2011-11-15 00:54:19 +0000
@@ -3273,7 +3273,7 @@
@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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-11-15 00:38:10 +0000
+++ b/lisp/ChangeLog 2011-11-15 00:54:19 +0000
@@ -1,3 +1,10 @@
+2011-11-15 Juanma Barranquero <address@hidden>
+
+ * 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 <address@hidden>
* simple.el (mark-whole-buffer): Doc fix. (Bug#10023)
=== modified file 'lisp/ChangeLog.11'
--- a/lisp/ChangeLog.11 2011-01-26 08:36:39 +0000
+++ b/lisp/ChangeLog.11 2011-11-15 00:54:19 +0000
@@ -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 <address@hidden> (tiny change)
+2004-08-07 Satyaki Das <address@hidden>
* simple.el (completion-root-regexp): New defvar.
(completion-setup-function): Use it instead of a literal string.
=== modified file 'lisp/allout.el'
--- a/lisp/allout.el 2011-11-14 21:00:24 +0000
+++ b/lisp/allout.el 2011-11-15 00:54:19 +0000
@@ -2525,7 +2525,7 @@
(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)
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2011-11-14 21:00:24 +0000
+++ b/lisp/cedet/ChangeLog 2011-11-15 00:54:19 +0000
@@ -1,3 +1,7 @@
+2011-11-15 Juanma Barranquero <address@hidden>
+
+ * ede/project-am.el (project-compile-target-command): Fix typo.
+
2011-11-14 Juanma Barranquero <address@hidden>
* ede/auto.el (ede-project-autoload):
=== modified file 'lisp/cedet/ede/project-am.el'
--- a/lisp/cedet/ede/project-am.el 2011-10-23 03:38:23 +0000
+++ b/lisp/cedet/ede/project-am.el 2011-11-15 00:54:19 +0000
@@ -836,7 +836,7 @@
(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)))
=== modified file 'lisp/cedet/mode-local.el'
--- a/lisp/cedet/mode-local.el 2011-11-14 20:23:26 +0000
+++ b/lisp/cedet/mode-local.el 2011-11-15 00:54:19 +0000
@@ -637,7 +637,7 @@
(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
=== modified file 'lisp/emulation/viper-util.el'
--- a/lisp/emulation/viper-util.el 2011-11-14 20:23:26 +0000
+++ b/lisp/emulation/viper-util.el 2011-11-15 00:54:19 +0000
@@ -871,7 +871,7 @@
(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))
=== modified file 'lisp/epg.el'
--- a/lisp/epg.el 2011-08-08 07:11:25 +0000
+++ b/lisp/epg.el 2011-11-15 00:54:19 +0000
@@ -356,7 +356,7 @@
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 @@
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 @@
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 @@
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 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 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 @@
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 @@
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 @@
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 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 @@
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)
=== modified file 'lisp/erc/ChangeLog.01'
--- a/lisp/erc/ChangeLog.01 2011-11-14 21:00:24 +0000
+++ b/lisp/erc/ChangeLog.01 2011-11-15 00:54:19 +0000
@@ -826,7 +826,7 @@
* (erc-complete-nick): Add ": " only if one completes directly after
the erc-prompt, otherwise, add just one space
* erc.el 1.47:
- * 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)
=== modified file 'lisp/erc/ChangeLog.02'
--- a/lisp/erc/ChangeLog.02 2011-01-25 04:08:28 +0000
+++ b/lisp/erc/ChangeLog.02 2011-11-15 00:54:19 +0000
@@ -1373,7 +1373,7 @@
* erc-menu.el 1.8:
* 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 1.7:
@@ -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 <address@hidden>
=== modified file 'lisp/erc/ChangeLog.03'
--- a/lisp/erc/ChangeLog.03 2011-11-14 20:23:26 +0000
+++ b/lisp/erc/ChangeLog.03 2011-11-15 00:54:19 +0000
@@ -1600,7 +1600,8 @@
* erc-dcc.el 1.57: * 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 1.56:
* 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 ...)
=== modified file 'lisp/erc/ChangeLog.04'
--- a/lisp/erc/ChangeLog.04 2011-01-25 04:08:28 +0000
+++ b/lisp/erc/ChangeLog.04 2011-11-15 00:54:19 +0000
@@ -136,7 +136,7 @@
2004-12-14 Diane Murray <address@hidden>
* 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
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-11-14 23:59:56 +0000
+++ b/lisp/gnus/ChangeLog 2011-11-15 00:54:19 +0000
@@ -1,3 +1,9 @@
+2011-11-15 Juanma Barranquero <address@hidden>
+
+ * 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 <address@hidden>
* gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be
=== modified file 'lisp/gnus/shr-color.el'
--- a/lisp/gnus/shr-color.el 2011-02-21 06:03:36 +0000
+++ b/lisp/gnus/shr-color.el 2011-11-15 00:54:19 +0000
@@ -41,7 +41,7 @@
(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 @@
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 @@
(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 @@
(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 @@
(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))
=== modified file 'lisp/mh-e/ChangeLog.1'
--- a/lisp/mh-e/ChangeLog.1 2011-11-14 21:00:24 +0000
+++ b/lisp/mh-e/ChangeLog.1 2011-11-15 00:54:19 +0000
@@ -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 <address@hidden>
+2002-07-15 Satyaki Das <address@hidden>
* 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 <address@hidden>
* 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
=== modified file 'lisp/progmodes/cc-awk.el'
--- a/lisp/progmodes/cc-awk.el 2011-01-25 04:08:28 +0000
+++ b/lisp/progmodes/cc-awk.el 2011-11-15 00:54:19 +0000
@@ -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
;; <address@hidden>.
;; 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
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2011-11-14 23:59:56 +0000
+++ b/lisp/progmodes/cc-engine.el 2011-11-15 00:54:19 +0000
@@ -2032,7 +2032,7 @@
(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 @@
;; 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/ {<C-j>
@@ -4235,7 +4235,7 @@
;;
;; 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).
=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2011-10-27 20:34:23 +0000
+++ b/lisp/progmodes/cc-mode.el 2011-11-15 00:54:19 +0000
@@ -484,7 +484,7 @@
(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 @@
(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 @@
;; (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 @@
(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)
=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el 2011-11-14 23:59:56 +0000
+++ b/lisp/progmodes/cperl-mode.el 2011-11-15 00:54:19 +0000
@@ -1512,7 +1512,7 @@
(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]"
=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el 2011-11-14 21:00:24 +0000
+++ b/lisp/progmodes/verilog-mode.el 2011-11-15 00:54:19 +0000
@@ -292,7 +292,7 @@
"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 @@
(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.")
=== modified file 'src/ChangeLog.8'
--- a/src/ChangeLog.8 2011-11-14 20:23:26 +0000
+++ b/src/ChangeLog.8 2011-11-15 00:54:19 +0000
@@ -2196,7 +2196,7 @@
1999-09-14 Gerd Moellmann <address@hidden>
- * 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 <address@hidden>
=== modified file 'src/ralloc.c'
--- a/src/ralloc.c 2011-09-09 01:06:52 +0000
+++ b/src/ralloc.c 2011-11-15 00:54:19 +0000
@@ -219,13 +219,13 @@
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 @@
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 @@
/* 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)
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2011-10-30 17:17:48 +0000
+++ b/src/xterm.h 2011-11-15 00:54:19 +0000
@@ -330,7 +330,7 @@
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;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106379: Fix typos.,
Juanma Barranquero <=