[Emacs-diffs] /srv/bzr/emacs/trunk r106690: Spelling fixes.

[Paul Eggert]

------------------------------------------------------------
revno: 106690
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-16 22:51:13 -0800
message:
  Spelling fixes.
modified:
  doc/emacs/cal-xtra.texi
  doc/emacs/maintaining.texi
  doc/misc/dbus.texi
  lisp/ansi-color.el
  lisp/cedet/semantic/wisent/comp.el
  lisp/international/mule-cmds.el
  lisp/language/cyrillic.el
  lisp/progmodes/prolog.el
  lisp/progmodes/python.el
  lisp/progmodes/verilog-mode.el
  lisp/textmodes/artist.el
  lisp/textmodes/fill.el
  lisp/vc/emerge.el
  lisp/window.el
  src/dbusbind.c
  src/w32term.c

=== modified file 'doc/emacs/cal-xtra.texi'
--- a/doc/emacs/cal-xtra.texi   2011-08-28 21:15:20 +0000
+++ b/doc/emacs/cal-xtra.texi   2011-12-17 06:51:13 +0000
@@ -41,12 +41,12 @@
 
 @vindex calendar-holiday-marker
 @vindex diary-entry-marker
address@hidden calenday-today-marker
address@hidden 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.

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2011-12-16 16:05:59 +0000
+++ b/doc/emacs/maintaining.texi        2011-12-17 06:51:13 +0000
@@ -511,7 +511,7 @@
 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 @@
 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}.
 

=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi        2011-12-12 05:32:49 +0000
+++ b/doc/misc/dbus.texi        2011-12-17 06:51:13 +0000
@@ -1677,7 +1677,7 @@
 
 @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.
 

=== modified file 'lisp/ansi-color.el'
--- a/lisp/ansi-color.el        2011-12-05 08:55:25 +0000
+++ b/lisp/ansi-color.el        2011-12-17 06:51:13 +0000
@@ -585,7 +585,7 @@
   "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."

=== modified file 'lisp/cedet/semantic/wisent/comp.el'
--- a/lisp/cedet/semantic/wisent/comp.el        2011-12-12 05:32:49 +0000
+++ b/lisp/cedet/semantic/wisent/comp.el        2011-12-17 06:51:13 +0000
@@ -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)

=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el   2011-10-03 14:18:42 +0000
+++ b/lisp/international/mule-cmds.el   2011-12-17 06:51:13 +0000
@@ -1031,7 +1031,7 @@
 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)

=== modified file 'lisp/language/cyrillic.el'
--- a/lisp/language/cyrillic.el 2011-01-26 08:36:39 +0000
+++ b/lisp/language/cyrillic.el 2011-12-17 06:51:13 +0000
@@ -126,7 +126,7 @@
 (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 @@
               (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

=== modified file 'lisp/progmodes/prolog.el'
--- a/lisp/progmodes/prolog.el  2011-12-03 04:12:11 +0000
+++ b/lisp/progmodes/prolog.el  2011-12-17 06:51:13 +0000
@@ -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 @@
 (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)

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2011-11-20 19:35:27 +0000
+++ b/lisp/progmodes/python.el  2011-12-17 06:51:13 +0000
@@ -2343,7 +2343,7 @@
 ;;;; 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

=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el    2011-12-01 02:41:47 +0000
+++ b/lisp/progmodes/verilog-mode.el    2011-12-17 06:51:13 +0000
@@ -981,7 +981,7 @@
   "*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 @@
        "`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 @@
     (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 @@
           (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 @@
 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 @@
 
 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 @@
   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 @@
   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 @@
   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'.
 

=== modified file 'lisp/textmodes/artist.el'
--- a/lisp/textmodes/artist.el  2011-12-04 08:02:42 +0000
+++ b/lisp/textmodes/artist.el  2011-12-17 06:51:13 +0000
@@ -4455,7 +4455,7 @@
   "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))))

=== modified file 'lisp/textmodes/fill.el'
--- a/lisp/textmodes/fill.el    2011-11-23 07:03:56 +0000
+++ b/lisp/textmodes/fill.el    2011-12-17 06:51:13 +0000
@@ -82,7 +82,7 @@
       (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 @@
   "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)

=== modified file 'lisp/vc/emerge.el'
--- a/lisp/vc/emerge.el 2011-10-30 01:56:03 +0000
+++ b/lisp/vc/emerge.el 2011-12-17 06:51:13 +0000
@@ -1754,7 +1754,7 @@
 ;; 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.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-12-13 13:37:48 +0000
+++ b/lisp/window.el    2011-12-17 06:51:13 +0000
@@ -3713,7 +3713,7 @@
              (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)))

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2011-11-20 02:29:42 +0000
+++ b/src/dbusbind.c    2011-12-17 06:51:13 +0000
@@ -968,7 +968,7 @@
   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,

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2011-12-05 08:55:25 +0000
+++ b/src/w32term.c     2011-12-17 06:51:13 +0000
@@ -3286,7 +3286,7 @@
  ***********************************************************************/
 
 /* 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