emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 69107f3: ; Fix doc typos related to indefinite ar


From: Glenn Morris
Subject: [Emacs-diffs] emacs-26 69107f3: ; Fix doc typos related to indefinite articles
Date: Fri, 16 Feb 2018 17:35:25 -0500 (EST)

branch: emacs-26
commit 69107f347b3ac7f51cd22333f57393fd735915f2
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    ; Fix doc typos related to indefinite articles
---
 admin/grammars/c.by            |  4 ++--
 admin/notes/unicode            |  2 +-
 doc/lispref/buffers.texi       |  2 +-
 doc/misc/gnus-faq.texi         |  2 +-
 etc/CALC-NEWS                  |  2 +-
 etc/ETAGS.EBNF                 |  2 +-
 etc/NEWS.20                    | 15 +++++++--------
 etc/NEWS.21                    |  4 ++--
 etc/NEWS.22                    |  2 +-
 etc/ORG-NEWS                   |  2 +-
 lisp/calendar/todo-mode.el     |  2 +-
 lisp/cedet/semantic/analyze.el |  2 +-
 lisp/cedet/semantic/dep.el     |  2 +-
 lisp/cedet/semantic/lex.el     |  2 +-
 lisp/emacs-lisp/package.el     |  2 +-
 lisp/font-lock.el              |  2 +-
 lisp/gnus/deuglify.el          |  2 +-
 lisp/gnus/gnus-cus.el          |  2 +-
 lisp/image/gravatar.el         |  4 ++--
 lisp/net/mailcap.el            |  4 ++--
 lisp/org/ob-calc.el            |  2 +-
 lisp/org/org-clock.el          |  2 +-
 lisp/org/ox-odt.el             |  5 ++---
 lisp/progmodes/cc-engine.el    |  2 +-
 lisp/progmodes/sql.el          |  2 +-
 lisp/term/README               |  2 +-
 lisp/textmodes/flyspell.el     |  2 +-
 lisp/wid-edit.el               |  4 ++--
 src/.gdbinit                   |  2 +-
 src/coding.c                   |  2 +-
 src/process.c                  |  2 +-
 src/xsettings.c                |  2 +-
 32 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index 4a52bec..3755c32 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -917,8 +917,8 @@ variablearg-opt-name
     ( ,$1 )
   | semantic-list arg-list
     ( (car ( EXPAND $1 function-pointer )) $2)
- ;; Klaus Berndl: This allows variableargs without a arg-name being
- ;; parsed correct even if there several pointers (*)
+ ;; Klaus Berndl: This allows variableargs without an arg-name being
+ ;; parsed correctly even if there several pointers (*)
   | opt-stars
     ( "" ,$1 nil nil nil )
   ;
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 85ba67b..ff0de8a 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -85,7 +85,7 @@ regard to completeness.
        code (keymap.c and print.c).
 
  * Rationalize character syntax and its relationship to the Unicode
-   database.  (Applies mainly to symbol an punctuation syntax.)
+   database.  (Applies mainly to symbol and punctuation syntax.)
 
  * Fontset handling and customization needs work.  We want to relate
    fonts to scripts, probably based on the Unicode blocks.  The
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 3f43b1b..a572fc7 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -667,7 +667,7 @@ reason.
 
 @defun ask-user-about-supersession-threat filename
 This function is used to ask a user how to proceed after an attempt to
-modify an buffer visiting file @var{filename} when the file is newer
+modify a buffer visiting file @var{filename} when the file is newer
 than the buffer text.  Emacs detects this because the modification
 time of the file on disk is newer than the last save-time and its contents
 have changed.
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 318bb44..26135b8 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -1449,7 +1449,7 @@ all those email addresses?
 
 @subsubheading Answer
 
-There's an very basic solution for this, mail aliases.
+There's a very basic solution for this, mail aliases.
 You can store your mail addresses in a ~/.mailrc file using a simple
 alias syntax:
 
diff --git a/etc/CALC-NEWS b/etc/CALC-NEWS
index 394894a..04baf41 100644
--- a/etc/CALC-NEWS
+++ b/etc/CALC-NEWS
@@ -70,7 +70,7 @@ For changes in Emacs 23.1 and later, see the main Emacs NEWS 
file.
 
 * Version 2.02d:
 
-** Fixed a minor installation problem with a Emacs 19.29 byte-compiler bug.
+** Fixed a minor installation problem with an Emacs 19.29 byte-compiler bug.
 
 ** Removed archaic "macedit" package (superseded by "edmacro").
 
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index 221078a..23bb944 100644
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -84,7 +84,7 @@ whether it is possible to deduce the tag name from the 
pattern, and make
 an unnamed tag in those cases.  The name deduced from the pattern of an
 unnamed tag is the implicit name of that tag.
   When the user looks for a tag, and Emacs finds no explicit tag names
-that match it, Emacs then looks for an tag whose implicit tag name
+that match it, Emacs then looks for a tag whose implicit tag name
 matches the request.  etags.c uses implicit tag names when possible, in
 order to reduce the size of the tags file.
   An implicit tag name is deduced from the pattern by discarding the
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 3391d3e..31e640f 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -4130,17 +4130,16 @@ is an alternative to using the keymap itself.
 ** Changes in invisibility features
 
 *** Isearch can now temporarily show parts of the buffer which are
-hidden by an overlay with a invisible property, when the search match
+hidden by an overlay with an invisible property, when the search match
 is inside that portion of the buffer.  To enable this the overlay
-should have a isearch-open-invisible property which is a function that
-would be called having the overlay as an argument, the function should
-make the overlay visible.
+should have an isearch-open-invisible property, which is a function that
+would be called with the overlay as an argument, and should make it visible.
 
 During incremental search the overlays are shown by modifying the
-invisible and intangible properties, if beside this more actions are
-needed the overlay should have a isearch-open-invisible-temporary
-which is a function. The function is called with 2 arguments: one is
-the overlay and the second is nil when it should show the overlay and
+invisible and intangible properties.  If more actions are
+needed, the overlay should have an isearch-open-invisible-temporary property,
+which is a function.  The function is called with 2 arguments: one is
+the overlay, and the second is nil when it should show the overlay and
 t when it should hide it.
 
 *** add-to-invisibility-spec, remove-from-invisibility-spec
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 04bde7e..ea4f421 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -4348,7 +4348,7 @@ integer.  This is a required property.
 `:pt-height HEIGHT'
 
 HEIGHT specifies the height of the image in pt (1/72 inch).  HEIGHT
-must be a integer.  This is an required property.
+must be an integer.  This is a required property.
 
 `:bounding-box BOX'
 
@@ -4868,7 +4868,7 @@ temporarily to nil, for example
      (enlarge-window 10))
 
 Likewise, an attempt to split a fixed-height window vertically,
-or a fixed-width window horizontally results in a error.
+or a fixed-width window horizontally results in an error.
 
 ** The cursor-type frame parameter is now supported on MS-DOS
 terminals.  When Emacs starts, it by default changes the cursor shape
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index c1009fc..26054d2 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -4895,7 +4895,7 @@ described above and specifies the total height of the 
line, causing a
 varying number of pixels to be inserted after the line to make it line
 exactly that many pixels high.
 
-If the `line-spacing' property value is an positive integer, the value
+If the `line-spacing' property value is a positive integer, the value
 is used as additional pixels to insert after the display line; this
 overrides the default frame `line-spacing' and any buffer local value of
 the `line-spacing' variable.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index e7e60be..12eab44 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -148,7 +148,7 @@ directories in published site-maps.
 **** Scheme: support for tables
 **** Scheme: new variable: ~org-babel-scheme-null-to~
 
-This new custom option allows to use a empty list or null symbol to
+This new custom option allows you to use an empty list or null symbol to
 format the table output, initially assigned to ~hlines~.
 
 **** Scheme: new header ~:prologue~
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 70e6bdf..c1c8e19 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -631,7 +631,7 @@ Todo mode revisit this file or, with option
 file was last visited.
 
 If you call this command before you have created any todo file in
-the current format, and you have an todo file in old format, it
+the current format, and you have a todo file in old format, it
 will ask you whether to convert that file and show it.
 Otherwise, calling this command before any todo file exists
 prompts for a file name and an initial category (defaulting to
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 2162df4..1abf785 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -121,7 +121,7 @@ See `semantic-analyze-scoped-tags' for details.")
           :type buffer
           :documentation "The buffer this context is derived from.")
    (errors :initarg :errors
-          :documentation "Any errors thrown an caught during analysis.")
+          :documentation "Any errors thrown and caught during analysis.")
    )
   "Base analysis data for any context.")
 
diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index 6f1bde0..640884d 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -67,7 +67,7 @@ For mode authors, use
 `defcustom-mode-local-semantic-dependency-system-include-path'
 to create a mode-specific variable to control this.
 
-When searching for a file associated with a name found in an tag of
+When searching for a file associated with a name found in a tag of
 class include, this path will be inspected for includes of type
 `system'.  Some include tags are agnostic to this setting and will
 check both the project and system directories.")
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index 3a8b0c7..81dfc05 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -408,7 +408,7 @@ TYPE name does not exist.  Otherwise signal an error."
 SPECS must be a list of (TYPE . TOKENS) elements, where:
 
   TYPE is the name of the type symbol to define.
-  TOKENS is an list of (TOKSYM . MATCHER) elements, where:
+  TOKENS is a list of (TOKSYM . MATCHER) elements, where:
 
     TOKSYM is any lexical token symbol.
     MATCHER is a string or regexp a text must match to be a such
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 853e9cb..c565022 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1766,7 +1766,7 @@ with PKG-DESC entry removed."
   "Return a list of dependencies for PACKAGE sorted by dependency.
 PACKAGE is included as the first element of the returned list.
 ONLY is an alist associating package names to package objects.
-Only these packages will be in the return value an their cdrs are
+Only these packages will be in the return value and their cdrs are
 destructively set to nil in ONLY."
   (let ((out))
     (dolist (dep (package-desc-reqs package))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6f28569..29d3bc5 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1835,7 +1835,7 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords 
are used for
                               (eval keywords)))))
 
 (defun font-lock-value-in-major-mode (values)
-  "If VALUES is an list, use `major-mode' as a key and return the `assq' value.
+  "If VALUES is a list, use `major-mode' as a key and return the `assq' value.
 VALUES should then be an alist on the form ((MAJOR-MODE . VALUE) ...) where
 MAJOR-MODE may be t.
 If VALUES isn't a list, return VALUES."
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index ce3ead3..d2bc87c 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -284,7 +284,7 @@
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-display-hook nil
-  "A hook called after an deuglified article has been prepared.
+  "A hook called after a deuglified article has been prepared.
 It is run after `gnus-article-prepare-hook'."
   :version "22.1"
   :type 'hook
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index d265fd5..0bac2cb1 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -365,7 +365,7 @@ category."))
     (unless (or group topic)
       (error "No group on current line"))
     (when (and group topic)
-      (error "Both a group an topic on current line"))
+      (error "Both a group and topic on current line"))
     (unless (or topic (setq info (gnus-get-info group)))
       (error "Killed group; can't be edited"))
     ;; Ready.
diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el
index e611e96..a6e65c3 100644
--- a/lisp/image/gravatar.el
+++ b/lisp/image/gravatar.el
@@ -60,11 +60,11 @@
   "Base URL for getting gravatars.")
 
 (defun gravatar-hash (mail-address)
-  "Create an hash from MAIL-ADDRESS."
+  "Create a hash from MAIL-ADDRESS."
   (md5 (downcase mail-address)))
 
 (defun gravatar-build-url (mail-address)
-  "Return an URL to retrieve MAIL-ADDRESS gravatar."
+  "Return a URL to retrieve MAIL-ADDRESS gravatar."
   (format "%s/%s?d=404&r=%s&s=%d"
           gravatar-base-url
           (gravatar-hash mail-address)
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 9fbc882..f0694b7 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -92,7 +92,7 @@ replaced with the file.
 MIME-TYPE is a regular expression being matched against the
 actual MIME type.  It is implicitly surrounded with ^ and $.
 
-TEST is an lisp form which is evaluated in order to test if the
+TEST is a lisp form which is evaluated in order to test if the
 entry should be chosen.  The `test' entry is optional.
 
 When selecting a viewer for a given MIME type, the first viewer
@@ -555,7 +555,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 
1524, plus
 (defun mailcap-mailcap-entry-passes-test (info)
   "Replace the test clause of INFO itself with a boolean for some cases.
 This function supports only `test -n $DISPLAY' and `test -z $DISPLAY',
-replaces them with t or nil.  As for others or if INFO has a interactive
+replaces them with t or nil.  As for others or if INFO has an interactive
 spec (needsterm, needsterminal, or needsx11) but DISPLAY is not set,
 the test clause will be unchanged."
   (let ((test (assq 'test info))       ; The test clause
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index f491a6c..4ed5dd4 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -37,7 +37,7 @@
 (declare-function org-trim "org" (s &optional keep-lead))
 
 (defvar org-babel-default-header-args:calc nil
-  "Default arguments for evaluating an calc source block.")
+  "Default arguments for evaluating a calc source block.")
 
 (defun org-babel-expand-body:calc (body _params)
   "Expand BODY according to PARAMS, return the expanded body." body)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 9bc1f0c..4c5fcc6 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1394,7 +1394,7 @@ the default behavior."
 ;;;###autoload
 (defun org-clock-in-last (&optional arg)
   "Clock in the last closed clocked item.
-When already clocking in, send an warning.
+When already clocking in, send a warning.
 With a universal prefix argument, select the task you want to
 clock in from the last clocked in tasks.
 With two universal prefix arguments, start clocking using the
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index e0c5166..cdee568 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -600,8 +600,7 @@ allow document of a given class (irrespective of its source
 format) to be converted to any of the export formats associated
 with that class.
 
-See default setting of this variable for an typical
-configuration."
+See default setting of this variable for a typical configuration."
   :group 'org-export-odt
   :version "24.1"
   :type
@@ -1938,7 +1937,7 @@ holding contextual information."
 
 (defun org-odt-format-inlinetask-default-function
   (todo todo-type priority name tags contents)
-  "Default format function for a inlinetasks.
+  "Default format function for inlinetasks.
 See `org-odt-format-inlinetask-function' for details."
   (format "\n<text:p text:style-name=\"%s\">%s</text:p>"
          "Text_20_body"
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index c9e1cf2..e039020 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -3295,7 +3295,7 @@ comment at the start of cc-engine.el for more info."
                             (point)
                           here)))
        pa+1                  ; pos just after an opening PAren (or brace).
-       (ren+1 from)          ; usually a pos just after an closing paREN etc.
+       (ren+1 from)          ; usually a pos just after a closing paREN etc.
                              ; Is actually the pos. to scan for a (/{/[ from,
                              ; which sometimes is after a silly )/}/].
        paren+1               ; Pos after some opening or closing paren.
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index ae212bd..d20c579 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2774,7 +2774,7 @@ local variable."
 
     ;; Our start must be between them
     (goto-char last)
-    ;; Find an beginning-of-stmt that's not in a comment
+    ;; Find a beginning-of-stmt that's not in a comment
     (while (and (re-search-forward regexp next t 1)
                 (nth 7 (syntax-ppss)))
       (goto-char (match-end 0)))
diff --git a/lisp/term/README b/lisp/term/README
index d5453e1..4ab1a43 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -60,7 +60,7 @@ they'll frustrate you after you've forgotten about them.
    For another, the X keysyms provide a standard set of names that Emacs knows
 about.  It tries to bind many of them to useful things at startup, before your
 .emacs is read (so you can override them).  In some ways, the X keysym standard
-is a admittedly poor one; it's incomplete, and not well matched to the set of
+is an admittedly poor one; it's incomplete, and not well matched to the set of
 'virtual keys' that UNIX terminfo(3) provides.  But, trust us, the alternatives
 were worse.
 
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 353d435..5568bbb 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1732,7 +1732,7 @@ FLYSPELL-BUFFER."
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-properties-at-p ...                                     */
 ;;*    -------------------------------------------------------------    */
-;;*    Is there an highlight properties at position pos?                */
+;;*    Is there a highlight property at position pos?                   */
 ;;*---------------------------------------------------------------------*/
 (defun flyspell-properties-at-p (pos)
   "Return t if there is a text property at POS, not counting `local-map'.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 8828236..bee7f80 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1229,7 +1229,7 @@ When not inside a field, signal an error."
                               (save-restriction
                                 ;; `widget-narrow-to-field' can be
                                 ;; active when this function is called
-                                ;; from an change-functions hook. So
+                                ;; from a change-functions hook. So
                                 ;; temporarily remove field narrowing
                                 ;; before to call `get-char-property'.
                                 (widen)
@@ -1802,7 +1802,7 @@ If END is omitted, it defaults to the length of LIST."
 ;;; The `url-link' Widget.
 
 (define-widget 'url-link 'link
-  "A link to an www page."
+  "A link to a web page."
   :action 'widget-url-link-action)
 
 (defun widget-url-link-action (widget &optional _event)
diff --git a/src/.gdbinit b/src/.gdbinit
index db7185b..cc06b2e 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -564,7 +564,7 @@ define pgi
 end
 document pgi
 Pretty print glyph structure glyph[I].
-Takes one argument, a integer I.
+Takes one argument, an integer I.
 end
 
 define pgn
diff --git a/src/coding.c b/src/coding.c
index 582b926..e756ba1 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3980,7 +3980,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
       /* Reset the invocation and designation status to the safest
         one; i.e. designate ASCII to the graphic register 0, and
         invoke that register to the graphic plane 0.  This typically
-        helps the case that an designation sequence for ASCII "ESC (
+        helps the case that a designation sequence for ASCII "ESC (
         B" is somehow broken (e.g. broken by a newline).  */
       CODING_ISO_INVOCATION (coding, 0) = 0;
       CODING_ISO_DESIGNATION (coding, 0) = charset_ascii;
diff --git a/src/process.c b/src/process.c
index c561d01..bccc3ac 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3724,7 +3724,7 @@ setting of the remote datagram address.  When specified 
for a client
 process, the FAMILY, HOST, and SERVICE args are ignored.
 
 The format of ADDRESS depends on the address family:
-- An IPv4 address is represented as an vector of integers [A B C D P]
+- An IPv4 address is represented as a vector of integers [A B C D P]
 corresponding to numeric IP address A.B.C.D and port number P.
 - A local address is represented as a string with the address in the
 local address space.
diff --git a/src/xsettings.c b/src/xsettings.c
index ac2d86f..81c8f9b 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -53,7 +53,7 @@ static char *current_font;
 static struct x_display_info *first_dpyinfo;
 static Lisp_Object current_tool_bar_style;
 
-/* Store an config changed event in to the event queue.  */
+/* Store a config changed event in to the event queue.  */
 
 static void
 store_config_changed_event (Lisp_Object arg, Lisp_Object display_name)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]