From 136b74c53a66ae5607e0604246dc127718d3c5e6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 8 Jan 2014 11:16:10 -0800 Subject: [PATCH] Spelling fixes. * lisp/language/china-util.el (hz-ascii-designation): Rename from hz-ascii-designnation. (hz-ascii-designation): Rename from hz-ascii-designnation. All uses changed. * lisp/cedet/semantic/decorate/include.el (semantic-decoration-mouse-3): Rename from semantic-decoratiton-mouse-3. All uses changed. * lisp/org/org-irc.el (org-irc-ellipsify-description): Rename from org-irc-elipsify-description. All uses changed. --- doc/emacs/programs.texi | 2 +- doc/lispintro/emacs-lisp-intro.texi | 1 - doc/lispref/help.texi | 2 +- doc/misc/semantic.texi | 2 +- lisp/ChangeLog | 8 ++++++++ lisp/ChangeLog.8 | 2 +- lisp/cedet/ChangeLog | 6 ++++++ lisp/cedet/data-debug.el | 2 +- lisp/cedet/semantic/decorate/include.el | 12 ++++++------ lisp/emulation/viper-cmd.el | 6 +++--- lisp/gnus/gmm-utils.el | 2 +- lisp/gnus/gnus-util.el | 2 +- lisp/gnus/nnmail.el | 2 +- lisp/language/china-util.el | 12 ++++++------ lisp/org/ChangeLog | 6 ++++++ lisp/org/org-agenda.el | 2 +- lisp/org/org-irc.el | 4 ++-- lisp/textmodes/paragraphs.el | 2 +- lisp/wid-edit.el | 8 ++++---- 19 files changed, 51 insertions(+), 32 deletions(-) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 256218e42c7..f38edd4fe73 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1220,7 +1220,7 @@ variables that you want to use. @xref{Name Help}. @cindex Eldoc mode @findex eldoc-mode Eldoc is a buffer-local minor mode that helps with looking up Lisp -documention. When it is enabled, the echo area displays some useful +documentation. When it is enabled, the echo area displays some useful information whenever there is a Lisp function or variable at point; for a function, it shows the argument list, and for a variable it shows the first line of the variable's documentation string. To diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 3c994796193..8c3574f75f7 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -11912,7 +11912,6 @@ more steps. @node No deferment solution @subsection No Deferment Solution @cindex No deferment solution -@cindex Defermentless solution @cindex Solution without deferment The solution to the problem of deferred operations is to write in a diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 7a6836fb68f..50103d3a8b3 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -59,7 +59,7 @@ Documentation}. You can also put function documentation in the (@pxref{Accessing Documentation}). @cindex @code{variable-documentation} property - In a variable definition (a @code{defvar} form), the documention + In a variable definition (a @code{defvar} form), the documentation string is specified after the initial value. @xref{Defining Variables}. The string is stored in the variable's @code{variable-documentation} property. diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 17d1aa7a5ac..6e39d410223 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -355,7 +355,7 @@ tags are @emph{saved} while a buffer is not in memory. The database and tables both also provide applicable cache information, and cache flushing system. The semanticdb search routines use caches -to save datastructures that are complex to calculate. +to save data structures that are complex to calculate. Lastly, it provides the concept of @dfn{project root}. It is a system by which a file can be associated with the root of a project, so if diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0cf7f1a1544..5c079165151 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-01-08 Paul Eggert + + Spelling fixes. + * language/china-util.el (hz-ascii-designation): + Rename from hz-ascii-designnation. + (hz-ascii-designation): Rename from hz-ascii-designnation. + All uses changed. + 2014-01-08 Bastien Guerry * emacs-lisp/package.el (package-installed-p): Fix my previous diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index ea88bab9e73..36114ae3fe9 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -295,7 +295,7 @@ (font-lock-removed-keywords-alist): New variable. (font-lock-add-keywords): Updates `font-lock-removed-keywords-alist'. Empty `font-lock-keywords-alist' when `append' is `set' to avoid - growing datastructures. + growing data structures. (font-lock-set-defaults): Removes keywords stored in `font-lock-removed-keywords-alist' after local keywords added. diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 425afbdbdf2..7d8326c9247 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,9 @@ +2014-01-08 Paul Eggert + + Spelling fixes. + * semantic/decorate/include.el (semantic-decoration-mouse-3): + Rename from semantic-decoratiton-mouse-3. All uses changed. + 2013-12-28 Glenn Morris * ede/linux.el (project-linux-build-directory-default) diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index 6ed407738cc..338e4037fb6 100644 --- a/lisp/cedet/data-debug.el +++ b/lisp/cedet/data-debug.el @@ -1,4 +1,4 @@ -;;; data-debug.el --- Datastructure Debugger +;;; data-debug.el --- Data structure debugger ;; Copyright (C) 2007-2014 Free Software Foundation, Inc. diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 2834b902c21..788973ac6fa 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -42,8 +42,8 @@ ;;; Code: ;;; FACES AND KEYMAPS -(defvar semantic-decoratiton-mouse-3 (if (featurep 'xemacs) [ button3 ] [ mouse-3 ]) - "The keybinding lisp object to use for binding the right mouse button.") +(defvar semantic-decoration-mouse-3 (if (featurep 'xemacs) [ button3 ] [ mouse-3 ]) + "The keybinding Lisp object to use for binding the right mouse button.") ;;; Includes that are in a happy state! ;; @@ -55,7 +55,7 @@ Used by the decoration style: `semantic-decoration-on-includes'." (defvar semantic-decoration-on-include-map (let ((km (make-sparse-keymap))) - (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-include-menu) + (define-key km semantic-decoration-mouse-3 'semantic-decoration-include-menu) km) "Keymap used on includes.") @@ -126,7 +126,7 @@ Used by the decoration style: `semantic-decoration-on-unknown-includes'." (defvar semantic-decoration-on-unknown-include-map (let ((km (make-sparse-keymap))) ;(define-key km [ mouse-2 ] 'semantic-decoration-unknown-include-describe) - (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-unknown-include-menu) + (define-key km semantic-decoration-mouse-3 'semantic-decoration-unknown-include-menu) km) "Keymap used on unparsed includes.") @@ -189,7 +189,7 @@ Used by the decoration style: `semantic-decoration-on-fileless-includes'." (defvar semantic-decoration-on-fileless-include-map (let ((km (make-sparse-keymap))) ;(define-key km [ mouse-2 ] 'semantic-decoration-fileless-include-describe) - (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-fileless-include-menu) + (define-key km semantic-decoration-mouse-3 'semantic-decoration-fileless-include-menu) km) "Keymap used on unparsed includes.") @@ -251,7 +251,7 @@ Used by the decoration style: `semantic-decoration-on-unparsed-includes'." (defvar semantic-decoration-on-unparsed-include-map (let ((km (make-sparse-keymap))) - (define-key km semantic-decoratiton-mouse-3 'semantic-decoration-unparsed-include-menu) + (define-key km semantic-decoration-mouse-3 'semantic-decoration-unparsed-include-menu) km) "Keymap used on unparsed includes.") diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 24c5ef6cd8c..54690dd6a0f 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1896,7 +1896,7 @@ Undo previous insertion and inserts new." ;; Quote region by each line with a user supplied string. (defun viper-quote-region () (let ((quote-str viper-quote-string) - (donot-change-default t)) + (do-not-change-default t)) (setq quote-str (viper-read-string-with-history "Quote string: " @@ -1908,9 +1908,9 @@ Undo previous insertion and inserts new." ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") ((memq major-mode '(c-mode cc-mode c++-mode)) "//") ((memq major-mode '(sh-mode shell-mode)) "#") - (t (setq donot-change-default nil) + (t (setq do-not-change-default nil) quote-str)))) - (or donot-change-default + (or do-not-change-default (setq viper-quote-string quote-str)) (viper-enlarge-region (point) (mark t)) (if (> (point) (mark t)) (exchange-point-and-mark)) diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index a993a544e3f..8ce29323088 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -99,7 +99,7 @@ ARGS are passed to `message'." ;; Copy of the `nnmail-lazy' code from `nnmail.el': (define-widget 'gmm-lazy 'default - "Base widget for recursive datastructures. + "Base widget for recursive data structures. This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility." :format "%{%t%}: %v" diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 51b2e3ef05f..a3038a1bfe5 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -937,7 +937,7 @@ Otherwise, return the value." 'previous-extent-change 'previous-char-property-change)) ;;; Protected and atomic operations. dmoore@ucsd.edu 21.11.1996 -;; The primary idea here is to try to protect internal datastructures +;; The primary idea here is to try to protect internal data structures ;; from becoming corrupted when the user hits C-g, or if a hook or ;; similar blows up. Often in Gnus multiple tables/lists need to be ;; updated at the same time, or information can be lost. diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 4faf7b8d381..2817b54020a 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -374,7 +374,7 @@ messages will be shown to indicate the current status." (number :tag "count"))) (define-widget 'nnmail-lazy 'default - "Base widget for recursive datastructures. + "Base widget for recursive data structures. This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility." :format "%{%t%}: %v" diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el index d03352a86d8..1a893e136d7 100644 --- a/lisp/language/china-util.el +++ b/lisp/language/china-util.el @@ -52,16 +52,16 @@ ;; ISO-2022 escape sequence to designate GB2312. (defvar iso2022-gb-designation "\e$A") ;; HZ escape sequence to designate GB2312. -(defvar hz-gb-designnation "~{") +(defvar hz-gb-designation "~{") ;; ISO-2022 escape sequence to designate ASCII. (defvar iso2022-ascii-designation "\e(B") ;; HZ escape sequence to designate ASCII. -(defvar hz-ascii-designnation "~}") +(defvar hz-ascii-designation "~}") ;; Regexp of ZW sequence to start GB2312. (defvar zw-start-gb "^zW") ;; Regexp for start of GB2312 in an encoding mixture of HZ and ZW. (defvar hz/zw-start-gb - (concat hz-gb-designnation "\\|" zw-start-gb "\\|[^\0-\177]")) + (concat hz-gb-designation "\\|" zw-start-gb "\\|[^\0-\177]")) (defvar decode-hz-line-continuation nil "Flag to tell if we should care line continuation convention of Hz.") @@ -117,7 +117,7 @@ Return the length of resulting text." (progn (translate-region (point) end hz-set-msb-table) (goto-char end)) - (if (search-forward hz-ascii-designnation + (if (search-forward hz-ascii-designation (if decode-hz-line-continuation nil end) t) (delete-char -2)) @@ -155,11 +155,11 @@ Return the length of resulting text." (goto-char pos) (while (search-forward iso2022-gb-designation nil t) (delete-char -3) - (insert hz-gb-designnation)) + (insert hz-gb-designation)) (goto-char pos) (while (search-forward iso2022-ascii-designation nil t) (delete-char -3) - (insert hz-ascii-designnation)))) + (insert hz-ascii-designation)))) (- (point-max) (point-min))))) ;;;###autoload diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index bac878d2299..e116129521f 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,9 @@ +2014-01-08 Paul Eggert + + Spelling fixes. + * org-irc.el (org-irc-ellipsify-description): Rename from + org-irc-elipsify-description. All uses changed. + 2013-01-07 Bastien Guerry * org-clock.el (org-clock-cancel-hook) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 116909da9fd..ccf08a2c97b 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -764,7 +764,7 @@ to make his option also apply to the tags-todo list." (integer :tag "Ignore if N or more days in past(-) or future(+)."))) (defcustom org-agenda-todo-ignore-deadlines nil - "Non-nil means ignore some deadlined TODO items when making TODO list. + "Non-nil means ignore some deadline TODO items when making TODO list. There are different motivations for using different values, please think carefully when configuring this variable. diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el index 9d2d20cab27..8f9761b323f 100644 --- a/lisp/org/org-irc.el +++ b/lisp/org/org-irc.el @@ -105,7 +105,7 @@ attributes that are found." ((eq major-mode 'erc-mode) (org-irc-erc-store-link)))) -(defun org-irc-elipsify-description (string &optional after) +(defun org-irc-ellipsify-description (string &optional after) "Remove unnecessary white space from STRING and add ellipses if necessary. Strip starting and ending white space from STRING and replace any chars that the value AFTER with '...'" @@ -158,7 +158,7 @@ the session itself." (progn (org-store-link-props :type "file" - :description (concat "'" (org-irc-elipsify-description + :description (concat "'" (org-irc-ellipsify-description (cadr parsed-line) 20) "' from an IRC conversation") :link (concat "file:" (car parsed-line) "::" diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index d31e7dacff7..adc4aa10be2 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -468,7 +468,7 @@ sentences. Also, every paragraph boundary terminates sentences as well." (setq par-text-beg (point)) ;; Start of the first line of the paragraph. ;; We use this as the search limit - ;; to allow s1entence-end to match if it is anchored at + ;; to allow sentence-end to match if it is anchored at ;; BOL and the paragraph starts indented. (beginning-of-line) (setq par-beg (point))) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 9e37054d97b..b5598f6d14c 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -3462,14 +3462,14 @@ To use this type, you must define :match or :match-alternatives." ;; Recursive datatypes. (define-widget 'lazy 'default - "Base widget for recursive datastructures. + "Base widget for recursive data structures. The `lazy' widget will, when instantiated, contain a single inferior widget, of the widget type specified by the :type parameter. The value of the `lazy' widget is the same as the value of the inferior widget. When deriving a new widget from the 'lazy' widget, the :type parameter is allowed to refer to the widget currently being defined, -thus allowing recursive datastructures to be described. +thus allowing recursive data structures to be described. The :type parameter takes the same arguments as the defcustom parameter with the same name. @@ -3479,7 +3479,7 @@ not allow recursion. That is, when you define a new widget type, none of the inferior widgets may be of the same type you are currently defining. -In Lisp, however, it is custom to define datastructures in terms of +In Lisp, however, it is custom to define data structures in terms of themselves. A list, for example, is defined as either nil, or a cons cell whose cdr itself is a list. The obvious way to translate this into a widget type would be @@ -3502,7 +3502,7 @@ example: :type '(choice (const nil) (cons :value (nil) sexp sexp-list)))" :format "%{%t%}: %v" ;; We don't convert :type because we want to allow recursive - ;; datastructures. This is slow, so we should not create speed + ;; data structures. This is slow, so we should not create speed ;; critical widgets by deriving from this. :convert-widget 'widget-value-convert-widget :value-create 'widget-type-value-create -- 2.11.4.GIT