diff options
Diffstat (limited to 'lisp')
40 files changed, 61 insertions, 59 deletions
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index db27bd225dd..0796965a9ba 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -5551,7 +5551,7 @@ (cperl-next-interpolated-REx-1): Likewise. "\C-c\C-x", "\C-c\C-y", "\C-c\C-v": New keybinding for these functions. Perl/Regexp menu: 3 new entries for `cperl-next-interpolated-REx'. - (cperl-praise): Mention finded interpolated RExen. + (cperl-praise): Mention finding interpolated RExen. After 5.19: (cperl-init-faces): Highlight %$foo, @$foo too. diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 9aa4caedfe5..8a21c291e72 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -22575,7 +22575,7 @@ 2009-06-28 Juri Linkov <juri@jurta.org> - * help-fns.el (describe-function-1): Correctly locate adviced + * help-fns.el (describe-function-1): Correctly locate advised functions in hyperlink (Bug#2438). 2009-06-28 Chong Yidong <cyd@stupidchicken.com> diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index 85f8cdd7b0a..7b57c014d2b 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -10931,7 +10931,7 @@ 2012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com> - * vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on + * vc/vc.el (vc-revert, vc-rollback): Don't kill vc-diff buffer on revert (Bug#11488). 2012-05-29 Juri Linkov <juri@jurta.org> diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1 index 7803fc7f0c3..78275f4db3a 100644 --- a/lisp/cedet/ChangeLog.1 +++ b/lisp/cedet/ChangeLog.1 @@ -1546,7 +1546,7 @@ (ede-proj-makefile-dependencies): Update pattern rule so that resulting parsers are also byte-compiled. (semantic-ede-grammar-compiler-bovine) - (semantic-ede-source-grammar-wisent): Remove .elc from gargage + (semantic-ede-source-grammar-wisent): Remove .elc from garbage pattern, since this is already covered by the elisp compiler. (project-compile-target): Add compatibility code for Emacs 23, which does not have `byte-recompile-file'. diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index 1b424bc6d0c..5aaa5b2687c 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el @@ -35,7 +35,7 @@ ;; SOURCE always keep in the order of .c, .h, the other stuff. ;;; Things to do -;; makefile-fill-paragraph -- refill a macro w/ backslashes +;; makefile-fill-paragraph -- refill a macro with backslashes ;; makefile-insert-macro -- insert "foo = " diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el index 64f26516222..398e08a1a9d 100644 --- a/lisp/cedet/ede/proj.el +++ b/lisp/cedet/ede/proj.el @@ -43,7 +43,7 @@ (autoload 'ede-proj-target-scheme "ede/proj-scheme" "Target class for a group of lisp files." nil nil) (autoload 'ede-proj-target-makefile-miscelaneous "ede/proj-misc" - "Target class for a group of miscellaneous w/ a special makefile." nil nil) + "Target class for a group of miscellaneous with a special makefile." nil nil) (autoload 'ede-proj-target-makefile-program "ede/proj-prog" "Target class for building a program." nil nil) (autoload 'ede-proj-target-makefile-archive "ede/proj-archive" @@ -67,7 +67,7 @@ "Target class for a group of lisp files.") (eieio-defclass-autoload 'ede-proj-target-makefile-miscelaneous '(ede-proj-target-makefile) "ede/proj-misc" - "Target class for a group of miscellaneous w/ a special makefile.") + "Target class for a group of miscellaneous with a special makefile.") (eieio-defclass-autoload 'ede-proj-target-makefile-program '(ede-proj-target-makefile-objectcode) "ede/proj-prog" "Target class for building a program.") diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el index de6936ad1a8..75fde2043cb 100644 --- a/lisp/cedet/ede/project-am.el +++ b/lisp/cedet/ede/project-am.el @@ -195,7 +195,7 @@ other meta-variable based on this name.") "Add the current buffer into a project. _FILE is ignored. OT is the object target. DIR is the directory to start in." - (let* ((target (if ede-object (error "Already associated w/ a target") + (let* ((target (if ede-object (error "Already associated with a target") (let ((amf (project-am-load default-directory))) (if (not amf) (error "No project file")) (completing-read "Target: " @@ -231,7 +231,7 @@ OT is the object target. DIR is the directory to start in." (setq ede-object nil)) (cl-defmethod project-edit-file-target ((obj project-am-target)) - "Edit the target associated w/ this file." + "Edit the target associated with this file." (find-file (concat (oref obj path) "Makefile.am")) (goto-char (point-min)) (makefile-move-to-macro (project-am-macro obj)) diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 3166279de40..adb47056201 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -186,13 +186,13 @@ during a flush when the cache is given a new value of nil.") "State of the current parse tree.") (defmacro semantic-parse-tree-unparseable () - "Indicate that the current buffer is unparseable. + "Indicate that the current buffer is unparsable. It is also true that the parse tree will need either updating or a rebuild. This state will be changed when the user edits the buffer." '(setq semantic-parse-tree-state 'unparseable)) (defmacro semantic-parse-tree-unparseable-p () - "Return non-nil if the current buffer has been marked unparseable." + "Return non-nil if the current buffer has been marked unparsable." '(eq semantic-parse-tree-state 'unparseable)) (defmacro semantic-parse-tree-set-needs-update () @@ -528,14 +528,14 @@ If the buffer cache is out of date, attempt an incremental reparse. If the buffer has not been parsed before, or if the incremental reparse fails, then parse the entire buffer. If a lexical error had been previously discovered and the buffer -was marked unparseable, then do nothing, and return the cache." +was marked unparsable, then do nothing, and return the cache." (and ;; Is this a semantic enabled buffer? (semantic-active-p) ;; Application hooks say the buffer is safe for parsing (run-hook-with-args-until-failure 'semantic--before-fetch-tags-hook) - ;; If the buffer was previously marked unparseable, + ;; If the buffer was previously marked unparsable, ;; then don't waste our time. (not (semantic-parse-tree-unparseable-p)) ;; The parse tree actually needs to be refreshed @@ -606,7 +606,7 @@ Does nothing if the current buffer doesn't need reparsing." ;; do them here, then all the bovination hooks are not run, and ;; we save lots of time. (cond - ;; If the buffer was previously marked unparseable, + ;; If the buffer was previously marked unparsable, ;; then don't waste our time. ((semantic-parse-tree-unparseable-p) nil) diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el index af7da9cc634..ef372b5d8b2 100644 --- a/lisp/cedet/semantic/analyze/fcn.el +++ b/lisp/cedet/semantic/analyze/fcn.el @@ -67,7 +67,7 @@ Return the string representing the compound name.") "For a SEQUENCE of tags, all with good names, pick the best one. If SEQUENCE is made up of namespaces, merge the namespaces together. If SEQUENCE has several prototypes, find the non-prototype. -If SEQUENCE has some items w/ no type information, find the one with a type. +If SEQUENCE has some items with no type information, find the one with a type. If SEQUENCE is all prototypes, or has no prototypes, get the first one. Optional TAGCLASS indicates to restrict the return to only tags of TAGCLASS." diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index d4ce20589e6..5e08413a96d 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1344,7 +1344,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef." :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) ;; A function post-const is funky. Try stuff :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) - ;; prototypes are functions w/ no body + ;; prototypes are functions with no body :prototype-flag (if (nth 8 tokenpart) t) ;; Pure virtual :pure-virtual-flag (if (eq (nth 8 tokenpart) :pure-virtual-flag) t) @@ -2015,7 +2015,7 @@ have to be wrapped in that namespace." (setq txt (concat txt (format "%S" arg))) (setq sv (cdr sv))) - ;; This is optional, and potentially fraught w/ errors. + ;; This is optional, and potentially fraught with errors. (condition-case nil (dolist (lt sv) (setq txt (concat txt " " (semantic-lex-token-text lt)))) diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index dc270603a0c..00fe081acb5 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -667,7 +667,7 @@ Similar to `minibuffer-contents' when completing in the minibuffer." ) (delete-overlay semantic-complete-inline-overlay) (setq semantic-complete-inline-overlay nil) - ;; DONT restore the window configuration if we just + ;; DON'T restore the window configuration if we just ;; switched windows! (when (eq buf (current-buffer)) (set-window-configuration wc)) diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el index f0e1d9f0294..fa608c7c461 100644 --- a/lisp/cedet/semantic/db-ebrowse.el +++ b/lisp/cedet/semantic/db-ebrowse.el @@ -275,7 +275,7 @@ For instance: /home/<username>/.semanticdb/!usr!include!BROWSE" (let ((ans nil) (efcn (symbol-function 'ebrowse-show-progress))) (fset 'ebrowse-show-progress (lambda (&rest _junk) nil)) - (unwind-protect ;; Protect against errors w/ ebrowse + (unwind-protect ; Protect against errors with ebrowse (setq ans (list B (ebrowse-read))) ;; These items must always happen (erase-buffer) diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 3012af41c55..e9d5aaa1777 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -1277,7 +1277,7 @@ associated with that tag should be loaded into a buffer." ;;; Specialty Search Routines (defun semanticdb-find-tags-external-children-of-type (type &optional path find-file-match) - "Search for all tags defined outside of TYPE w/ TYPE as a parent. + "Search for all tags defined outside of TYPE with TYPE as a parent. See `semanticdb-find-translate-path' for details on PATH. FIND-FILE-MATCH indicates that any time a match is found, the file associated with that tag should be loaded into a buffer." diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 144e2ce0187..fe510c371e3 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -330,7 +330,7 @@ This mode provides a nice context menu on the include statements." ) )) - ;; @TODO - if not a tag w/ a position, we need to get one. How? + ;; @TODO - if not a tag with a position, we need to get one. How? (when (semantic-tag-with-position-p tag) (let ((ol (semantic-decorate-tag tag diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 4efc283520f..d752ecdf38a 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -40,7 +40,7 @@ ;; of themselves that can be edited w/out affecting the definition of ;; that tag. ;; -;; 2. Tags w/ positioned children could have a property of an +;; 2. Tags with positioned children could have a property of an ;; overlay marking the region in themselves that contain the ;; children. This could be used to better improve splicing near ;; the beginning and end of the child lists. diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index 2d6f26919d7..e53dd9104ad 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -396,7 +396,7 @@ Uses `semantic-idle-work-for-on-buffer' to do the work." (semanticdb-save-all-db-idle) ) - ;; Done w/ processing + ;; Done with processing nil)))) ;; Done diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index 50d7c8adf14..45964a1a17d 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -577,7 +577,7 @@ such as `public' or `private'." (if (semantic-tag-file-name TAG) ;; If it has a filename, just go with it... (setq copyslots (cons TAG copyslots)) - ;; Otherwise, copy the tag w/ the guessed filename. + ;; Otherwise, copy the tag with the guessed filename. (setq copyslots (cons (semantic-tag-copy TAG nil fname) copyslots))) ) diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index 013864f81c0..1cb5d5b04a7 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -51,7 +51,7 @@ Display the references in `semantic-symref-results-mode'." (let ((ct (semantic-current-tag))) ;; Must have a tag... (when (not ct) (error "Place cursor inside tag to be searched for")) - ;; Check w/ user. + ;; Check with user. (when (not (y-or-n-p (format "Find references for %s? " (semantic-tag-name ct)))) (error "Quit")) diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 96d1de5a26c..bcded23aec6 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -133,7 +133,7 @@ symbol whose value is such a string." semantic-minor-mode-alist)))) (semantic-mode-line-update) - ;; Semantic minor modes don't work w/ Desktop restore. + ;; Semantic minor modes don't work with Desktop restore. ;; This line will disable this minor mode from being restored ;; by Desktop. (when (boundp 'desktop-minor-mode-handlers) diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index a25d1441f1f..c264ebaa70a 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -29,7 +29,8 @@ ;; ;;; Origins: ;; -;; Document was first written w/ cparse, a custom regexp based c parser. +;; Document was first written with cparse, a custom regexp based c +;; parser. ;; ;; Document was then ported to cedet/semantic using sformat (super ;; format) as the templating engine. diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 7d4539dcb42..f218f1c6e9d 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -219,7 +219,7 @@ Return nil if nothing was extracted." ;; With a name, do the insertion. (let ((subdict (srecode-dictionary-add-section-dictionary dict (oref ins object-name)))) - (error "Need to implement include w/ name extractor") + (error "Need to implement include with name extractor") ;; Recurse into the new template while no errors. (while (condition-case nil (progn diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el index ea7fda004e7..c5ceb89d2dc 100644 --- a/lisp/cedet/srecode/semantic.el +++ b/lisp/cedet/srecode/semantic.el @@ -43,8 +43,8 @@ ;;; The SEMANTIC TAG inserter ;; -;; Put a tag into the dictionary that can be used w/ arbitrary -;; lisp expressions. +;; Put a tag into the dictionary that can be used with arbitrary +;; Lisp expressions. (defclass srecode-semantic-tag (srecode-dictionary-compound-value) ((prime :initarg :prime diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 3f9bc28e0b0..3bddb93b64a 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -2265,8 +2265,8 @@ buffer, otherwise stop after the first error." (unless (and sym (or (boundp sym) (fboundp sym))) ;; Find out how we spell-check this word. (unless (or - ;; All caps w/ option th, or s tacked on the end - ;; for pluralization or number. + ;; All caps with option th, or s tacked on the + ;; end for pluralization or number. (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word) (looking-at "}") ; a keymap expression ) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 9e2bd106cb3..6dc47000fa5 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -659,7 +659,7 @@ Optional argument BACKEND specifies the VC backend to use for cloning the package's repository; this is only possible if NAME-OR-URL is a URL, a string. If BACKEND is omitted or nil, the function uses `package-vc-heuristic-alist' to guess the backend. -Note that by default, a source package will be prioritised over a +Note that by default, a source package will be prioritized over a regular package, but it will not remove a source package." (interactive (progn diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index 89c24758cb8..64231f365e2 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -11075,7 +11075,8 @@ stay at your current version. It seems fairly stable though. That changed? erc-buffer-name handling was completely rewritten, and erc-buffer-list local variable handling removed. - Simplifies alot of code. Poke at it. read the diff. report bug/send patches! + Simplifies a lot of code. Poke at it. Read the diff. Report + bug/send patches! * erc.el: * Added variable listing when /set is used without args @@ -11448,7 +11449,7 @@ 2001-10-03 Mario Lang <mlang@delysid.org> * erc.el: - * Removed alot of (progn ...) where they were not necessary + * Removed a lot of (progn ...) where they were not necessary * Changed some (if ...) without else part to (when ...) * Some (while ...) to use (dolist ...) * Fix for completion popup generating tracebacks. diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index bb928fc5fb0..950922ea7f8 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -552,7 +552,7 @@ See the variable `eshell-kill-processes-on-exit'." (setq sigs (cdr sigs)))))) (defun eshell-query-kill-processes () - "Kill processes belonging to the current Eshell buffer, possibly w/ query." + "Kill processes belonging to the current Eshell buffer, possibly with query." (when (and eshell-kill-processes-on-exit eshell-process-list) (save-window-excursion diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index e8291cfe6f7..ebd0adf2e25 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -1446,7 +1446,7 @@ will be computed and used." (mml-insert-empty-tag 'part 'type type ;; icicles redefines read-file-name and returns a - ;; string w/ text properties :-/ + ;; string with text properties :-/ 'filename (substring-no-properties file) 'disposition (or disposition "attachment") 'description description) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index eb6a071bf4a..97d20cca151 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -2766,7 +2766,7 @@ return that value." (cond ;; nil means do nothing ((eq nil feedmail-date-generator) nil) - ;; t is the same a using the function feedmail-default-date-generator, so let it and recurse + ;; t is the same as using the function feedmail-default-date-generator, so let it and recurse ((eq t feedmail-date-generator) (let ((feedmail-date-generator (feedmail-default-date-generator maybe-file))) (feedmail-fiddle-date maybe-file))) @@ -2822,7 +2822,7 @@ probably not appropriate for you." (cond ;; nil means do nothing ((eq nil feedmail-message-id-generator) nil) - ;; t is the same a using the function feedmail-default-message-id-generator, so let it and recurse + ;; t is the same as using the function feedmail-default-message-id-generator, so let it and recurse ((eq t feedmail-message-id-generator) (let ((feedmail-message-id-generator (feedmail-default-message-id-generator maybe-file))) (feedmail-fiddle-message-id maybe-file))) @@ -2864,7 +2864,7 @@ probably not appropriate for you." (cond ;; nil means do nothing ((eq nil feedmail-x-mailer-line) nil) - ;; t is the same a using the function feedmail-default-x-mailer-generator, so let it and recurse + ;; t is the same as using the function feedmail-default-x-mailer-generator, so let it and recurse ((eq t feedmail-x-mailer-line) (let ((feedmail-x-mailer-line (feedmail-default-x-mailer-generator))) (feedmail-fiddle-x-mailer))) diff --git a/lisp/mail/rfc6068.el b/lisp/mail/rfc6068.el index 54035b66981..4863f3582c3 100644 --- a/lisp/mail/rfc6068.el +++ b/lisp/mail/rfc6068.el @@ -43,9 +43,9 @@ string instead of decoding as utf-8." (defun rfc6068-parse-mailto-url (mailto-url) "Parse MAILTO-URL, and return an alist of header-name, header-value pairs. -MAILTO-URL should be a RFC 6068 (mailto) compliant url. A cons cell w/ a +MAILTO-URL should be a RFC 6068 (mailto) compliant url. A cons cell with a key of `Body' is a special case and is considered a header for this purpose. -The returned alist is intended for use w/ the `compose-mail' interface. +The returned alist is intended for use with the `compose-mail' interface. Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., & -> &), before calling this function." (let ((case-fold-search t) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index e3372a6ff47..2421b283e6b 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -2599,7 +2599,7 @@ is greater than zero; otherwise, show it in full." "Handle a \"Mail-Followup-To\" header field with an unknown mailing list. Ask the user whether to add that list name to `mail-mailing-lists'." ;; FIXME s-r not needed? Use rmail-get-header? - ;; We have not narrowed to the headers at ths point? + ;; We have not narrowed to the headers at this point? (save-restriction (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t))) (when mail-followup-to diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index 98f46a3af55..558785de149 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -1350,7 +1350,7 @@ buffer." nesting))) (defun sc-add-citation-level () - "Add a citation level for nested citation style w/ coercion." + "Add a citation level for nested citation style with coercion." (let* ((nesting (sc-guess-nesting)) (citation (make-string (1+ (length nesting)) (string-to-char sc-citation-delimiter))) diff --git a/lisp/man.el b/lisp/man.el index 9dd247cc31e..3802362da09 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -331,7 +331,7 @@ This regexp should not start with a `^' character.") ;; This used to have leading space [ \t]*, but was removed because it ;; causes false page splits on an occasional NAME with leading space ;; inside a manpage. And `Man-heading-regexp' doesn't have [ \t]* anyway. -(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry fo.*$" +(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry for.*$" "Regular expression describing first heading on a manpage. This regular expression should start with a `^' character.") diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 6cc76db8df1..1491a4645aa 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -10556,7 +10556,7 @@ * org-element.el (org-element-paragraph-separate): Fix comments in paragraph separator regexp. Optimize it. - * org-element.el: Update code commets. + * org-element.el: Update code comments. * org.el (org-mark-subtree): Fix bug when marking subtree with point on an inlinetask. Refactor code. @@ -24341,7 +24341,7 @@ 2010-07-19 Bernt Hansen <bernt@norang.ca> * org.el (org-time-string-to-absolute): Ignore cyclic repeater - when displaying items on todays agenda date. + when displaying items on today's agenda date. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index c2d7fc309d4..9555d21b00a 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1238,7 +1238,7 @@ This docstring appeases checkdoc, that's all." :request-dispatcher (funcall spread #'eglot-handle-request) :on-shutdown #'eglot--on-shutdown initargs)) - (cancelled nil) + (canceled nil) (tag (make-symbol "connected-catch-tag"))) (when server-info (jsonrpc--debug server "Running language server: %s" @@ -1277,7 +1277,7 @@ This docstring appeases checkdoc, that's all." :workspaceFolders (eglot-workspace-folders server)) :success-fn (eglot--lambda ((InitializeResult) capabilities serverInfo) - (unless cancelled + (unless canceled (push server (gethash project eglot--servers-by-project)) (setf (eglot--capabilities server) capabilities) @@ -1315,13 +1315,13 @@ in project `%s'." (when tag (throw tag t)))) :timeout eglot-connect-timeout :error-fn (eglot--lambda ((ResponseError) code message) - (unless cancelled + (unless canceled (jsonrpc-shutdown server) (let ((msg (format "%s: %s" code message))) (if tag (throw tag `(error . ,msg)) (eglot--error msg))))) :timeout-fn (lambda () - (unless cancelled + (unless canceled (jsonrpc-shutdown server) (let ((msg (format "Timed out after %s seconds" eglot-connect-timeout))) @@ -1338,7 +1338,7 @@ in project `%s'." (jsonrpc-name server)) nil) (_ server))) - (quit (jsonrpc-shutdown server) (setq cancelled 'quit))) + (quit (jsonrpc-shutdown server) (setq canceled 'quit))) (setq tag nil)))) (defun eglot--inferior-bootstrap (name contact &optional connect-args) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 00507a3c1af..655dd6a5d94 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -276,7 +276,7 @@ START, END and COMMENT-START are regular expressions. A block is defined as text surrounded by START and END. As a special case, START may be a list of the form (COMPLEX-START -MDATA-SELECTOR), where COMPLEX-START is a regexp w/ multiple parts and +MDATA-SELECTOR), where COMPLEX-START is a regexp with multiple parts and MDATA-SELECTOR an integer that specifies which sub-match is the proper place to adjust point, before calling `hs-forward-sexp-func'. Point is adjusted to the beginning of the specified match. For example, @@ -576,7 +576,7 @@ property of an overlay." (save-match-data (not (nth 8 (syntax-ppss)))))) (defun hs-forward-sexp (match-data arg) - "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' w/ ARG. + "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' with ARG. Original match data is restored upon return." (save-match-data (set-match-data match-data) diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index f87230bd2f5..58cb48f1829 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -155,7 +155,7 @@ which case it will be used to compose the new symbol as per the third argument of `compose-region'.") (defun prettify-symbols-default-compose-p (start end _match) - "Return non-nil iff the symbol MATCH should be composed. + "Return non-nil if the symbol MATCH should be composed. The symbol starts at position START and ends at position END. This is the default for `prettify-symbols-compose-predicate' which is suitable for most programming languages such as C or Lisp." diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 310a9be4f6e..e5458e6a07f 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -7719,7 +7719,7 @@ nil otherwise." (setq match t) (setq elm nil)) (setq elm (cdr elm))))) - ;; If this is a test just for exact match, return nil ot t + ;; If this is a test just for exact match, return nil or t (if (and (equal flag 'lambda) (not (equal match 't))) nil match)))) diff --git a/lisp/subr.el b/lisp/subr.el index a42b61d9b61..261ec512d89 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2584,7 +2584,7 @@ Uses the `derived-mode-parent' property of the symbol to trace backwards." (defun major-mode-restore (&optional avoided-modes) "Restore major mode earlier suspended with `major-mode-suspend'. If there was no earlier suspended major mode, then fallback to `normal-mode', -tho trying to avoid AVOIDED-MODES." +though trying to avoid AVOIDED-MODES." (if major-mode--suspended (funcall (prog1 major-mode--suspended (kill-local-variable 'major-mode--suspended))) diff --git a/lisp/url/ChangeLog.1 b/lisp/url/ChangeLog.1 index 2f7813e64cd..1b5ddc1e768 100644 --- a/lisp/url/ChangeLog.1 +++ b/lisp/url/ChangeLog.1 @@ -366,7 +366,7 @@ * url.el, url-queue.el, url-parse.el, url-http.el, url-future.el: * url-dav.el, url-cookie.el: Use cl-lib. * url-util.el, url-privacy.el, url-nfs.el, url-misc.el, url-methods.el: - * url-gw.el, url-file.el, url-expand.el: Dont use CL. + * url-gw.el, url-file.el, url-expand.el: Don't use CL. 2012-06-30 Glenn Morris <rgm@gnu.org> diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index a4345c7d7e2..c41835e19f2 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -1192,7 +1192,7 @@ variable `vc-rcs-release' is set to the returned value." (defun vc-rcs-parse (&optional buffer) "Parse current buffer, presumed to be in RCS-style masterfile format. Optional arg BUFFER specifies another buffer to parse. Return an alist -of two elements, w/ keys `headers' and `revisions' and values in turn +of two elements, with keys `headers' and `revisions' and values in turn sub-alists. For `headers', the values unless otherwise specified are strings and the keys are: |