diff options
Diffstat (limited to 'lisp')
73 files changed, 118 insertions, 119 deletions
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 0cf64cf36e..1677d8659b 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -11680,7 +11680,7 @@ 2002-08-27 Francesco Potortì <pot@gnu.org> * net/ange-ftp.el (ange-ftp-skip-msgs): Skip the 530 response - given by vsFTPd when accessed with a kerberised FTP client. + given by vsFTPd when accessed with a kerberized FTP client. 2002-08-27 Richard M. Stallman <rms@gnu.org> diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index cd91dfad28..1cde53ba0d 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -13629,7 +13629,7 @@ (completion-emacs22-try-completion): Place cursor after the /, as was done in Emacs-22's minibuffer-complete-word. Fix bug reported by David Hansen <david.hansen@gmx.net>. - (completion-emacs22-try-completion): Merge all mergeable text rather + (completion-emacs22-try-completion): Merge all mergable text rather than just /. (completion-pcm--delim-wild-regex): New var. (completion-pcm-word-delimiters): New custom. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index ddd8ad7e7f..4a1769b117 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -2796,7 +2796,7 @@ 2010-12-29 Karl Fogel <kfogel@red-bean.com> * saveplace.el (save-place-alist-to-file): Save list sorted and - pretty-printed, so that it is mergeable by line-based text merging, + pretty-printed, so that it is mergable by line-based text merging, as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>. 2010-12-28 Ken Manheimer <ken.manheimer@gmail.com> @@ -5376,7 +5376,7 @@ 2010-10-21 Lars Magne Ingebrigtsen <larsi@gnus.org> - * newcomment.el (comment-dwim): Fix the intentation in the doc string. + * newcomment.el (comment-dwim): Fix the indentation in the doc string. 2010-10-21 Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 3604656265..89856d3772 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -1960,7 +1960,7 @@ window for it. * terminal.el (te-filter): - Save/restore point from te-saved-point to minimise the lossage + Save/restore point from te-saved-point to minimize the lossage vandals can inflict. 1987-01-09 Richard M. Stallman (rms@prep) @@ -4008,4 +4008,3 @@ See ChangeLog.1 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 3c2871594f..dfd9adad2a 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -1623,7 +1623,7 @@ We return the item-widget corresponding to the item at point." (set-buffer-modified-p was-modified) (goto-char steady-point) - ;; must null the marker or the buffer gets clogged with impedence: + ;; must null the marker or the buffer gets clogged with impedance: (set-marker steady-point nil) item-widget))) diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index 7efe534a64..d73a32a8bc 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -43,7 +43,7 @@ ;; ;; Customization: ;; -;; Since these projects are all so increadibly generic, a user will +;; Since these projects are all so incredibly generic, a user will ;; need to configure some aspects of the project by hand. In order to ;; enable this without configuring the project objects directly (which ;; are auto-generated) a special ede-generic-config object is defined to diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index d8b004df1b..9a862c64d1 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -344,7 +344,7 @@ Uses known macro tables in SPP to determine what block to skip." (string= sym "0")) (and ifdef (not (semantic-lex-spp-symbol-p sym))) (and ifndef (semantic-lex-spp-symbol-p sym))) - ;; The if indecates to skip this preprocessor section + ;; The if indicates to skip this preprocessor section. (let ((pt nil)) ;; (message "%s %s yes" ift sym) (beginning-of-line) @@ -650,7 +650,7 @@ as for the parent." (setq depth 0) ;; This is a copy of semantic-parse-region-default where we - ;; are doing something special with the lexication of the + ;; are doing something special with the lexing of the ;; contents of the semantic-list token. Stuff not used by C ;; removed. (let ((tokstream diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el index 137759d46a..a7d150ec4a 100644 --- a/lisp/cedet/semantic/html.el +++ b/lisp/cedet/semantic/html.el @@ -126,7 +126,7 @@ html parser. PNT is the new point to set." NAME is the name of this section. MEMBERS is a list of semantic tags representing the elements that make up this section. -LEVEL is the levelling level. +LEVEL is the leveling level. START and END define the location of data described by the tag." (let ((anchorp (eq level 11))) (append (semantic-tag name diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 8009a257a7..03a3f1b0cb 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -1067,7 +1067,7 @@ of type `spp-macro-undef' is to be created." ;; ;; These analyzers help a language define how include files ;; are identified. These are ONLY for languages that perform -;; an actual textual includesion, and not for imports. +;; an actual textual inclusion, and not for imports. ;; ;; This section is supposed to allow the macros from the headers to be ;; added to the local dynamic macro table, but that hasn't been diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index d9a3ede360..8c3d6c17cf 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el @@ -87,7 +87,7 @@ Restore the old current buffer when completed." ;; @ type ;; = default value ;; -;; +> keywrd Type +;; +> keyword Type ;; +> type part ;; ;; +> -> click to see additional information diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el index d118d9b620..86fa382a76 100644 --- a/lisp/cedet/semantic/tag-file.el +++ b/lisp/cedet/semantic/tag-file.el @@ -125,7 +125,7 @@ Depends on `semantic-dependency-include-path' for searching. Always searches (tag-fname nil)) (cond ((semantic-tag-in-buffer-p tag) ;; If the tag has an overlay and buffer associated with it, - ;; switch to that buffer so that we get the right override metohds. + ;; switch to that buffer so that we get the right override methods. (set-buffer (semantic-tag-buffer tag))) ((semantic-tag-file-name tag) ;; If it didn't have a buffer, but does have a file diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index c2f080ce75..78de16c4f9 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el @@ -483,7 +483,7 @@ that start with that symbol." ;; This section provides specialized access into texinfo files. ;; Because texinfo files often directly refer to functions and programs ;; it is useful to access the texinfo file from the C code for document -;; maintainance. +;; maintenance. (defun semantic-texi-associated-files (&optional buffer) "Find texinfo files associated with BUFFER." (save-excursion diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index caf1ddebdb..134b5310ab 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -122,7 +122,7 @@ RESULT is a string." ("read" . "Reads from") ("reset" . "Resets the parameters and returns") ("scan" . "Scans the ") - ("setup\\|init\\(iallize\\)?" . "Initializes the ") + ("setup\\|init\\(ialize\\)?" . "Initializes the ") ("select" . "Chooses the ") ("send" . "Sends a") ("re?c\\(v\\|ieves?\\)" . "Receives a ") diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 9fbfc5dc04..60f277b2c9 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -946,7 +946,7 @@ with the dictionaries found in the dictionary." ;; It will first insert the included template, then insert the embedded ;; template wherever the $^$ in the included template was. ;; -;; Since it uses dual inheretance, it will magically get the end-matching +;; Since it uses dual inheritance, it will magically get the end-matching ;; behavior of #, with the including feature of >. ;; (defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start) diff --git a/lisp/color.el b/lisp/color.el index 5b67eb58a6..487e280dd5 100644 --- a/lisp/color.el +++ b/lisp/color.el @@ -28,7 +28,7 @@ ;; complements, and computing CIEDE2000 color distances. ;; ;; Supported color representations include RGB (red, green, blue), HSV -;; (hue, saturation, value), HSL (hue, saturation, luminence), sRGB, +;; (hue, saturation, value), HSL (hue, saturation, luminance), sRGB, ;; CIE XYZ, and CIE L*a*b* color components. ;;; Code: diff --git a/lisp/dired.el b/lisp/dired.el index e88ebc83b3..32a7f74968 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -704,7 +704,7 @@ Don't use that together with FILTER." (defun dired-file-name-at-point () "Try to get a file name at point in the current dired buffer. -This hook is inteneded to be put in `file-name-at-point-functions'." +This hook is intended to be put in `file-name-at-point-functions'." (let ((filename (dired-get-filename nil t))) (when filename (if (file-directory-p filename) diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 8527bc9e64..976848e155 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1608,7 +1608,7 @@ ;; fii ;; ;; Now we advise `fii' to use an optional second argument that controls the -;; amount of incrementation. A list following the (optional) position +;; amount of incrementing. A list following the (optional) position ;; argument of the advice will be interpreted as an argument list ;; specification. This means you cannot specify an empty argument list, and ;; why would you want to anyway? diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index 75e7d62f39..e9f2ec5460 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -169,7 +169,7 @@ Make sure the width/height is correct." :initform t) (name-face :initarg :name-face :initform 'bold) - (labels-face :initarg :lables-face + (labels-face :initarg :labels-face :initform 'italic) (chart :initarg :chart :initform nil) diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 0b8aa03450..dd3e02b838 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -296,7 +296,7 @@ If necessary, this first calls `elint-initialize'." (elint-display-log) (elint-set-mode-line t) (mapc 'elint-top-form (elint-update-env)) - ;; Tell the user we're finished. This is terribly klugy: we set + ;; Tell the user we're finished. This is terribly kludgy: we set ;; elint-top-form-logged so elint-log-message doesn't print the ;; ** top form ** header... (elint-set-mode-line) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 9408c0a3c9..f9e7fe4482 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -769,7 +769,7 @@ this command arranges for all errors to enter the debugger." Reset the `defvar' and `defcustom' variables to the initial value. Reinitialize the face according to the `defface' specification." ;; The code in edebug-defun should be consistent with this, but not - ;; the same, since this gets a macroexpended form. + ;; the same, since this gets a macroexpanded form. (cond ((not (listp form)) form) ((and (eq (car form) 'defvar) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 38a881845d..b2035e8ede 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -777,7 +777,7 @@ It also can't undo some Viper settings." (viper-unbind-mouse-search-key) (viper-unbind-mouse-insert-key) ;; In emacs, we have to advice handle-switch-frame - ;; This advice is undone earlier, when all advices matchine "viper-" are + ;; This advice is undone earlier, when all advices matching "viper-" are ;; deactivated. (if (featurep 'xemacs) (remove-hook 'mouse-leave-frame-hook 'viper-remember-current-frame)) @@ -1050,7 +1050,7 @@ It also can't undo some Viper settings." (memq 'down (event-modifiers (aref key 1))))) (read-event)))))) ) ; (if (featurep 'xemacs) - + (if (featurep 'xemacs) ;; XEmacs (defadvice describe-key-briefly @@ -1076,7 +1076,7 @@ It also can't undo some Viper settings." (prefix-numeric-value current-prefix-arg)) 1)))) ) ; (if (featurep 'xemacs) - + (defadvice find-file (before viper-add-suffix-advice activate) "Use `read-file-name' for reading arguments." (interactive (cons (read-file-name "Find file: " nil default-directory) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 2d8c2565f6..8e0973c7b8 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1569,7 +1569,7 @@ symbol, it may have these values: ;; current ERC buffer. ;; if buf-name is taken by a different connection (or by something !erc) ;; then see if "buf-name/server" meets the same criteria - (dolist (candidate (list buf-name (concat buf-name "/" server))) + (dolist (candidate (list buf-name (concat buf-name "/" server))) (if (and (not buffer-name) erc-reuse-buffers (get-buffer candidate) @@ -4001,7 +4001,7 @@ and as second argument the event parsed as a vector." (not (string-match "^\C-a\\ACTION.*\C-a$" message)))) (defun erc-format-privmessage (nick msg privp msgp) - "Format a PRIVMSG in an insertible fashion." + "Format a PRIVMSG in an insertable fashion." (let* ((mark-s (if msgp (if privp "*" "<") "-")) (mark-e (if msgp (if privp "*" ">") "-")) (str (format "%s%s%s %s" mark-s nick mark-e msg)) diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index 4e1dbd4104..04ba19d407 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el @@ -74,7 +74,7 @@ ;; session, it is likely that they are experiencing a spelling ;; difficulty associated with a certain command. To combat this, ;; Eshell will offer to automatically define an alias for that -;; mispelled command, once a given tolerance threshold has been +;; misspelled command, once a given tolerance threshold has been ;; reached. ;; Whenever the same bad command name is encountered diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index db9b003895..df1f7b67e2 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -90,7 +90,7 @@ This option slows down recursive glob processing by quite a bit." (defcustom eshell-error-if-no-glob nil "If non-nil, it is an error for a glob pattern not to match. - This mimcs the behavior of zsh if non-nil, but bash if nil." + This mimics the behavior of zsh if non-nil, but bash if nil." :type 'boolean :group 'eshell-glob) diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index bbb453be71..b508fd5352 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -81,7 +81,7 @@ Setting this to nil is offered as an aid to debugging only." Numeric form is tested using the regular expression `eshell-number-regexp'. -NOTE: If you find that numeric conversions are intefering with the +NOTE: If you find that numeric conversions are interfering with the specification of filenames (for example, in calling `find-file', or some other Lisp function that deals with files, not numbers), add the following in your .emacs file: diff --git a/lisp/follow.el b/lisp/follow.el index 92efc8d8cf..7375b15ad1 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -87,7 +87,7 @@ ;; to turn it off. -;; The command `follow-delete-other-windows-and-split' maximises the +;; The command `follow-delete-other-windows-and-split' maximizes the ;; visible area of the current buffer. ;; ;; I recommend adding it, and `follow-mode', to hotkeys in the global diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 71f8cf82d3..e9d31312a1 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -1368,7 +1368,7 @@ downloaded into the agent." ;; disable the set read each time this server is opened. ;; NOTE: Opening this group will restore the valid local ;; range but it will also expand the local range to - ;; incompass the new active range. + ;; encompass the new active range. (gnus-agent-set-local group agent-min (1- active-min))))))) (defun gnus-agent-save-group-info (method group active) diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el index c38b0cd360..b4d23ff579 100644 --- a/lisp/gnus/gnus-dired.el +++ b/lisp/gnus/gnus-dired.el @@ -251,7 +251,7 @@ file to save in." (if (eq gnus-dired-mail-mode 'gnus-user-agent) (gnus-print-buffer) ;; FIXME: - (error "MIME print only implemeted via Gnus"))) + (error "MIME print only implemented via Gnus"))) (ps-despool print-to)))) ((file-symlink-p file-name) (error "File is a symlink to a nonexistent target")) diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el index 06aac77648..0fcc206cf7 100644 --- a/lisp/gnus/mail-parse.el +++ b/lisp/gnus/mail-parse.el @@ -22,7 +22,7 @@ ;; This file contains wrapper functions for a wide range of mail ;; parsing functions. The idea is that there are low-level libraries -;; that impement according to various specs (RFC2231, DRUMS, USEFOR), +;; that implement according to various specs (RFC2231, DRUMS, USEFOR), ;; but that programmers that want to parse some header (say, ;; Content-Type) will want to use the latest spec. ;; diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index d83467a1ed..93e8544b63 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1799,7 +1799,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." (i 0) (new 0) (total 0) - incoming incomings source) + source) (when (and (nnmail-get-value "%s-get-new-mail" method) sources) (while (setq source (pop sources)) diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 9d6011e657..0a8fa43f3b 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -204,7 +204,7 @@ (add-hook 'gnus-summary-mode-hook 'nnmairix-summary-mode-hook) ;; ;;;###autoload -;; (defun nnmairix-initalize (&optional force) +;; (defun nnmairix-initialize (&optional force) ;; (interactive "P") ;; (if (not (or (file-readable-p "~/.mairixrc") ;; force)) @@ -512,7 +512,7 @@ Other back ends might or might not work.") ;; Everything else is an error (t (nnheader-report - 'nnmairix "Error running marix. See buffer %s for details" + 'nnmairix "Error running mairix. See buffer %s for details" nnmairix-mairix-output-buffer) nil)))))) diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 7b9af3302a..e8db24c356 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -53,17 +53,17 @@ fit these criteria." :group 'shr :type 'regexp) -(defcustom shr-table-horizontal-line ? +(defcustom shr-table-horizontal-line ? "Character used to draw horizontal table lines." :group 'shr :type 'character) -(defcustom shr-table-vertical-line ? +(defcustom shr-table-vertical-line ? "Character used to draw vertical table lines." :group 'shr :type 'character) -(defcustom shr-table-corner ? +(defcustom shr-table-corner ? "Character used to draw table corners." :group 'shr :type 'character) @@ -583,7 +583,7 @@ Return a string with image data." "Return a function to display an image. CONTENT-FUNCTION is a function to retrieve an image for a cid url that is an argument. The function to be returned takes three arguments URL, -START, and END. Note that START and END should be merkers." +START, and END. Note that START and END should be markers." `(lambda (url start end) (when url (if (string-match "\\`cid:" url) diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el index 5c2e775a21..a0c1d4f108 100644 --- a/lisp/gnus/sieve-manage.el +++ b/lisp/gnus/sieve-manage.el @@ -1,4 +1,4 @@ -;;; sieve-manage.el --- Implementation of the managesive protocol in elisp +;;; sieve-manage.el --- Implementation of the managesieve protocol in elisp ;; Copyright (C) 2001-2011 Free Software Foundation, Inc. diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index fa152f688c..869dbc9bc0 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -156,7 +156,7 @@ last rule in your split configuration." :group 'spam) (defcustom spam-autodetect-recheck-messages nil - "Should spam.el recheck all meessages when autodetecting? + "Should spam.el recheck all messages when autodetecting? Normally this is nil, so only unseen messages will be checked." :type 'boolean :group 'spam) diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 5d67a6c4f4..5906683071 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -141,7 +141,7 @@ The format is (FUNCTION ARGS...).") 'help-function 'describe-character-set 'help-echo (purecopy "mouse-2, RET: describe this character set")) -;; make some more ideosyncratic button types +;; Make some more idiosyncratic button types. (define-button-type 'help-symbol :supertype 'help-xref diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index 75bc1f9743..69da8fc611 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -391,7 +391,7 @@ undoes the expansion." lst))) ;; Check if current buffer matches any atom or regexp in LST. -;; Atoms are interpreted as major modes, strings as regexps mathing the name. +;; Atoms are interpreted as major modes, strings as regexps matching the name. (defun he-buffer-member (lst) (or (memq major-mode lst) (progn diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index cd9f1fa6b4..0cc9385085 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -1774,7 +1774,7 @@ Strips any leading \"./\" from each filename." (split-string (shell-command-to-string hfy-find-cmd))) ) ;; strip the filename off, return a directory name -;; not a particularly thorough implementaion, but it will be +;; not a particularly thorough implementation, but it will be ;; fed pretty carefully, so it should be Ok: (defun hfy-dirname (file) "Return everything preceding the last \"/\" from a relative filename FILE, diff --git a/lisp/ido.el b/lisp/ido.el index 6af431a288..f425fd5fc6 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -770,7 +770,7 @@ can be completed using TAB, (defcustom ido-use-virtual-buffers nil "If non-nil, refer to past buffers as well as existing ones. Essentially it works as follows: Say you are visiting a file and -the buffer gets cleaned up by mignight.el. Later, you want to +the buffer gets cleaned up by midnight.el. Later, you want to switch to that buffer, but find it's no longer open. With virtual buffers enabled, the buffer name stays in the buffer list (using the `ido-virtual' face, and always at the end), and if diff --git a/lisp/international/characters.el b/lisp/international/characters.el index 94237a0a48..7bf504bfb5 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -410,7 +410,7 @@ with L, LRE, or LRO Unicode bidi character type.") ("ྐ-ྐྵྺྻྼ" "w" ?0) ; ("ིེཻོཽྀ" "w" ?2) ; upper vowel ("ཾྂྃ྆྇ྈྉྊྋ" "w" ?2) ; upper modifier - ("྄ཱུ༙༵༷" "w" ?3) ; lowel vowel/modifier + ("྄ཱུ༙༵༷" "w" ?3) ; lower vowel/modifier ("" "w" ?3) ; invisible vowel a ("༠-༩༪-༳" "w" ?6) ; digit ("་།-༒༔ཿ" "." ?|) ; line-break char diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 47583e3f86..eaac5c17cd 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -2188,7 +2188,7 @@ you can set `feedmail-queue-reminder-alist' to nil." (if (or (eq user-sez ?\C-m) (eq user-sez ?\C-j) (eq user-sez ?y)) (setq user-sez d-char)) ;; these char-to-int things are because of some - ;; incomprensible difference between the two in + ;; incomprehensible difference between the two in ;; byte-compiled stuff between Emacs and XEmacs ;; (well, I'm sure someone could comprehend it, ;; but I say 'uncle') diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index fa057aee36..11e195d4f7 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -2427,7 +2427,7 @@ PATTERN is as returned by `completion-pcm--string->pattern'." "Find all completions for STRING at POINT in TABLE, satisfying PRED. POINT is a position inside STRING. FILTER is a function applied to the return value, that can be used, e.g. to -filter out additional entries (because TABLE migth not obey PRED)." +filter out additional entries (because TABLE might not obey PRED)." (unless filter (setq filter 'identity)) (let* ((beforepoint (substring string 0 point)) (afterpoint (substring string point)) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index cbad30199d..458d419012 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -721,7 +721,7 @@ parenthesized expressions in REGEXP for the components (in that order)." "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" "^500 .*AUTH\\|^KERBEROS\\|" "^504 Unknown security mechanism\\|" - "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd + "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd "^534 Kerberos Authentication not enabled\\|" "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") "Regular expression matching FTP messages that can be ignored." diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 16b36df07f..f1b3ce7fd0 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -1574,7 +1574,7 @@ property to '(<nt-type>-<nt-age> <nt-type> <nt-age>)." (while (and (setq pos2 (next-single-property-change pos1 'nt-type)) (<= pos2 end) (> pos2 pos1)) - ;; must shift one char to the left in order to handle inivisible + ;; must shift one char to the left in order to handle invisible ;; newlines, motion in invisible text areas and all that correctly (put-text-property (1- pos1) (1- pos2) 'invisible diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 269b47be20..fda8835125 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -39,7 +39,7 @@ ;; Consequently, GNU Emacs 23.1 with enabled D-Bus bindings is a ;; precondition. -;; The GVFS D-Bus interface is said to be instable. There are even no +;; The GVFS D-Bus interface is said to be unstable. There are even no ;; introspection data. The interface, as discovered during ;; development time, is given in respective comments. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index b946d147e5..477daf7553 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -14739,7 +14739,7 @@ 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> - * org.el (org-sort-entries-or-items): Match TODO keywrds + * org.el (org-sort-entries-or-items): Match TODO keywords case-sensitively, when sorting. (org-priority): Do not match TODO keywords with wrong case. diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el index a5bdcbf2f7..4fe6145198 100644 --- a/lisp/org/ob-ledger.el +++ b/lisp/org/ob-ledger.el @@ -30,7 +30,7 @@ ;; ;; 1) there is no such thing as a "session" in ledger ;; -;; 2) we are generally only going to return output from the leger program +;; 2) we are generally only going to return output from the ledger program ;; ;; 3) we are adding the "cmdline" header argument ;; diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el index ee8e602770..35a5164945 100644 --- a/lisp/org/org-exp.el +++ b/lisp/org/org-exp.el @@ -2922,7 +2922,7 @@ to the value of `temporary-file-directory'." (org-load-modules-maybe) (unless org-local-vars (setq org-local-vars (org-get-local-variables))) - (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode' + (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode' (list 'let org-local-vars (list (intern (format "org-export-as-%s" fmt)) nil nil nil ''string t)))) diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 2fba931528..5eeaf6199f 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -1302,7 +1302,7 @@ However, when FORCE is non-nil, create new columns if necessary." (defun org-table-line-to-dline (line &optional above) "Turn a buffer line number into a data line number. If there is no data line in this line, return nil. -If there is no matchin dline (most likely te refrence was a hline), the +If there is no matching dline (most likely te refrence was a hline), the first dline below it is used. When ABOVE is non-nil, the one above is used." (catch 'exit (let ((ll (length org-table-dlines)) @@ -2901,7 +2901,7 @@ known that the table will be realigned a little later anyway." (defun org-table-iterate (&optional arg) "Recalculate the table until it does not change anymore. -The maximun number of iterations is 10, but you can chose a different value +The maximum number of iterations is 10, but you can chose a different value with the prefix ARG." (interactive "P") (let ((imax (if arg (prefix-numeric-value arg) 10)) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index a7a332d97f..b05b05f7bd 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -649,7 +649,7 @@ Solutions are sorted from least to greatest Hamming weight." ;; 23x25 is a diagonal of 1, and the two last columns are a ;; base of kernel of transferm. ;; - ;; base-change must be by construction inversible. + ;; base-change must be by construction invertible. (base-change (5x5-log "p" diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 9d2aad7741..b8bf62d90b 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -826,7 +826,7 @@ the 4 file locations can be clicked on and jumped to." ;; to be considered as part of a word or not. ;; Some characters may have multiple meanings depending on the context: ;; - ' is either the beginning of a constant character or an attribute -;; - # is either part of a based litteral or a gnatprep statement. +;; - # is either part of a based literal or a gnatprep statement. ;; - " starts a string, but not if inside a constant character. ;; - ( and ) should be ignored if inside a constant character. ;; Thus their syntax property is changed automatically, and we can still use diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index aa1289cd63..cdbe5b39bf 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -128,7 +128,7 @@ ;; REGEXPS FOR "HARMLESS" STRINGS/LINES. (defconst c-awk-harmless-char-re "[^_#/\"\\\\\n\r]") ;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a -;; localisation string in gawk 3.1 +;; localization string in gawk 3.1 (defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)") ;; Matches an underline NOT followed by ". (defconst c-awk-harmless-string*-re @@ -160,7 +160,7 @@ (defconst c-awk-string-without-end-here-re (concat "\\=_?\"" c-awk-string-innards-re)) ;; Matches an AWK string at point up to, but not including, any terminator. -;; A gawk 3.1+ string may look like _"localisable string". +;; A gawk 3.1+ string may look like _"localizable string". (defconst c-awk-one-line-possibly-open-string-re (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-non-eol-esc-pair-re "\\)*" "\\(\"\\|\\\\?$\\|\\'\\)")) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 8ac38c253f..fb146b3976 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2364,7 +2364,7 @@ comment at the start of cc-engine.el for more info." (defun c-parse-state-get-strategy (here good-pos) ;; Determine the scanning strategy for adjusting `c-parse-state', attempting - ;; to minimise the amount of scanning. HERE is the pertinent position in + ;; to minimize the amount of scanning. HERE is the pertinent position in ;; the buffer, GOOD-POS is a position where `c-state-cache' (possibly with ;; its head trimmed) is known to be good, or nil if there is no such ;; position. @@ -2788,7 +2788,7 @@ comment at the start of cc-engine.el for more info." ;; ;; This function must only be called only when (> `c-state-cache-good-pos' ;; HERE). Usually the gap between CACHE-POS and HERE is large. It is thus - ;; optimised to eliminate (or minimise) scanning between these two + ;; optimised to eliminate (or minimize) scanning between these two ;; positions. ;; ;; Return a three element list (GOOD-POS SCAN-BACK-POS FWD-FLAG), where: @@ -5052,7 +5052,7 @@ comment at the start of cc-engine.el for more info." ;; The strategy now (2010-01) adopted is to mark and unmark < and ;; > IN MATCHING PAIRS ONLY. [Previously, they were marked ;; individually when their context so indicated. This gave rise to -;; intractible problems when one of a matching pair was deleted, or +;; intractable problems when one of a matching pair was deleted, or ;; pulled into a literal.] ;; ;; At each buffer change, the syntax-table properties are removed in a @@ -5965,7 +5965,7 @@ comment at the start of cc-engine.el for more info." ;; `*-font-lock-extra-types'); ;; o - 'prefix if it's a known prefix of a type; ;; o - 'found if it's a type that matches one in `c-found-types'; - ;; o - 'maybe if it's an identfier that might be a type; or + ;; o - 'maybe if it's an identifier that might be a type; or ;; o - nil if it can't be a type (the point isn't moved then). ;; ;; The point is assumed to be at the beginning of a token. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index a5a9582315..fa94af071f 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1122,7 +1122,7 @@ casts and declarations are fontified. Used on level 2 and higher." (char-after (match-beginning 1)))) (if types - ;; Register and fontify the identifer as a type. + ;; Register and fontify the identifier as a type. (let ((c-promote-possible-types t)) (goto-char id-start) (c-forward-type)) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index d93d174047..141cd6f972 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -587,7 +587,7 @@ that requires a literal mode spec at compile time." (add-hook 'after-change-functions 'c-after-change nil t) (set (make-local-variable 'font-lock-extend-after-change-region-function) 'c-extend-after-change-region)) ; Currently (2009-05) used by all - ; lanaguages with #define (C, C++,; ObjC), and by AWK. + ; languages with #define (C, C++,; ObjC), and by AWK. (defun c-setup-doc-comment-style () "Initialize the variables that depend on the value of `c-doc-comment-style'." diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 02256ead39..549f94387d 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -420,7 +420,7 @@ If a LINE-TYPE is missing, then \\[indent-for-comment] indents the comment according to `comment-column'. Note that a non-nil value on `c-indent-comments-syntactically-p' -overrides this variable, so empty lines are indentented syntactically +overrides this variable, so empty lines are indented syntactically in that case, i.e. as if \\[c-indent-command] was used instead." :type (let ((space '(cons :tag "space" diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index ca59602315..88193d4d3f 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -839,7 +839,7 @@ voice); b) Can lineup vertically \"middles\" of rows, like `=' in a = b; cc = d; - c) Can insert spaces where this impoves readability (in one + c) Can insert spaces where this improves readability (in one interactive sweep over the buffer); d) Has support for imenu, including: 1) Separate unordered list of \"interesting places\"; @@ -2801,7 +2801,7 @@ Will not look before LIM." (skip-chars-forward " \t") (if (memq (char-after (point)) (append "#\n" nil)) - nil ; Can't use intentation of this line... + nil ; Can't use indentation of this line... (point))) (skip-chars-forward " \t") (point))) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index c60e8d72ab..3f16b3655b 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2094,7 +2094,7 @@ extension EXTN. Normally EXTN is given as the regular expression ;; By this point the current directory is all screwed up. Maybe we ;; could fix things and re-invoke gud-common-init, but for now I think - ;; issueing the error is good enough. + ;; issuing the error is good enough. (if user-error (progn (kill-buffer (current-buffer)) diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 2708346f05..8155198e3d 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -989,7 +989,7 @@ This function expects a more or less standard routine header. In particlar it looks for the `NAME:' tag, either with a colon, or alone on a line. Then `NAME:' must be followed by the routine name on the same or the next line. When KEYWORD is non-nil, looks first for a -`KEYWORDS' section. It is amazing how inconsisten this is through +`KEYWORDS' section. It is amazing how inconsistent this is through some IDL libraries I have seen. We settle for a line containing an upper case \"KEYWORD\" string. If this line is not found we search for the keyword anyway to increase the hit-rate diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 0e3fdc78a3..94a9c250fe 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1599,7 +1599,7 @@ will be returned." (defun js-syntactic-context () "Return the JavaScript syntactic context at point. -When called interatively, also display a message with that +When called interactively, also display a message with that context." (interactive) (let* ((syntactic-context (js--syntactic-context-from-pstate diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 67e3c4a18b..91a2e94675 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -414,7 +414,7 @@ no args, if that value is non-nil." (electric-pascal-terminate-line))) (defun electric-pascal-colon () - "Insert `:' and do all indentions except line indent on this line." + "Insert `:' and do all indentations except line indent on this line." (interactive) (insert last-command-event) ;; Do nothing if within string. diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 7810b377e5..c2adc3b801 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -713,7 +713,7 @@ defines the beginning of a group. These tokens are: { [ <<" (ps-mode-r-balance ">>")) (defun ps-mode-r-balance (right) - "Adjust indentification if point after RIGHT." + "Adjust indenting if point after RIGHT." (if ps-mode-auto-indent (save-excursion (when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 2d8334bcb7..4cc4a133c8 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -2622,7 +2622,7 @@ user-visible changes to the buffer must not be within a (defmacro verilog-save-no-change-functions (&rest body) "Execute BODY forms, disabling all change hooks in BODY. -For insigificant changes, see instead `verilog-save-buffer-state'." +For insignificant changes, see instead `verilog-save-buffer-state'." `(let* ((inhibit-point-motion-hooks t) before-change-functions after-change-functions) @@ -3596,7 +3596,7 @@ With ARG, first kill any existing labels." (looking-at "\\w+\\W*:\\W*\\(coverpoint\\|cross\\|constraint\\)") ;; keep going if we are in the middle of a word (not (or (looking-at "\\<") (forward-word -1))) - ;; stop if we see an assertion (perhaps labled) + ;; stop if we see an assertion (perhaps labeled) (and (looking-at "\\(\\<\\(assert\\|assume\\|cover\\)\\>\\s-+\\<property\\>\\)\\|\\(\\<assert\\>\\)") (progn @@ -6974,7 +6974,7 @@ Signals must be in standard (base vector) form." ;;(verilog-signals-not-in '(("A" "") ("B" "") ("DEL" "[2:3]")) '(("DEL" "") ("EXT" ""))) (defun verilog-signals-memory (in-list) - "Return list of signals in IN-LIST that are memoried (multidimensional)." + "Return list of signals in IN-LIST that are memorized (multidimensional)." (let (out-list) (while in-list (if (nth 3 (car in-list)) diff --git a/lisp/recentf.el b/lisp/recentf.el index 79f4eb437d..2dac870afd 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -567,7 +567,7 @@ menu-elements (no sub-menu)." (if (and l (functionp filter)) (let ((case-fold-search recentf-case-fold-search) elts others) - ;; split L into two sub-listes, one of sub-menus elements and + ;; split L into two sub-lists, one of sub-menus elements and ;; another of single menu elements. (dolist (elt l) (if (recentf-sub-menu-element-p elt) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 23a91888c1..8fd1bc306e 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -35,7 +35,7 @@ this version is not backward compatible to 0.14 or earlier.") ;; ;;; Customizing and Developing for speedbar ;; -;; Please see the speedbar manual for informaion. +;; Please see the speedbar manual for information. ;; ;;; Notes: ;; @@ -1004,7 +1004,7 @@ supported at a time. #'speedbar-frame-mode (if (featurep 'xemacs) (append speedbar-frame-plist - ;; This is a hack to get speedbar to iconfiy + ;; This is a hack to get speedbar to iconify ;; with the selected frame. (list 'parent (selected-frame))) speedbar-frame-parameters) diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 490c06148a..574b838981 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -136,7 +136,7 @@ (define-key map "\e[Z" [?\S-\t]) (define-key map "\e[072q" [?\C-\t]) - ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc + ;; This only works if you remove the M-TAB keyring from the system.4Dwmrc ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager. (define-key map "\e[073q" [?\M-\t]) diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 5b21913c32..14c4ce1c8b 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -114,7 +114,7 @@ (defvar rxvt-alternatives-map (let ((map (make-sparse-keymap))) - ;; The terminal intialization C code file might have initialized + ;; The terminal initialization C code file might have initialized ;; function keys F11->F42 from the termcap/terminfo information. On ;; a PC-style keyboard these keys correspond to ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index 9a90091683..d62db664d2 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el @@ -76,7 +76,7 @@ ;; defined for the MS-DOS and MS-Windows consoles, because the users ;; on those systems expect these colors to be available. ;; -;; For these reasons, package maintaners are advised NOT to use color +;; For these reasons, package maintainers are advised NOT to use color ;; names such as "lightred" or "lightblue", because they will have ;; different effect on different displays. Instead, use "red1" and ;; "blue1", respectively. diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 47da0bf4de..c2856660ea 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -460,7 +460,7 @@ features. Set to nil to skip the checks." "Terminal initialization function for xterm." ;; rxvt terminals sometimes set the TERM variable to "xterm", but ;; rxvt's keybindings are incompatible with xterm's. It is - ;; better in that case to use rxvt's initializion function. + ;; better in that case to use rxvt's initialization function. (if (and (getenv "COLORTERM" (selected-frame)) (string-match "\\`rxvt" (getenv "COLORTERM" (selected-frame)))) (tty-run-terminal-initialization (selected-frame) "rxvt") diff --git a/lisp/terminal.el b/lisp/terminal.el index 6fdaecf9c9..99f652f7df 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el @@ -1285,7 +1285,7 @@ in the directory specified by `te-terminfo-directory'." ;; Rename it to the desired name. ;; We use this roundabout approach ;; to avoid any risk of writing a name that - ;; was michievouslyt set up as a symlink. + ;; was mischievously set up as a symlink. (rename-file temp-file file-name)) ;; Now compile that source to make the binary that the ;; programs actually use. diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index 78d80da41a..eb0e734080 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -69,7 +69,7 @@ (unless (eq (get 'reftex-default-bibliography :reftex-raw) reftex-default-bibliography) (put 'reftex-default-bibliography :reftex-expanded - (reftex-locate-bibliography-files + (reftex-locate-bibliography-files default-directory reftex-default-bibliography)) (put 'reftex-default-bibliography :reftex-raw reftex-default-bibliography)) @@ -128,7 +128,7 @@ ;; If RETURN is non-nil, just return the entry and restore point. (let* ((re - (if item + (if item (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}") (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key) "[, \t\r\n}]"))) @@ -152,7 +152,7 @@ (when return ;; Just return the relevant entry (if item (goto-char (match-end 0))) - (setq return (buffer-substring + (setq return (buffer-substring (point) (reftex-end-of-bib-entry item))) (goto-char oldpos) ;; restore point. (set-buffer buffer-conf) @@ -169,9 +169,9 @@ (error "No BibTeX entry with citation key %s" key))))) (defun reftex-end-of-bib-entry (item) - (save-excursion + (save-excursion (condition-case nil - (if item + (if item (progn (end-of-line) (re-search-forward "\\\\bibitem\\|\\end{thebibliography}") @@ -192,16 +192,16 @@ ;; Read a regexp, completing on known citation keys. (setq default (regexp-quote (reftex-get-bibkey-default))) - (setq re-list - (split-string - (completing-read + (setq re-list + (split-string + (completing-read (concat "Regex { && Regex...}: " "[" default "]: ") (if reftex-mode (if (fboundp 'LaTeX-bibitem-list) (LaTeX-bibitem-list) - (cdr (assoc 'bibview-cache + (cdr (assoc 'bibview-cache (symbol-value reftex-docstruct-symbol)))) nil) nil nil nil 'reftex-cite-regexp-hist) @@ -248,7 +248,7 @@ (error (goto-char key-point) (throw 'search-again nil))) (setq end-point (point)) - + ;; Ignore @string, @comment and @c entries or things ;; outside entries (when (or (string= (downcase (match-string 2)) "string") @@ -257,12 +257,12 @@ (< (point) key-point)) ; this means match not in {} (goto-char key-point) (throw 'search-again nil)) - + ;; Well, we have got a match ;;(setq entry (concat ;; (buffer-substring start-point (point)) "\n")) (setq entry (buffer-substring start-point (point))) - + ;; Check if other regexp match as well (setq re-list rest-re) (while re-list @@ -270,24 +270,24 @@ ;; nope - move on (throw 'search-again nil)) (pop re-list)) - + (setq alist (reftex-parse-bibtex-entry nil start-point end-point)) (push (cons "&entry" entry) alist) - + ;; check for crossref entries (if (assoc "crossref" alist) (setq alist (append alist (reftex-get-crossref-alist alist)))) - + ;; format the entry (push (cons "&formatted" (reftex-format-bib-entry alist)) alist) - + ;; make key the first element (push (reftex-get-bib-field "&key" alist) alist) - + ;; add it to the list (push alist found-list))))) (reftex-kill-temporary-buffers)))) @@ -350,7 +350,7 @@ (unless files (error "Need file name to find thebibliography environment")) (while (setq file (pop files)) - (setq buf (reftex-get-file-buffer-force + (setq buf (reftex-get-file-buffer-force file (not reftex-keep-temporary-buffers))) (unless buf (error "No such file %s" file)) @@ -386,16 +386,16 @@ ;; Read a regexp, completing on known citation keys. (setq default (regexp-quote (reftex-get-bibkey-default))) - (setq re-list - (split-string - (completing-read + (setq re-list + (split-string + (completing-read (concat "Regex { && Regex...}: " "[" default "]: ") (if reftex-mode (if (fboundp 'LaTeX-bibitem-list) (LaTeX-bibitem-list) - (cdr (assoc 'bibview-cache + (cdr (assoc 'bibview-cache (symbol-value reftex-docstruct-symbol)))) nil) nil nil nil 'reftex-cite-regexp-hist) @@ -408,14 +408,14 @@ (error "Empty regular expression")) (while (and (setq re (pop re-list)) entries) - (setq entries + (setq entries (delq nil (mapcar (lambda (x) (if (string-match re (cdr (assoc "&entry" x))) x nil)) entries)))) - (setq entries - (mapcar + (setq entries + (mapcar (lambda (x) (push (cons "&formatted" (reftex-format-bibitem x)) x) (push (reftex-get-bib-field "&key" x) x) @@ -655,12 +655,12 @@ While entering the regexp, completion on knows citation keys is possible. (when (eq (car selected-entries) 'concat) ;; All keys go into a single command - we need to trick a little - ;; FIXME: Unfortunately, this meens that commenting does not work right. + ;; FIXME: Unfortunately, this means that commenting does not work right. (pop selected-entries) (let ((concat-keys (mapconcat 'car selected-entries ","))) - (setq insert-entries + (setq insert-entries (list (list concat-keys (cons "&key" concat-keys)))))) - + (unless no-insert ;; We shall insert this into the buffer... diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index fa95863279..f9e3283b78 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -847,7 +847,7 @@ and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. SGML Electric Tag Pair mode is a buffer-local minor mode for use -with `sgml-mode' and related maor modes. When enabled, editing +with `sgml-mode' and related major modes. When enabled, editing an opening markup tag automatically updates the closing tag." :lighter "/e" (if sgml-electric-tag-pair-mode diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index bb7744be43..a9ff042d68 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -721,7 +721,7 @@ should be shown to the user." ;; The request could not be completed due to a conflict with ;; the current state of the resource. This code is only ;; allowed in situations where it is expected that the user - ;; mioght be able to resolve the conflict and resubmit the + ;; might be able to resolve the conflict and resubmit the ;; request. The response body SHOULD include enough ;; information for the user to recognize the source of the ;; conflict. diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index c514026b1f..43292ed14e 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el @@ -430,7 +430,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; Conflict (and (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT)) - ;; C might be followed by a "suprious" U for non-mergeable files + ;; C might be followed by a "spurious" U for non-mergable files (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t)) ;; Successful merge (cvs-match (concat "M \\(.*" qfile "\\)$") (path 1)) |