diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 10 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/avl-tree.el | 64 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cconv.el | 8 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 8 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/elint.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/testcover.el | 2 |
11 files changed, 57 insertions, 53 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 976848e155d..ae2900775ac 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -625,12 +625,12 @@ ;; ;; (ad-activate-regexp "^ange-ftp-") ;; -;; A saver way would have been to use +;; A safer way would have been to use ;; ;; (ad-update-regexp "^ange-ftp-") ;; ;; instead which would have only reactivated currently actively advised -;; functions, but not functions that were currently deactivated. All these +;; functions, but not functions that were currently inactive. All these ;; functions can also be called interactively. ;; A certain piece of advice is considered a match if its name contains a @@ -833,7 +833,7 @@ ;; Reactivate an advised function but only if its advice is currently ;; active. This can be used to bring all currently advised function up ;; to date with the current state of advice without also activating -;; currently deactivated functions. +;; currently inactive functions. ;; - Caching: ;; Is the saving of an advised definition and an identifying cache-id so ;; it can be reused, for example, for activation after deactivation. @@ -853,7 +853,7 @@ ;; - ad-activate to activate the advice of a FUNCTION ;; - ad-deactivate to deactivate the advice of a FUNCTION ;; - ad-update to activate the advice of a FUNCTION unless it was not -;; yet activated or is currently deactivated. +;; yet activated or is currently inactive. ;; - ad-unadvise deactivates a FUNCTION and removes all of its advice ;; information, hence, it cannot be activated again ;; - ad-recover tries to redefine a FUNCTION to its original definition and @@ -1261,7 +1261,7 @@ ;; contain some advice matched by the regular expression. This is a save ;; way to update the activation of advised functions whose advice changed ;; in some way or other without accidentally also activating currently -;; deactivated functions: +;; inactive functions: ;; ;; (ad-update-regexp "^fg-") ;; nil diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index df98271832a..19a4d44273d 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -446,7 +446,11 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE generated-autoload-load-name (autoload-file-load-name absfile))) (when (and outfile - (not (equal outfile (autoload-generated-file)))) + (not + (if (memq system-type '(ms-dos windows-nt)) + (equal (downcase outfile) + (downcase (autoload-generated-file))) + (equal outfile (autoload-generated-file))))) (setq otherbuf t)) (save-excursion (save-restriction diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el index 9ecd4e12020..bc1efc118ef 100644 --- a/lisp/emacs-lisp/avl-tree.el +++ b/lisp/emacs-lisp/avl-tree.el @@ -74,7 +74,7 @@ cmpfun) (defmacro avl-tree--root (tree) - ;; Return the root node for an avl-tree. INTERNAL USE ONLY. + ;; Return the root node for an AVL tree. INTERNAL USE ONLY. `(avl-tree--node-left (avl-tree--dummyroot ,tree))) (defsetf avl-tree--root (tree) (node) @@ -372,7 +372,7 @@ itself." ;;; INTERNAL USE ONLY (defun avl-tree--do-copy (root) - "Copy the avl tree with ROOT as root. Highly recursive." + "Copy the AVL tree with ROOT as root. Highly recursive." (if (null root) nil (avl-tree--node-create @@ -401,7 +401,7 @@ itself." ;; front of the STACK, until a leaf is reached. (let ((node (car (avl-tree--stack-store stack))) (dir (if (avl-tree--stack-reverse stack) 1 0))) - (when node ; check for emtpy stack + (when node ; check for empty stack (while (setq node (avl-tree--node-branch node dir)) (push node (avl-tree--stack-store stack)))))) @@ -411,21 +411,21 @@ itself." ;; define public alias for constructors so that we can set docstring (defalias 'avl-tree-create 'avl-tree--create - "Create an empty avl tree. + "Create an empty AVL tree. COMPARE-FUNCTION is a function which takes two arguments, A and B, and returns non-nil if A is less than B, and nil otherwise.") (defalias 'avl-tree-compare-function 'avl-tree--cmpfun - "Return the comparison function for the avl tree TREE. + "Return the comparison function for the AVL tree TREE. \(fn TREE)") (defun avl-tree-empty (tree) - "Return t if avl tree TREE is emtpy, otherwise return nil." + "Return t if AVL tree TREE is empty, otherwise return nil." (null (avl-tree--root tree))) (defun avl-tree-enter (tree data &optional updatefun) - "Insert DATA into the avl tree TREE. + "Insert DATA into the AVL tree TREE. If an element that matches DATA (according to the tree's comparison function, see `avl-tree-create') already exists in @@ -433,8 +433,8 @@ TREE, it will be replaced by DATA by default. If UPDATEFUN is supplied and an element matching DATA already exists in TREE, UPDATEFUN is called with two arguments: DATA, and -the matching element. Its return value replaces the existing -element. This value *must* itself match DATA (and hence the +the matching element. Its return value replaces the existing +element. This value *must* itself match DATA (and hence the pre-existing data), or an error will occur. Returns the new data." @@ -443,7 +443,7 @@ Returns the new data." 0 data updatefun))) (defun avl-tree-delete (tree data &optional test nilflag) - "Delete the element matching DATA from the avl tree TREE. + "Delete the element matching DATA from the AVL tree TREE. Matching uses the comparison function previously specified in `avl-tree-create' when TREE was created. @@ -456,7 +456,7 @@ distinguished from the case of a successfully deleted null element. If supplied, TEST specifies a test that a matching element must -pass before it is deleted. If a matching element is found, it is +pass before it is deleted. If a matching element is found, it is passed as an argument to TEST, and is deleted only if the return value is non-nil." (cdr (avl-tree--do-delete (avl-tree--cmpfun tree) @@ -465,14 +465,14 @@ value is non-nil." (defun avl-tree-member (tree data &optional nilflag) - "Return the element in the avl tree TREE which matches DATA. + "Return the element in the AVL tree TREE which matches DATA. Matching uses the comparison function previously specified in `avl-tree-create' when TREE was created. If there is no such element in the tree, nil is -returned. Optional argument NILFLAG specifies a value to return -instead of nil in this case. This allows non-existent elements to -be distinguished from a null element. (See also +returned. Optional argument NILFLAG specifies a value to return +instead of nil in this case. This allows non-existent elements to +be distinguished from a null element. (See also `avl-tree-member-p', which does this for you.)" (let ((node (avl-tree--root tree)) (compare-function (avl-tree--cmpfun tree))) @@ -488,15 +488,15 @@ be distinguished from a null element. (See also (defun avl-tree-member-p (tree data) - "Return t if an element matching DATA exists in the avl tree TREE, -otherwise return nil. Matching uses the comparison function + "Return t if an element matching DATA exists in the AVL tree TREE. +Otherwise return nil. Matching uses the comparison function previously specified in `avl-tree-create' when TREE was created." (let ((flag '(nil))) (not (eq (avl-tree-member tree data flag) flag)))) (defun avl-tree-map (__map-function__ tree &optional reverse) - "Modify all elements in the avl tree TREE by applying FUNCTION. + "Modify all elements in the AVL tree TREE by applying FUNCTION. Each element is replaced by the return value of FUNCTION applied to that element. @@ -512,7 +512,7 @@ descending order if REVERSE is non-nil." (defun avl-tree-mapc (__map-function__ tree &optional reverse) - "Apply FUNCTION to all elements in avl tree TREE, + "Apply FUNCTION to all elements in AVL tree TREE, for side-effect only. FUNCTION is applied to the elements in ascending order, or @@ -526,7 +526,7 @@ descending order if REVERSE is non-nil." (defun avl-tree-mapf (__map-function__ combinator tree &optional reverse) - "Apply FUNCTION to all elements in avl tree TREE, + "Apply FUNCTION to all elements in AVL tree TREE, and combine the results using COMBINATOR. The FUNCTION is applied and the results are combined in ascending @@ -545,7 +545,7 @@ order, or descending order if REVERSE is non-nil." (defun avl-tree-mapcar (__map-function__ tree &optional reverse) - "Apply FUNCTION to all elements in avl tree TREE, + "Apply FUNCTION to all elements in AVL tree TREE, and make a list of the results. The FUNCTION is applied and the list constructed in ascending @@ -578,7 +578,7 @@ is more efficient." (avl-tree--node-data node)))) (defun avl-tree-copy (tree) - "Return a copy of the avl tree TREE." + "Return a copy of the AVL tree TREE." (let ((new-tree (avl-tree-create (avl-tree--cmpfun tree)))) (setf (avl-tree--root new-tree) (avl-tree--do-copy (avl-tree--root tree))) new-tree)) @@ -600,7 +600,7 @@ is more efficient." treesize)) (defun avl-tree-clear (tree) - "Clear the avl tree TREE." + "Clear the AVL tree TREE." (setf (avl-tree--root tree) nil)) @@ -617,8 +617,8 @@ calling `avl-tree-stack-pop' will give unpredictable results). Operations on these objects are significantly more efficient than constructing a real stack with `avl-tree-flatten' and using -standard stack functions. As such, they can be useful in -implementing efficient algorithms of AVL trees. However, in cases +standard stack functions. As such, they can be useful in +implementing efficient algorithms of AVL trees. However, in cases where mapping functions `avl-tree-mapc', `avl-tree-mapcar' or `avl-tree-mapf' would be sufficient, it is better to use one of those instead." @@ -629,11 +629,11 @@ those instead." (defun avl-tree-stack-pop (avl-tree-stack &optional nilflag) "Pop the first element from AVL-TREE-STACK. -\(See also `avl-tree-stack'\). +\(See also `avl-tree-stack'). -Returns nil if the stack is empty, or NILFLAG if specified. (The -latter allows an empty stack to be distinguished from a null -element stored in the AVL tree.)" +Returns nil if the stack is empty, or NILFLAG if specified. +\(The latter allows an empty stack to be distinguished from +a null element stored in the AVL tree.)" (let (node next) (if (not (setq node (pop (avl-tree--stack-store avl-tree-stack)))) nilflag @@ -650,9 +650,9 @@ element stored in the AVL tree.)" "Return the first element of AVL-TREE-STACK, without removing it from the stack. -Returns nil if the stack is empty, or NILFLAG if specified. (The -latter allows an empty stack to be distinguished from a null -element stored in the AVL tree.)" +Returns nil if the stack is empty, or NILFLAG if specified. +\(The latter allows an empty stack to be distinguished from +a null element stored in the AVL tree.)" (or (car (avl-tree--stack-store avl-tree-stack)) nilflag)) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 0630f5f4e4e..c9027fb663d 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -135,7 +135,7 @@ ;; We'd have to notice defvars and defconsts, since those variables should ;; always be dynamic, and attempting to do a lexical binding of them ;; should simply do a dynamic binding instead. -;; But! We need to know about variables that were not necessarily defvarred +;; But! We need to know about variables that were not necessarily defvared ;; in the file being compiled (doing a boundp check isn't good enough.) ;; Fdefvar() would have to be modified to add something to the plist. ;; diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 3d593570c4e..9aa230cfe9b 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -178,9 +178,9 @@ adds `c' to it; otherwise adds `.elc'." ;; This can be the 'byte-compile property of any symbol. (autoload 'byte-compile-inline-expand "byte-opt") -;; This is the entrypoint to the lapcode optimizer pass1. +;; This is the entry point to the lapcode optimizer pass1. (autoload 'byte-optimize-form "byte-opt") -;; This is the entrypoint to the lapcode optimizer pass2. +;; This is the entry point to the lapcode optimizer pass2. (autoload 'byte-optimize-lapcode "byte-opt") (autoload 'byte-compile-unfold-lambda "byte-opt") diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index c6e157be776..daafd2226ec 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -67,7 +67,7 @@ ;; TODO: (not just for cconv but also for the lexbind changes in general) ;; - let (e)debug find the value of lexical variables from the stack. -;; - make eval-region do the eval-sexp-add-defvars danse. +;; - make eval-region do the eval-sexp-add-defvars dance. ;; - byte-optimize-form should be applied before cconv. ;; OTOH, the warnings emitted by cconv-analyze need to come before optimize ;; since afterwards they can because obnoxious (warnings about an "unused @@ -507,7 +507,7 @@ places where they originally did not directly appear." (defalias 'byte-compile-not-lexical-var-p 'boundp)) (defun cconv--analyse-use (vardata form varkind) - "Analyse the use of a variable. + "Analyze the use of a variable. VARDATA should be (BINDER READ MUTATED CAPTURED CALLED). VARKIND is the name of the kind of variable. FORM is the parent form that binds this var." @@ -559,7 +559,7 @@ FORM is the parent form that binds this var." (t (let ((varstruct (list arg nil nil nil nil))) (push (cons (list arg) (cdr varstruct)) newvars) (push varstruct newenv))))) - (dolist (form body) ;Analyse body forms. + (dolist (form body) ;Analyze body forms. (cconv-analyse-form form newenv)) ;; Summarize resulting data about arguments. (dolist (vardata newvars) @@ -612,7 +612,7 @@ and updates the data stored in ENV." (push (cons binder (cdr varstruct)) newvars) (push varstruct env)))) - (dolist (form body-forms) ; Analyse body forms. + (dolist (form body-forms) ; Analyze body forms. (cconv-analyse-form form env)) (dolist (vardata newvars) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index bf9f2c9d6ed..fae4d9adc38 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -233,10 +233,10 @@ or call the function `%s'.")))) (defun ,modefun (&optional arg ,@extra-args) ,(or doc (format (concat "Toggle %s on or off. -Interactively, with no prefix argument, toggle the mode. -With universal prefix ARG turn mode on. -With zero or negative ARG turn mode off. -\\{%s}") pretty-name keymap-sym)) +With a prefix argument ARG, enable %s if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. +\\{%s}") pretty-name pretty-name keymap-sym)) ;; Use `toggle' rather than (if ,mode 0 1) so that using ;; repeat-command still does the toggling correctly. (interactive (list (or current-prefix-arg 'toggle))) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 5e29a85d386..db3236afc1a 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -992,7 +992,7 @@ if default value is nil." ;; EML - Note: the only reason to override a class bound slot ;; is to change the default, so allow unbound in. - ;; If we have a repeat, only update the vlaue... + ;; If we have a repeat, only update the value... (eieio-perform-slot-validation-for-default a tp value skipnil) (setcar dp value)) diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index ba04a27021e..ce6f8348a6b 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1098,7 +1098,7 @@ optional prefix argument REINIT is non-nil." ;; This includes all the built-in and dumped things with documentation. (defun elint-scan-doc-file () "Scan the DOC file for function and variables. -Marks the function wih their arguments, and returns a list of variables." +Marks the function with their arguments, and returns a list of variables." ;; Cribbed from help-fns.el. (let ((docbuf " *DOC*") vars sym args) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index d43ba6c0d3e..afc8c7faa47 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -579,7 +579,7 @@ PREC2 is a table as returned by `smie-precs->prec2' or (smie-debug--describe-cycle table (smie-debug--prec2-cycle csts))))) (incf i 10)) - ;; Propagate equalities back to their source. + ;; Propagate equality constraints back to their sources. (dolist (eq (nreverse eqs)) (when (null (cadr eq)) ;; There's an equality constraint, but we still haven't given diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index 8f991575eda..a5a6f71d79e 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -220,7 +220,7 @@ non-nil, byte-compiles each function after instrumenting." (defun testcover-reinstrument (form) "Reinstruments FORM to use testcover instead of edebug. This function modifies the list that FORM points to. Result is nil if -FORM should return multiple vlues, t if should always return same +FORM should return multiple values, t if should always return same value, 'maybe if either is acceptable." (let ((fun (car-safe form)) id val) |