[Emacs-diffs] /srv/bzr/emacs/trunk r106560: Fix typos.

[Juanma Barranquero]

------------------------------------------------------------
revno: 106560
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-30 17:33:05 +0100
message:
  Fix typos.
modified:
  leim/quail/cyrillic.el
  lisp/ChangeLog
  lisp/htmlfontify.el
  lisp/international/fontset.el
  lisp/textmodes/texinfmt.el
  src/ChangeLog
  src/ftfont.c
  src/term.c

=== modified file 'leim/quail/cyrillic.el'
--- a/leim/quail/cyrillic.el    2011-11-19 09:18:31 +0000
+++ b/leim/quail/cyrillic.el    2011-11-30 16:33:05 +0000
@@ -27,7 +27,7 @@
 ;;; Commentary:
 
 ;; These methods use a mixture of 8859-5 and Unicode.  Quail, used
-;; with ucs-tables provides suport for translating on the fly to
+;; with ucs-tables provides support for translating on the fly to
 ;; what's appropriate for aa buffer's file coding system, so the
 ;; encoding shouldn't matter too much provided it supports the
 ;; necessary characters.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-30 03:18:33 +0000
+++ b/lisp/ChangeLog    2011-11-30 16:33:05 +0000
@@ -1,3 +1,9 @@
+2011-11-30  Juanma Barranquero  <address@hidden>
+
+       * htmlfontify.el (hfy-page-header, hfy-post-html-hooks)
+       (hfy-shell-file-name, hfy-shell):
+       * international/fontset.el (x-decompose-font-name): Fix typos.
+
 2011-11-29  Ken Brown  <address@hidden>
 
        * progmodes/gdb-mi.el: Fix bug#9853, bug#9858, and bug#9878.

=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el       2011-11-20 02:29:42 +0000
+++ b/lisp/htmlfontify.el       2011-11-30 16:33:05 +0000
@@ -150,11 +150,11 @@
   :prefix "hfy-")
 
 (defcustom hfy-page-header 'hfy-default-header
-  "Function called to build the header of the html source.
+  "Function called to build the header of the HTML source.
 This is called with two arguments (the filename relative to the top
 level source directory being etag'd and fontified), and a string containing
 the <style>...</style> text to embed in the document.
-It should return the string returned will be used as the header for the
+It should return a string that will be used as the header for the
 htmlfontified version of the source file.\n
 See also `hfy-page-footer'."
   :group 'htmlfontify
@@ -166,8 +166,8 @@
 (defcustom hfy-split-index nil
   "Whether or not to split the index `hfy-index-file' alphabetically.
 If non-nil, the index is split on the first letter of each tag.
-Useful when the index would otherwise
-be large and take a long time to render or be difficult to navigate."
+Useful when the index would otherwise be large and take
+a long time to render or be difficult to navigate."
   :group 'htmlfontify
   :tag   "split-index"
   :type  '(boolean))
@@ -179,7 +179,7 @@
   :tag   "page-footer"
   :type  '(function))
 
-(defcustom hfy-extn        ".html"
+(defcustom hfy-extn ".html"
   "File extension used for output files."
   :group 'htmlfontify
   :tag   "extension"
@@ -251,7 +251,7 @@
 
 (defcustom hfy-post-html-hooks nil
   "List of functions to call after creating and filling the HTML buffer.
-These functions will be called with the html buffer as the current buffer."
+These functions will be called with the HTML buffer as the current buffer."
   :group   'htmlfontify
   :tag     "post-html-hooks"
   :options '(set-auto-mode)
@@ -342,7 +342,7 @@
   :type  '(file))
 
 (defcustom hfy-shell-file-name "/bin/sh"
-  "Shell (bourne or compatible) to invoke for complex shell operations."
+  "Shell (Bourne or compatible) to invoke for complex shell operations."
   :group 'htmlfontify
   :tag   "shell-file-name"
   :type  '(file))
@@ -595,7 +595,8 @@
                    (setq cperl-syntaxify-by-font-lock t)))
              (setq hfy-cperl-mode-kludged-p t))) )
 
-(defun hfy-opt (symbol) "Is option SYMBOL set."
+(defun hfy-opt (symbol)
+  "Is option SYMBOL set."
   (memq symbol hfy-optimisations))
 
 (defun hfy-default-header (file style)
@@ -1066,7 +1067,7 @@
                      ;; text-decoration is not inherited.
                      ;; but it's not wrong and if this ever changes it will
                      ;; be needed, so I think it's better to leave it in? -- v
-                     (nconc final-style '(("text-decoration"."none"))))))
+                     (nconc final-style '(("text-decoration" . "none"))))))
     final-style))
 
 ;; strip redundant bits from a name. Technically, this could result in
@@ -1992,7 +1993,7 @@
          tags-list) )))
 
 (defun hfy-shell ()
-  "Return `shell-file-name', or \"/bin/sh\" if it is a non-bourne shell."
+  "Return `shell-file-name', or \"/bin/sh\" if it is a non-Bourne shell."
   (if (string-match "\\<bash\\>\\|\\<sh\\>\\|\\<dash\\>" shell-file-name)
       shell-file-name
     (or hfy-shell-file-name "/bin/sh")))

=== modified file 'lisp/international/fontset.el'
--- a/lisp/international/fontset.el     2011-11-17 09:09:20 +0000
+++ b/lisp/international/fontset.el     2011-11-30 16:33:05 +0000
@@ -858,9 +858,9 @@
 (defun x-decompose-font-name (pattern)
   "Decompose PATTERN into XLFD fields and return a vector of the fields.
 The length of the vector is 12.
-The FOUNDRY and FAMILY fields are concatinated and stored in the first
+The FOUNDRY and FAMILY fields are concatenated and stored in the first
 element of the vector.
-The REGISTRY and ENCODING fields are concatinated and stored in the last
+The REGISTRY and ENCODING fields are concatenated and stored in the last
 element of the vector.
 
 Return nil if PATTERN doesn't conform to XLFD."

=== modified file 'lisp/textmodes/texinfmt.el'
--- a/lisp/textmodes/texinfmt.el        2011-11-17 09:09:20 +0000
+++ b/lisp/textmodes/texinfmt.el        2011-11-30 16:33:05 +0000
@@ -518,7 +518,7 @@
 
 ;;; Handle paragraph filling
 
-;; Keep as concatinated lists for ease of maintenance
+;; Keep as concatenated lists for ease of maintenance
 
 (defvar texinfo-no-refill-regexp
   (concat

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-30 12:58:42 +0000
+++ b/src/ChangeLog     2011-11-30 16:33:05 +0000
@@ -8688,7 +8688,7 @@
        (xg_set_widget_bg): New function.
        (delete_cb): New function.
        (xg_create_frame_widgets): Connect delete-event to delete_cb.
-       Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
+       Call xg_set_widget_bg.  Only set background pixmap for ! HAVE_GTK3
        (xg_set_background_color): Call xg_set_widget_bg.
        (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
        (xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2011-11-20 02:29:42 +0000
+++ b/src/ftfont.c      2011-11-30 16:33:05 +0000
@@ -1462,7 +1462,7 @@
        : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8
        : -1);
   if (bitmap->bits_per_pixel < 0)
-    /* We don't suport that kind of pixel mode.  */
+    /* We don't support that kind of pixel mode.  */
     return -1;
   bitmap->rows = ft_face->glyph->bitmap.rows;
   bitmap->width = ft_face->glyph->bitmap.width;

=== modified file 'src/term.c'
--- a/src/term.c        2011-09-15 16:22:58 +0000
+++ b/src/term.c        2011-11-30 16:33:05 +0000
@@ -3236,7 +3236,7 @@
   MultiLeft (tty) = tgetstr ("LE", address);
   MultiRight (tty) = tgetstr ("RI", address);
 
-  /* SVr4/ANSI color suppert.  If "op" isn't available, don't support
+  /* SVr4/ANSI color support.  If "op" isn't available, don't support
      color because we can't switch back to the default foreground and
      background.  */
   tty->TS_orig_pair = tgetstr ("op", address);