From 35e5c57db311c3d6c1c3a8dd4edc3d756d1d5d24 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 16 Feb 2018 14:11:51 -0500 Subject: [PATCH 1/3] ; Fix doc typos related to indefinite articles --- doc/emacs/rmail.texi | 2 +- doc/lispintro/emacs-lisp-intro.texi | 4 ++-- doc/lispref/package.texi | 2 +- doc/lispref/text.texi | 2 +- doc/lispref/windows.texi | 2 +- doc/misc/autotype.texi | 2 +- doc/misc/cc-mode.texi | 2 +- doc/misc/efaq.texi | 4 ++-- doc/misc/eshell.texi | 2 +- doc/misc/gnus-faq.texi | 6 +++--- doc/misc/org.texi | 2 +- doc/misc/sc.texi | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 09cb034e372..e9371f39a96 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1585,7 +1585,7 @@ use it, add the @samp{--tls} flag to @code{rmail-movemail-flags}. If your incoming mail is stored on a local machine in a format other than Unix mailbox, you will need the Mailutils @command{movemail} to retrieve it. @xref{Movemail}, for the detailed description of -@command{movemail} versions. For example, to access mail from a inbox in +@command{movemail} versions. For example, to access mail from an inbox in @code{maildir} format located in @file{/var/spool/mail/in}, you would include the following in the Rmail inbox list: diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index ab9144f61eb..770478ddf91 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -11799,7 +11799,7 @@ Uses recursion." @end group @end smallexample -What happens when we call this function with a argument of 7? +What happens when we call this function with an argument of 7? The first instance of the @code{triangle-recursively} function adds the number 7 to the value returned by a second instance of @@ -20821,7 +20821,7 @@ The function @code{1+} which adds one to its argument, is executed on Contrast this with @code{apply}, which applies its first argument to all the remaining. -(@xref{Readying a Graph, , Readying a Graph}, for a explanation of +(@xref{Readying a Graph, , Readying a Graph}, for an explanation of @code{apply}.) @need 1250 diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index 21dfe1c2717..c1c61a1b5c6 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -191,7 +191,7 @@ standard keyword from the @code{finder-known-keywords} list. as explained in @ref{Packaging Basics}. In the above example, a magic comment autoloads @code{superfrobnicator-mode}. - @xref{Package Archives}, for a explanation of how to add a + @xref{Package Archives}, for an explanation of how to add a single-file package to a package archive. @node Multi-file Packages diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index a004952c37c..f45b81c983b 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -2980,7 +2980,7 @@ optional argument @var{append} is non-@code{nil}, @var{face} is appended to the end of the list instead. Note that in a face list, the first occurring value for each attribute takes precedence. -For example, the following code would assign a italicized green face +For example, the following code would assign an italicized green face to the text between @var{start} and @var{end}: @example diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 5ab6d6ee6a4..687d5971920 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -862,7 +862,7 @@ If the optional argument @var{pixelwise} is non-@code{nil}, A positive @var{delta} moves the edge downwards or to the right; a negative @var{delta} moves it upwards or to the left. If the edge cannot be moved as far as specified by @var{delta}, this function -moves it as far as possible but does not signal a error. +moves it as far as possible but does not signal an error. This function tries to resize windows adjacent to the edge that is moved. If this is not possible for some reason (e.g., if that adjacent diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 026c57126d2..3d61d24fa9d 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -243,7 +243,7 @@ Interesting point. When wrapping skeletons around successive regions, they are put at these places. Point is left at first @code{_} where nothing is wrapped. @item @code{>} Indent line according to major mode. When following element is @code{_}, and -there is a interregion that will be wrapped here, indent that interregion. +there is an interregion that will be wrapped here, indent that interregion. @item @code{&} Logical and. If preceding element moved point, i.e., usually inserted something, do following element. diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 0132ab1775c..2de56fa05c0 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -2408,7 +2408,7 @@ could achieve this with code like this in your @file{.emacs}: @end group @end example -In a programming team, a hook is a also a good place for each member +In a programming team, a hook is also a good place for each member to put his own personal preferences. For example, you might be the only person in your team who likes Auto-newline minor mode. You could have it enabled by default by placing the following in your diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 8014c2b71f5..1e448223380 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -753,7 +753,7 @@ privileges, you have several options: Info files don't actually need to be installed before being used. You can use a prefix argument for the @code{info} command and specify the name of the Info file in the minibuffer. This goes to the node -named @samp{Top} in that file. For example, to view a Info file named +named @samp{Top} in that file. For example, to view an Info file named @file{@var{info-file}} in your home directory, you can type this: @example @@ -3389,7 +3389,7 @@ version of Emacs, and see @ref{Current GNU distributions}, for a list of archive sites that make GNU software available. @node Finding a package with particular functionality -@section How do I find a Emacs Lisp package that does XXX? +@section How do I find an Emacs Lisp package that does XXX? @cindex Package, finding @cindex Finding an Emacs Lisp package @cindex Functionality, finding a particular package diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 43f8cd63811..1789767dbe2 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -1022,7 +1022,7 @@ So that the user can enter @samp{info chmod}, for example. @item Create a mode @code{eshell-browse} -It would treat the Eshell buffer as a outline. Collapsing the outline +It would treat the Eshell buffer as an outline. Collapsing the outline hides all of the output text. Collapsing again would show only the first command run in each directory diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 14c0117191e..318bb4474d8 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -441,7 +441,7 @@ machine news.yourprovider.net login YourUserName password YourPassword @noindent . Make sure that the file isn't readable to others if you -work on a OS which is capable of doing so. (Under Unix +work on an OS which is capable of doing so. (Under Unix say @example chmod 600 ~/.authinfo @@ -2012,7 +2012,7 @@ server by typing @samp{J a}. If you make a mistake, or change your mind, you can undo this action by typing @samp{J r}. When you're done, type 'q' to return to the group buffer. -Now the next time you enter a group on a agentized +Now the next time you enter a group on an agentized server, the headers will be stored on disk and read from there the next time you enter the group. @@ -2293,7 +2293,7 @@ When the term Emacs is used in this FAQ, it means either GNU Emacs or XEmacs. @item Message -In this FAQ message means a either a mail or a posting to a +In this FAQ message means either a mail or a posting to a Usenet Newsgroup or to some other fancy back end, no matter of which kind it is. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 6d152970fe2..b187bfcdbc6 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -12991,7 +12991,7 @@ of these examples works: @subsubheading Embedding clickable images For clickable images, provide a link whose description is another link to an -image file. For example, to embed a image @file{org-mode-unicorn.png} which +image file. For example, to embed an image @file{org-mode-unicorn.png} which when clicked jumps to @uref{http://Orgmode.org} website, do the following @example diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index d8faad9099f..f214152b5f4 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -1340,7 +1340,7 @@ currently part of Supercite, but contributions are welcome! Regi works by interpreting frames with the function @code{regi-interpret}. A frame is a list of arbitrary size where each -element is a entry of the following form: +element is an entry of the following form: @example (@var{pred} @var{func} [@var{negate-p} [@var{case-fold-search}]]) @@ -1709,7 +1709,7 @@ of information from the info alist. @item @code{sc-mail-field-query} (@kbd{C-c C-p f}) Allows you to interactively view, modify, add, and delete info alist key-value pairs. With no argument, you are prompted (with completion) -for a info key. The value associated with that key is displayed in the +for an info key. The value associated with that key is displayed in the minibuffer. With an argument, this command will first ask if you want to view, modify, add, or delete an info key. Viewing is identical to running the command with no arguments. From 66a4e651f3cf38c320d1a9d5ae6f88dcc641792b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 16 Feb 2018 15:16:15 -0500 Subject: [PATCH 2/3] ; Fix doc typos related to indefinite articles --- lisp/calendar/holidays.el | 2 +- lisp/cedet/ede/cpp-root.el | 2 +- lisp/cedet/ede/files.el | 2 +- lisp/cedet/semantic/util-modes.el | 2 +- lisp/cedet/srecode/el.el | 2 +- lisp/cus-edit.el | 2 +- lisp/emacs-lisp/edebug.el | 2 +- lisp/emacs-lisp/ewoc.el | 2 +- lisp/epa.el | 2 +- lisp/eshell/esh-cmd.el | 2 +- lisp/eshell/esh-proc.el | 2 +- lisp/faces.el | 2 +- lisp/ffap.el | 2 +- lisp/filenotify.el | 2 +- lisp/gnus/gnus-agent.el | 2 +- lisp/gnus/gnus-cache.el | 2 +- lisp/gnus/gnus-fun.el | 2 +- lisp/gnus/gnus.el | 6 +++--- lisp/hexl.el | 2 +- lisp/htmlfontify.el | 2 +- lisp/international/fontset.el | 2 +- lisp/mail/rmailedit.el | 2 +- lisp/mh-e/mh-e.el | 2 +- lisp/mh-e/mh-mime.el | 2 +- lisp/mh-e/mh-search.el | 6 +++--- lisp/net/gnutls.el | 2 +- lisp/nxml/xsd-regexp.el | 6 +++--- lisp/org/ob-core.el | 6 +++--- lisp/org/ob-org.el | 2 +- lisp/org/ob-picolisp.el | 2 +- lisp/org/org-eww.el | 6 +++--- lisp/org/org-protocol.el | 2 +- lisp/org/ox-html.el | 2 +- lisp/org/ox-latex.el | 2 +- lisp/org/ox-texinfo.el | 2 +- lisp/progmodes/ada-mode.el | 2 +- lisp/progmodes/ada-stmt.el | 4 ++-- lisp/progmodes/antlr-mode.el | 2 +- lisp/progmodes/cc-engine.el | 2 +- lisp/progmodes/cc-menus.el | 2 +- lisp/progmodes/cc-mode.el | 2 +- lisp/progmodes/compile.el | 2 +- lisp/progmodes/icon.el | 2 +- lisp/progmodes/python.el | 6 +++--- lisp/progmodes/sh-script.el | 2 +- lisp/progmodes/sql.el | 2 +- lisp/progmodes/vhdl-mode.el | 2 +- lisp/tempo.el | 2 +- lisp/textmodes/artist.el | 28 ++++++++++++++-------------- lisp/textmodes/reftex-vars.el | 2 +- lisp/textmodes/rst.el | 12 ++++++------ lisp/thumbs.el | 2 +- lisp/vc/vc-git.el | 2 +- 53 files changed, 84 insertions(+), 84 deletions(-) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 8e2a6c96551..4ba49a9acb1 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -399,7 +399,7 @@ use instead of point." (defun holidays (&optional arg) "Display the holidays for last month, this month, and next month. If called with an optional prefix argument ARG, prompts for month and year. -This function is suitable for execution in a init file." +This function is suitable for execution in an init file." (interactive "P") (save-excursion (let* ((completion-ignore-case t) diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index 76afe9b9bfd..bcefb4e340c 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -137,7 +137,7 @@ ;; Need a way to reconfigure a project, and have it affect all open buffers. ;; From Tobias Gerdin: ;; -;; >>3) Is there any way to refresh a ede-cpp-root-project dynamically? I have +;; >>3) Is there any way to refresh an ede-cpp-root-project dynamically? I have ;; >>some file open part of the project, fiddle with the include paths and would ;; >>like the open buffer to notice this when I re-evaluate the ;; >>ede-cpp-root-project constructor. diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 36ec7a1d894..c95402e365d 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -25,7 +25,7 @@ ;; ;; Basic Model: ;; -;; A directory belongs to a project if a ede-project-autoload structure +;; A directory belongs to a project if an ede-project-autoload structure ;; matches your directory. ;; ;; A toplevel project is one where there is no active project above diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 6374a0cb089..54c9578773a 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -782,7 +782,7 @@ If there is no function, disable the header line." (goto-char (semantic-tag-start tag)) ;; Klaus Berndl : ;; goto the tag name; this is especially needed for languages - ;; like c++ where a often used style is like: + ;; like c++ where an often used style is like: ;; void ;; ClassX::methodM(arg1...) ;; { diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el index f5f1265ccda..ff9e1d53f91 100644 --- a/lisp/cedet/srecode/el.el +++ b/lisp/cedet/srecode/el.el @@ -24,7 +24,7 @@ ;; Emacs Lisp specific handlers. To use these handlers in your ;; template, add the :name part to your template argument list. ;; -;; Error if not in a Emacs Lisp mode +;; Error if not in an Emacs Lisp mode ;;; Code: diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 878256a696e..3ede483dade 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1192,7 +1192,7 @@ For example, the MH-E package updates this alist as follows: The value of PACKAGE needs to be unique and it needs to match the PACKAGE value appearing in the :package-version keyword. Since -the user might see the value in a error message, a good choice is +the user might see the value in an error message, a good choice is the official name of the package, such as MH-E or Gnus.") ;;;###autoload diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 08e2b978ec7..7e4d244f5e2 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -641,7 +641,7 @@ list of a symbol.") (defun edebug-form-data-symbol () "Return the edebug data symbol of the form where point is in. -If point is not inside a edebuggable form, cause error." +If point is not inside an edebuggable form, signal an error." (or (edebug--form-data-name (edebug-get-form-data-entry (point))) (error "Not inside instrumented form"))) diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index b88a1a5097c..262d4d85941 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -411,7 +411,7 @@ If the EWOC is empty, nil is returned." ((>= pos (ewoc--node-start-marker (ewoc--node-nth dll -2))) (ewoc--node-nth dll -2)) - ;; We now know that pos is within a elem. + ;; We now know that pos is within an elem. (t ;; Make an educated guess about which of the three known ;; node'es (the first, the last, or GUESS) is nearest. diff --git a/lisp/epa.el b/lisp/epa.el index 7878340fcd4..a84e4f2b854 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -267,7 +267,7 @@ You should bind this variable with `let', but do not set it globally.") (defvar epa-exit-buffer-function #'quit-window) (define-widget 'epa-key 'push-button - "Button for representing a epg-key object." + "Button for representing an epg-key object." :format "%[%v%]" :button-face-get 'epa--key-widget-button-face-get :value-create 'epa--key-widget-value-create diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index ddab3350493..61c0ebc71d0 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -80,7 +80,7 @@ ;; ;; echo x$(+ 1 2) "String $(+ 1 2)" ;; -;; To pass a Lisp symbol as a argument, use the alternate quoting +;; To pass a Lisp symbol as an argument, use the alternate quoting ;; syntax, since the single quote character is far too overused in ;; shell syntax: ;; diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 841a95006f1..59fb9b926d4 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -87,7 +87,7 @@ variable's value to take effect." "Called each time a process is exec'd by `eshell-gather-process-output'. It is passed one argument, which is the process that was just started. It is useful for things that must be done each time a process is -executed in a eshell mode buffer (e.g., `process-kill-without-query'). +executed in an eshell mode buffer (e.g., `process-kill-without-query'). In contrast, `eshell-mode-hook' is only executed once when the buffer is created." :type 'hook diff --git a/lisp/faces.el b/lisp/faces.el index 0fe839d620e..18b821a0b69 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -698,7 +698,7 @@ Otherwise, VALUE must be a property list of the form: `(:color COLOR :style STYLE)'. -COLOR can be a either a color name string or `foreground-color'. +COLOR can be either a color name string or `foreground-color'. STYLE can be either `line' or `wave'. If a keyword/value pair is missing from the property list, a default value will be used for the value. diff --git a/lisp/ffap.el b/lisp/ffap.el index d584692533a..4e479d1b82b 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1081,7 +1081,7 @@ If a given RFC isn't in these then `ffap-rfc-path' is offered." ;; * strip trailing "@" and ":" ;; * no commas (good for latex) (file "--:\\\\${}+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:") - ;; An url, or maybe a email/news message-id: + ;; An url, or maybe an email/news message-id: (url "--:=&?$+@-Z_[:alpha:]~#,%;*()!'" "^[0-9a-zA-Z]" ":;.,!?") ;; Find a string that does *not* contain a colon: (nocolon "--9$+<>@-Z_[:alpha:]~" "<@" "@>;.,!?") diff --git a/lisp/filenotify.el b/lisp/filenotify.el index 562ac266e44..986dc093bc9 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -420,7 +420,7 @@ DESCRIPTOR should be an object returned by `file-notify-add-watch'." ;; TODO: ;; * Watching a /dir/file may receive events for dir. ;; (This may be the desired behaviour.) -;; * Watching a file in a already watched directory +;; * Watching a file in an already watched directory ;; If the file is created and *then* a watch is added to that file, the ;; watch might receive events which occurred prior to it being created, ;; due to the way events are propagated during idle time. Note: This diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 5dd4eaab9a5..b2de1196439 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -451,7 +451,7 @@ manipulated as follows: (defvar gnus-agent-mode-status '(gnus-agent-mode " Plugged")) (defun gnus-agent-mode () - "Minor mode for providing a agent support in Gnus buffers." + "Minor mode for providing agent support in Gnus buffers." (let* ((buffer (progn (string-match "^gnus-\\(.*\\)-mode$" (symbol-name major-mode)) (match-string 1 (symbol-name major-mode)))) diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el index c5a2575b9ad..c3e77ca59b0 100644 --- a/lisp/gnus/gnus-cache.el +++ b/lisp/gnus/gnus-cache.el @@ -443,7 +443,7 @@ A group name is decoded according to decoded again according to `nnmail-pathname-coding-system', `file-name-coding-system', or `default-file-name-coding-system'. -It is used when asking for a original group name from a cache +It is used when asking for an original group name from a cache directory name, in which non-ASCII characters might have been unified into the ones of a certain charset particularly if the `utf-8' coding system for example was used.") diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el index d0557dc7e4d..40c6d511115 100644 --- a/lisp/gnus/gnus-fun.el +++ b/lisp/gnus/gnus-fun.el @@ -66,7 +66,7 @@ (defcustom gnus-convert-image-to-x-face-command "convert -scale 48x48! %s xbm:- | xbm2xface.pl" "Command for converting an image to an X-Face. -The command must take a image filename (use \"%s\") as input. +The command must take an image filename (use \"%s\") as input. The output must be the X-Face header data on stdout." :version "22.1" :group 'gnus-fun diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 1448ba2df39..4af818d9165 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -2629,11 +2629,11 @@ a string, be sure to use a valid format, see RFC 2616." ;; Propagate flags to server, with the following exceptions: ;; `seen' is private to each gnus installation -;; `cache' is a internal gnus flag for each gnus installation -;; `download' is a agent flag private to each gnus installation +;; `cache' is an internal gnus flag for each gnus installation +;; `download' is an agent flag private to each gnus installation ;; `unsend' are for nndraft groups only ;; `score' is not a proper mark -;; `bookmark': don't propagated it, or fix the bug in update-mark. +;; `bookmark': don't propagate it, or fix the bug in update-mark. (defconst gnus-article-unpropagated-mark-lists '(seen cache download unsend score bookmark unexist) "Marks that shouldn't be propagated to back ends. diff --git a/lisp/hexl.el b/lisp/hexl.el index 681a26b6809..d716405f97a 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -890,7 +890,7 @@ This discards the buffer's undo information." (error "Invalid hex digit `%c'" ch))))) (defun hexl-oct-char-to-integer (character) - "Take a char and return its value as if it was a octal digit." + "Take a char and return its value as if it was an octal digit." (if (and (>= character ?0) (<= character ?7)) (- character ?0) (error "Invalid octal digit `%c'" character))) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 82c0a89561d..dfa6bde2972 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1630,7 +1630,7 @@ TEXT-ID marks a unique position within a block. It is set to value of `point' at the current buffer position. TEXT-BEGINS-BLOCK-P is a boolean and is non-nil if the current -span also begins a invisible portion of text. +span also begins an invisible portion of text. An implementation can use TEXT-BLOCK, TEXT-ID, TEXT-BEGINS-BLOCK-P to implement fold/unfold-on-mouse-click like diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 45eabfcb40f..6f912074517 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -823,7 +823,7 @@ '("FreeMono" . "iso10646-1") nil 'prepend) ;; Since standard-fontset-spec on X uses fixed-medium font, which - ;; gets mapped to a iso8859-1 variant, we would like to prefer its + ;; gets mapped to an iso8859-1 variant, we would like to prefer its ;; iso10646-1 variant for symbols, where the coverage is known to be ;; good. (dolist (symbol-subgroup diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el index 623a8291245..91aeb4187db 100644 --- a/lisp/mail/rmailedit.el +++ b/lisp/mail/rmailedit.el @@ -410,7 +410,7 @@ or else nil to insert it at the beginning. DELETED's elements are elements of OLD-HEADERS. CHANGED's elements have the form (OLD . NEW) -where OLD is a element of OLD-HEADERS and NEW is an element of NEW-HEADERS." +where OLD is an element of OLD-HEADERS and NEW is an element of NEW-HEADERS." (let ((reverse-new (reverse new-headers)) inserted deleted changed) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 63d7a2973fb..05ff672da52 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -831,7 +831,7 @@ This assumes that a temporary buffer is set up." (expand-file-name "flists" dir))))))))) (defun mh-file-command-p (file) - "Return t if file FILE is the name of a executable regular file." + "Return t if file FILE is the name of an executable regular file." (and (file-regular-p file) (file-executable-p file))) (defun mh-variant-set-variant (variant) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 967eb869a25..e2c682a3996 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1242,7 +1242,7 @@ MESSAGE number." "message/rfc822" (if (string= "" description) nil description) "inline")) - (t (error "The message number, %s, is not a integer" msg))))) + (t (error "The message number, %s, is not an integer" msg))))) (defun mh-mh-forward-message (&optional description folder messages) "Add tag to forward a message. diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index 3e591c65383..8b8ba964560 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -443,7 +443,7 @@ search all folders." (setq redo-flag t)) ((mh-folder-exists-p new-folder) ;; Folder exists but we don't have it open. That means they are - ;; stale results from a old flists search. Clear it out. + ;; stale results from an old flists search. Clear it out. (mh-exec-cmd-quiet nil "rmf" new-folder))) (setq message (mh-search "+" mh-flists-results-folder redo-flag window-config) @@ -1583,7 +1583,7 @@ If the folder returned doesn't exist then it is created." chosen-name)) (defun mh-index-folder-search-regexp (folder) - "If FOLDER was created by a index search, return the search regexp. + "If FOLDER was created by an index search, return the search regexp. Return nil if FOLDER doesn't exist or the .mhe_index file is garbled." (ignore-errors @@ -1912,7 +1912,7 @@ origin-index) map is updated too." (defun mh-index-update-single-msg (msg checksum origin-map) "Update various maps for one message. -MSG is a index folder message, CHECKSUM its MD5 hash and +MSG is an index folder message, CHECKSUM its MD5 hash and ORIGIN-MAP, if non-nil, a hash table containing which maps each message in the index folder to the folder and message that it was copied from. The function updates the hash tables diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index ea17fb518e2..85c9308c0d2 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -202,7 +202,7 @@ For the meaning of the rest of the parameters, see `gnutls-boot-parameters'." "boot: %s" params) (when (gnutls-errorp ret) - ;; This is a error from the underlying C code. + ;; This is an error from the underlying C code. (signal 'gnutls-error (list process ret))) process)) diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el index f83dad57510..54f56dded37 100644 --- a/lisp/nxml/xsd-regexp.el +++ b/lisp/nxml/xsd-regexp.el @@ -208,7 +208,7 @@ Signal an error if it is not." (nreverse (xsdre-compile-regexp re nil)))) (defun xsdre-compile-regexp (re accum) - "Return a Emacs regular expression for the symbolic regexp RE. + "Return an Emacs regular expression for the symbolic regexp RE. Returns a list of strings whose head is the regexp for RE and whose tail is ACCUM." (cond ((not (consp re)) @@ -271,7 +271,7 @@ and whose tail is ACCUM." (t (xsdre-compile-char-class re accum)))) (defun xsdre-compile-char-class (cc accum) - "Return a Emacs regular expression for the symbolic character class CC. + "Return an Emacs regular expression for the symbolic character class CC. Returns a list of strings whose head is the regexp for CC and whose tail is ACCUM." (cons (if (integerp cc) @@ -450,7 +450,7 @@ LOWER ::= UNICODE UPPER ::= UNICODE SYMBOLIC-CHAR-CLASS ::= SYMBOL -where UNICODE is a integer specifying a Unicode code-point and +where UNICODE is an integer specifying a Unicode code-point and SYMBOLIC-CHAR-CLASS is a symbol which has either a `xsdre-char-class' property whose value is a CHAR-CLASS, or a `xsdre-ranges' property whose value is a range-list." diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index 5f378b2173f..0e2e78a6710 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -363,7 +363,7 @@ a window into the `org-babel-get-src-block-info' function." ;;;###autoload (defun org-babel-expand-src-block-maybe () "Conditionally expand a source block. -Detect if this is context for a org-babel src-block and if so +Detect if this is context for an org-babel src-block and if so then run `org-babel-expand-src-block'." (interactive) (org-babel-when-in-src-block @@ -372,7 +372,7 @@ then run `org-babel-expand-src-block'." ;;;###autoload (defun org-babel-load-in-session-maybe () "Conditionally load a source block in a session. -Detect if this is context for a org-babel src-block and if so +Detect if this is context for an org-babel src-block and if so then run `org-babel-load-in-session'." (interactive) (org-babel-when-in-src-block @@ -383,7 +383,7 @@ then run `org-babel-load-in-session'." ;;;###autoload (defun org-babel-pop-to-session-maybe () "Conditionally pop to a session. -Detect if this is context for a org-babel src-block and if so +Detect if this is context for an org-babel src-block and if so then run `org-babel-switch-to-session'." (interactive) (org-babel-when-in-src-block diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el index e52283848e4..310aaec3f39 100644 --- a/lisp/org/ob-org.el +++ b/lisp/org/ob-org.el @@ -34,7 +34,7 @@ (defvar org-babel-default-header-args:org '((:results . "raw silent") (:exports . "code")) - "Default arguments for evaluating a org source block.") + "Default arguments for evaluating an org source block.") (defvar org-babel-org-default-header "#+TITLE: default empty header\n" diff --git a/lisp/org/ob-picolisp.el b/lisp/org/ob-picolisp.el index b6dc8986f95..fd129b899b2 100644 --- a/lisp/org/ob-picolisp.el +++ b/lisp/org/ob-picolisp.el @@ -35,7 +35,7 @@ ;; (http://picolisp.com/5000/-2.html). PicoLisp is included in some ;; GNU/Linux Distributions, and can be downloaded here: ;; http://software-lab.de/down.html. It ships with a picolisp-mode and -;; a inferior-picolisp-mode for Emacs (to be found in the /lib/el/ +;; an inferior-picolisp-mode for Emacs (to be found in the /lib/el/ ;; directory). ;; Although it might seem more natural to use Emacs Lisp for most diff --git a/lisp/org/org-eww.el b/lisp/org/org-eww.el index 0792c87a6a4..3d9dddcac03 100644 --- a/lisp/org/org-eww.el +++ b/lisp/org/org-eww.el @@ -25,9 +25,9 @@ ;;; Commentary: ;; When this module is active `org-store-link' (often on key C-c l) in -;; a eww buffer stores a link to the current url of the eww buffer. +;; an EWW buffer stores a link to the current url of the eww buffer. -;; In an eww buffer function `org-eww-copy-for-org-mode' kills either +;; In an EWW buffer function `org-eww-copy-for-org-mode' kills either ;; a region or the whole buffer if no region is set and transforms the ;; text on the fly so that it can be pasted into an Org buffer with ;; hot links. @@ -58,7 +58,7 @@ ;; Store Org-link in eww-mode buffer (org-link-set-parameters "eww" :follow #'eww :store #'org-eww-store-link) (defun org-eww-store-link () - "Store a link to the url of a Eww buffer." + "Store a link to the url of an EWW buffer." (when (eq major-mode 'eww-mode) (org-store-link-props :type "eww" diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index 3cbbc78dce5..27c2bb28d0f 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -663,7 +663,7 @@ to deal with new-style links.") ;;; Org specific functions: (defun org-protocol-create-for-org () - "Create a Org protocol project for the current file's project. + "Create an Org protocol project for the current file's project. The visited file needs to be part of a publishing project in `org-publish-project-alist' for this to work. The function delegates most of the work to `org-protocol-create'." diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el index 06edb821e1a..83f6479bd4a 100644 --- a/lisp/org/ox-html.el +++ b/lisp/org/ox-html.el @@ -2697,7 +2697,7 @@ holding contextual information." (defun org-html-format-inlinetask-default-function (todo todo-type priority text tags contents info) - "Default format function for a inlinetasks. + "Default format function for inlinetasks. See `org-html-format-inlinetask-function' for details." (format "
\n%s%s\n%s
" (org-html-format-headline-default-function diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index a656e065b94..c32aa298047 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -2125,7 +2125,7 @@ holding contextual information." (defun org-latex-format-inlinetask-default-function (todo _todo-type priority title tags contents _info) - "Default format function for a inlinetasks. + "Default format function for inlinetasks. See `org-latex-format-inlinetask-function' for details." (let ((full-title (concat (when todo (format "\\textbf{\\textsf{\\textsc{%s}}} " todo)) diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el index fd4235a79df..d877c9c63a2 100644 --- a/lisp/org/ox-texinfo.el +++ b/lisp/org/ox-texinfo.el @@ -958,7 +958,7 @@ holding contextual information." (defun org-texinfo-format-inlinetask-default-function (todo _todo-type priority title tags contents) - "Default format function for a inlinetasks. + "Default format function for inlinetasks. See `org-texinfo-format-inlinetask-function' for details." (let ((full-title (concat (when todo (format "@strong{%s} " todo)) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index d09ee52c97b..2d3f6e22a6c 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -2479,7 +2479,7 @@ and the offset." (forward-word-strictly -1)) ;; If there is a parameter list, and we have a function declaration - ;; or a access to subprogram declaration + ;; or access to subprogram declaration (let ((num-back 1)) (if (and (= (following-char) ?\() (save-excursion diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el index 02f7e3954ec..f1ed01e3cc7 100644 --- a/lisp/progmodes/ada-stmt.el +++ b/lisp/progmodes/ada-stmt.el @@ -415,13 +415,13 @@ Invoke right after `ada-function-spec' or `ada-procedure-spec'." (define-skeleton ada-entry-family-prompt-discriminant - "Insert a entry specification, prompting for the entry name." + "Insert an entry specification, prompting for the entry name." "[discriminant name]: " str) (define-skeleton ada-entry-family - "Insert a entry specification, prompting for the entry name." + "Insert an entry specification, prompting for the entry name." "[entry name]: " "entry " str " (" (ada-entry-family-prompt-discriminant) ")" diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 921db6b46d8..1d4fd4f2bce 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -1562,7 +1562,7 @@ The search for a correct position is as follows: * If search is within an area where options can be inserted, use the position of point. Inside the options section and if point is in - the middle of a option definition, skip the rest of it. + the middle of an option definition, skip the rest of it. * If an options section already exists, insert the options at the end. If only the beginning of the area is visible, insert at the beginning. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index ed8dc6de239..c9e1cf2427d 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -10327,7 +10327,7 @@ comment at the start of cc-engine.el for more info." b-pos))) (defun c-backward-typed-enum-colon () - ;; We're at a "{" which might be the opening brace of a enum which is + ;; We're at a "{" which might be the opening brace of an enum which is ;; strongly typed (by a ":" followed by a type). If this is the case, leave ;; point before the colon and return t. Otherwise leave point unchanged and return nil. ;; Match data will be clobbered. diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index ae7759ef451..a42fe27b96c 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -360,7 +360,7 @@ Example: (setq char (aref method p) p (1+ p)) (cond - ;; Is CHAR part of a objc token? + ;; Is CHAR part of an objc token? ((and (not inargvar) ; Ignore if CHAR is part of an argument variable. (eq 0 betweenparen) ; Ignore if CHAR is in parentheses. (or (and (<= ?a char) (<= char ?z)) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 2ce3d962257..664f01012b8 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -622,7 +622,7 @@ that requires a literal mode spec at compile time." ;; buffer local value has its own alist structure. (setq c-offsets-alist (copy-alist c-offsets-alist)) - ;; setup the comment indent variable in a Emacs version portable way + ;; setup the comment indent variable in an Emacs version portable way (set (make-local-variable 'comment-indent-function) 'c-comment-indent) ;; What sort of comments are default for M-;? (setq c-block-comment-flag c-block-comment-is-default) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 92e202a0258..422974379ba 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -919,7 +919,7 @@ from a different message." ;; COLUMN and LINE are numbers parsed from an error message. COLUMN and maybe ;; LINE will be nil for a message that doesn't contain them. Then the -;; location refers to a indented beginning of line or beginning of file. +;; location refers to an indented beginning of line or beginning of file. ;; Once any location in some file has been jumped to, the list is extended to ;; (COLUMN LINE FILE-STRUCTURE MARKER TIMESTAMP . VISITED) ;; for all LOCs pertaining to that file. diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el index 68bff26902a..6e02392c154 100644 --- a/lisp/progmodes/icon.el +++ b/lisp/progmodes/icon.el @@ -90,7 +90,7 @@ :group 'icon) (defcustom icon-brace-imaginary-offset 0 - "Imagined indentation of a Icon open brace that actually follows a statement." + "Imagined indentation of an Icon open brace that actually follows a statement." :type 'integer :group 'icon) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 5baf6e0f80a..c7bb2d97c84 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -422,7 +422,7 @@ (string-delimiter . ,(rx (and ;; Match even number of backslashes. (or (not (any ?\\ ?\' ?\")) point - ;; Quotes might be preceded by a escaped quote. + ;; Quotes might be preceded by an escaped quote. (and (or (not (any ?\\)) point) ?\\ (* ?\\ ?\\) (any ?\' ?\"))) (* ?\\ ?\\) @@ -925,7 +925,7 @@ keyword (back-to-indentation) (python-syntax-closing-paren-p)) (cons :inside-paren-at-closing-nested-paren start)) - ;; This line starts from a opening block in its own line. + ;; This line starts from an opening block in its own line. ((save-excursion (goto-char start) (when (and @@ -1640,7 +1640,7 @@ ARG move forward only one sexp, else move backwards." (defun python-nav--lisp-forward-sexp-safe (&optional arg) "Safe version of standard `forward-sexp'. -When at end of sexp (i.e. looking at a opening/closing paren) +When at end of sexp (i.e. looking at an opening/closing paren) skips it instead of throwing an error. With positive ARG move forward only one sexp, else move backwards." (let* ((arg (if (or (not arg) (> arg 0)) 1 -1)) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 4dfc7682c02..a4cb4856a84 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -3020,7 +3020,7 @@ If INFO is supplied it is used, else it is calculated." ;; line -- it is the PREVIOUS line which is continued, not the one ;; we are going to! ;; Also, we want to treat a whole "here document" as one big line, -;; because we may want to a align to the beginning of it. +;; because we may want to align to the beginning of it. ;; ;; What we do: ;; - go back to previous non-empty line diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 7bc3a5a2f7a..ae212bd8f85 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -4225,7 +4225,7 @@ the call to \\[sql-product-interactive] with (symbolp product)) product) (t sql-product))) ; Default to sql-product - ;; If we have a product and it has a interactive mode + ;; If we have a product and it has an interactive mode (if product (when (sql-get-product-feature product :sqli-comint-func) ;; If no new name specified, try to pop to an active SQL diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index db29435bff9..a841f87f3c3 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4890,7 +4890,7 @@ Key bindings: (set (make-local-variable 'indent-tabs-mode) vhdl-indent-tabs-mode) (set (make-local-variable 'hippie-expand-verbose) nil) - ;; setup the comment indent variable in a Emacs version portable way + ;; setup the comment indent variable in an Emacs version portable way ;; ignore any byte compiler warnings you might get here (when (boundp 'comment-indent-function) (set (make-local-variable 'comment-indent-function) 'vhdl-comment-indent)) diff --git a/lisp/tempo.el b/lisp/tempo.el index 6c395582901..5d4dea5325a 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -154,7 +154,7 @@ setting it to (upcase), for example.") (defvar tempo-local-tags '((tempo-tags . nil)) "A list of locally installed tag completion lists. -It is a association list where the car of every element is a symbol +It is an association list where the car of every element is a symbol whose variable value is a template list. The cdr part, if non-nil, is a function or a regexp that defines the string to match. See the documentation for the function `tempo-complete-tag' for more info. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 73419072536..af7bcc77cdf 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1025,78 +1025,78 @@ If DRAW-HOW is `artist-do-poly': (defsubst artist-go-get-keyword (info-variant-part) "Retrieve the keyword component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 0)) (defsubst artist-go-get-symbol (info-variant-part) "Retrieve the symbol component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 1)) (defsubst artist-go-get-mode-line (info-variant-part) "Retrieve the mode line component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 2)) (defsubst artist-go-get-arrow-pred (info-variant-part) "Retrieve the arrow predicate component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 3)) (defsubst artist-go-get-arrow-set-fn (info-variant-part) "Retrieve the arrow set component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 4)) (defsubst artist-go-get-init-fn (info-variant-part) "Retrieve the init function component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 5)) (defsubst artist-go-get-prep-fill-fn (info-variant-part) "Retrieve the fill preparation function component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 6)) (defsubst artist-go-get-exit-fn (info-variant-part) "Retrieve the exit component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 7)) (defsubst artist-go-get-draw-how (info-variant-part) "Retrieve the draw how component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 8)) (defsubst artist-go-get-draw-fn (info-variant-part) "Retrieve the draw function component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part." +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part." (elt info-variant-part 9)) (defsubst artist-go-get-undraw-fn (info-variant-part) "Retrieve the undraw function component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part. +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part. This interval function component is available only if the `draw-how' component is other than `artist-do-continously' or 1." (elt (elt info-variant-part 10) 0)) (defsubst artist-go-get-interval-fn (info-variant-part) "Retrieve the interval function component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part. +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part. This interval function component is available only if the `draw-how' component is `artist-do-continously'." (elt (elt info-variant-part 10) 0)) (defsubst artist-go-get-fill-pred (info-variant-part) "Retrieve the fill predicate component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part. +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part. This interval function component is available only if the `draw-how' component is other than `artist-do-continously' or 1." (elt (elt info-variant-part 10) 1)) (defsubst artist-go-get-fill-fn (info-variant-part) "Retrieve the fill function component from an INFO-VARIANT-PART. -An INFO-VARIANT-PART is the shifted or unshifted info from a info-part. +An INFO-VARIANT-PART is the shifted or unshifted info from an info-part. This interval function component is available only if the `draw-how' component is other than `artist-do-continously' or 1." (elt (elt info-variant-part 10) 2)) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 6d253f1c205..01ee4f5fa4d 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1405,7 +1405,7 @@ the text, so that the text has to be repeated outside the index macro. Needed for `reftex-index-selection-or-word' and for indexing from the phrase buffer. -The final entry may also be a symbol if this entry has a association +The final entry may also be a symbol if this entry has an association in the variable `reftex-index-macros-builtin' to specify the main indexing package you are using. Valid values are currently default The LaTeX default - unnecessary to specify this one diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 87ea1e827d5..b1b4f1073eb 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -652,7 +652,7 @@ After interpretation of ARGS the results are concatenated as for &aux (char (rst-Ado--validate-char char-arg)) (-style 'simple))) - ;; Construct a over-and-under section header. + ;; Construct an over-and-under section header. (:constructor rst-Ado-new-over-and-under (char-arg @@ -717,7 +717,7 @@ Return CHAR if so or signal an error otherwise." (defun rst-Ado-is-over-and-under (self) ;; testcover: ok. - "Return non-nil if SELF is a over-and-under section adornment." + "Return non-nil if SELF is an over-and-under section adornment." (cl-check-type self rst-Ado) (eq (rst-Ado--style self) 'over-and-under)) @@ -855,7 +855,7 @@ Return ADO if so or signal an error otherwise." (defun rst-Hdr-is-over-and-under (self) ;; testcover: ok. - "Return non-nil if SELF is a over-and-under section header." + "Return non-nil if SELF is an over-and-under section header." (cl-check-type self rst-Hdr) (rst-Ado-is-over-and-under (rst-Hdr-ado self))) @@ -958,7 +958,7 @@ This type is immutable." (or (null und-beg) (integer-or-marker-p und-beg)) (or (null und-end) (integer-or-marker-p und-end))) (signal 'args-out-of-range - '("For a over-and-under section adornment all match pairs must be set.")))))) + '("For an over-and-under section adornment all match pairs must be set.")))))) match) (defun rst-Ttl--validate-indent (indent ado) @@ -1245,7 +1245,7 @@ as well but give an additional message." ;; Makes paragraphs in region as a bullet list. (rst-define-key map [?\C-c ?\C-l ?\C-b] #'rst-bullet-list-region [?\C-c ?\C-b]) - ;; Makes paragraphs in region as a enumeration. + ;; Makes paragraphs in region an enumeration. (rst-define-key map [?\C-c ?\C-l ?\C-e] #'rst-enumerate-region [?\C-c ?\C-e]) ;; Converts bullets to an enumeration. @@ -1552,7 +1552,7 @@ file." (defcustom rst-default-indent 1 "Number of characters to indent the section title. This is only used while toggling adornment styles when switching -from a simple adornment style to a over-and-under adornment +from a simple adornment style to an over-and-under adornment style. In addition this is used in cases where the adornments found in the buffer are to be used but the indentation for over-and-under adornments is inconsistent across the buffer." diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 7aaed28a2a2..26c9935429f 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -48,7 +48,7 @@ ;; That should be a directory containing image files. ;; from dired, C-t m enter in thumbs-mode with all marked files ;; C-t a enter in thumbs-mode with all files in current-directory -;; In thumbs-mode, pressing on a image will bring you in image view +;; In thumbs-mode, pressing on an image will bring you in image view ;; mode for that image. C-h m will give you a list of available keybinding. ;;; History: diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 2d0ea9ce600..efe853e5eeb 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -223,7 +223,7 @@ Should be consistent with the Git config value i18n.logOutputEncoding." (concat name "\0")))))))) (defun vc-git--state-code (code) - "Convert from a string to a added/deleted/modified state." + "Convert from a string to an added/deleted/modified state." (pcase (string-to-char code) (?M 'edited) (?A 'added) From 9ab3df197f1ee7f23df30f554209b863369f06ee Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 16 Feb 2018 16:33:36 -0500 Subject: [PATCH 3/3] ; Fix doc typos related to indefinite articles --- src/character.c | 2 +- src/character.h | 2 +- src/charset.c | 2 +- src/coding.c | 2 +- src/dbusbind.c | 2 +- src/image.c | 2 +- src/inotify.c | 2 +- src/keymap.c | 2 +- src/regex.c | 2 +- src/syntax.c | 2 +- src/xdisp.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/character.c b/src/character.c index fa817a50317..deac1fa22ec 100644 --- a/src/character.c +++ b/src/character.c @@ -983,7 +983,7 @@ alphabeticp (int c) || gen_cat == UNICODE_CATEGORY_Nl); } -/* Return true if C is a alphabetic or decimal-number character. */ +/* Return true if C is an alphabetic or decimal-number character. */ bool alphanumericp (int c) { diff --git a/src/character.h b/src/character.h index c716885d46b..1f21b2ad330 100644 --- a/src/character.h +++ b/src/character.h @@ -693,7 +693,7 @@ INLINE int char_table_translate (Lisp_Object obj, int ch) { /* This internal function is expected to be called with valid arguments, - so there is a eassert instead of CHECK_xxx for the sake of speed. */ + so there is an eassert instead of CHECK_xxx for the sake of speed. */ eassert (CHAR_VALID_P (ch)); eassert (CHAR_TABLE_P (obj)); obj = CHAR_TABLE_REF (obj, ch); diff --git a/src/charset.c b/src/charset.c index cc61300b6bd..05290e86b4e 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2332,7 +2332,7 @@ init_charset_once (void) Don't make the value so small that the table is reallocated during bootstrapping, as glibc malloc calls larger than just under 64 KiB during an initial bootstrap wreak havoc after dumping; see the - M_MMAP_THRESHOLD value in alloc.c, plus there is a extra overhead + M_MMAP_THRESHOLD value in alloc.c, plus there is an extra overhead internal to glibc malloc and perhaps to Emacs malloc debugging. */ static struct charset charset_table_init[180]; diff --git a/src/coding.c b/src/coding.c index a7b040e2712..582b9268dbf 100644 --- a/src/coding.c +++ b/src/coding.c @@ -252,7 +252,7 @@ decode_coding_XXXX (struct coding_system *coding) CODING_RESULT_XXX indicating how the encoding finished. DST_BYTES zero means that source area and destination area are - overlapped, which means that we can produce a encoded text until it + overlapped, which means that we can produce an encoded text until it reaches at the head of not-yet-encoded source text. Below is a template of these functions. */ diff --git a/src/dbusbind.c b/src/dbusbind.c index 63dda583529..ec3707d18f3 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1401,7 +1401,7 @@ usage: (dbus-message-internal &rest REST) */) if ((mtype == DBUS_MESSAGE_TYPE_ERROR) && (!dbus_message_set_error_name (dmessage, DBUS_ERROR_FAILED))) - XD_SIGNAL1 (build_string ("Unable to create a error message")); + XD_SIGNAL1 (build_string ("Unable to create an error message")); } /* Check for timeout parameter. */ diff --git a/src/image.c b/src/image.c index 6e860834378..37416c16168 100644 --- a/src/image.c +++ b/src/image.c @@ -8281,7 +8281,7 @@ extern WandExport void PixelGetMagickColor (const PixelWand *, #endif /* Log ImageMagick error message. - Useful when a ImageMagick function returns the status `MagickFalse'. */ + Useful when an ImageMagick function returns the status `MagickFalse'. */ static void imagemagick_error (MagickWand *wand) diff --git a/src/inotify.c b/src/inotify.c index 08da308c978..e06cc97c6a7 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -503,7 +503,7 @@ DEFUN ("inotify-watch-list", Finotify_watch_list, Sinotify_watch_list, 0, 0, 0, } DEFUN ("inotify-allocated-p", Finotify_allocated_p, Sinotify_allocated_p, 0, 0, 0, - doc: /* Return non-nil, if a inotify instance is allocated. */) + doc: /* Return non-nil, if an inotify instance is allocated. */) { return inotifyfd < 0 ? Qnil : Qt; } diff --git a/src/keymap.c b/src/keymap.c index 80a899b5755..c8cc933e782 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1278,7 +1278,7 @@ append_key (Lisp_Object key_sequence, Lisp_Object key) return CALLN (Fvconcat, key_sequence, key_list); } -/* Given a event type C which is a symbol, +/* Given an event type C which is a symbol, signal an error if is a mistake such as RET or M-RET or C-DEL, etc. */ static void diff --git a/src/regex.c b/src/regex.c index d70a59cbb85..e8b99f6f023 100644 --- a/src/regex.c +++ b/src/regex.c @@ -5792,7 +5792,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, EXTRACT_NUMBER (mcnt, p2 - 2); - /* Ensure this is a indeed the trivial kind of loop + /* Ensure this is indeed the trivial kind of loop we are expecting. */ assert (skip_one_char (p1) == p2 - 3); assert ((re_opcode_t) p2[-3] == jump && p2 + mcnt == p); diff --git a/src/syntax.c b/src/syntax.c index e6a21e5433e..378064611cc 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -3028,7 +3028,7 @@ Comments are ignored if `parse-sexp-ignore-comments' is non-nil. If we reach the beginning or end of the accessible part of the buffer before we have scanned over COUNT lists, return nil if the depth at -that point is zero, and signal a error if the depth is nonzero. */) +that point is zero, and signal an error if the depth is nonzero. */) (Lisp_Object from, Lisp_Object count, Lisp_Object depth) { CHECK_NUMBER (from); diff --git a/src/xdisp.c b/src/xdisp.c index bf1737b9cf7..da9c31314ca 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -32479,7 +32479,7 @@ or `nobreak-hyphen' face respectively. U+00A0 (no-break space), U+00AD (soft hyphen), U+2010 (hyphen), and U+2011 (non-breaking hyphen) are affected. -Any other non-nil value means to display these characters as a escape +Any other non-nil value means to display these characters as an escape glyph followed by an ordinary space or hyphen. A value of nil means no special handling of these characters. */);