commit 87b82a1969edf80d3bd4781454ec9fc968773a6d (HEAD, refs/remotes/origin/master) Author: Eric Abrahamsen Date: Sat Dec 19 15:25:14 2020 -0800 Fix default value of gnus-registry-register-all: should be t * lisp/gnus/gnus-registry.el (gnus-registry-register-all): This was meant to default to t; only an oversight during code review left it as nil. diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index 31aee0364c..72412595a9 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -163,7 +163,7 @@ nnmairix groups are specifically excluded because they are ephemeral." (const :tag "Always Install" t) (const :tag "Ask Me" ask))) -(defcustom gnus-registry-register-all nil +(defcustom gnus-registry-register-all t "If non-nil, register all articles in the registry." :type 'boolean :version "28.1") @@ -1094,7 +1094,7 @@ only the last one's marks are returned." (defun gnus-registry-get-or-make-entry (id &optional no-create) "Return registry entry for ID. -If entry is not found, create a new one, unless NO-create is +If entry is not found, create a new one, unless NO-CREATE is non-nil." (let* ((db gnus-registry-db) ;; safe if not found commit 32e781b2f1e2cbf2bed323247b13dca3ed53fc71 Author: Dmitry Gutov Date: Sun Dec 20 00:16:32 2020 +0200 Jamie Beardslee * lisp/progmodes/project.el (project-execute-extended-command): New command. (project-prefix-map): Binding for it. Copyright-paperwork-exempt: yes diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index d786c3f967..5b58090de0 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -631,6 +631,7 @@ DIRS must contain directory names." (define-key map "g" 'project-find-regexp) (define-key map "G" 'project-or-external-find-regexp) (define-key map "r" 'project-query-replace-regexp) + (define-key map "x" 'project-execute-extended-command) map) "Keymap for project commands.") @@ -1246,6 +1247,14 @@ It's also possible to enter an arbitrary directory not in the list." (project--ensure-read-project-list) (mapcar #'car project--list)) +;;;###autoload +(defun project-execute-extended-command () + "Execute an extended command in project root." + (declare (interactive-only command-execute)) + (interactive) + (let ((default-directory (project-root (project-current t)))) + (call-interactively #'execute-extended-command))) + ;;; Project switching commit b9edbaed01a91d5fc6235fc679d8e0cd827f6fa9 Author: Juri Linkov Date: Sat Dec 19 22:19:18 2020 +0200 * lisp/image-mode.el: Use one timer and lock for slow remote calls (bug#45256) * lisp/image-mode.el (image-auto-resize-timer): New variable. (image--window-state-change): Cancel previous timer and remember new timer in image-auto-resize-timer. (image--window-state-change): New variable. (image-fit-to-window): When image-fit-to-window-lock is nil, call image-toggle-display-image ignoring 'remote-file-error'. diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 032ebf3873..465bf86762 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -942,6 +942,9 @@ Otherwise, display the image by calling `image-mode'." (get-buffer-window-list (current-buffer) 'nomini 'visible)) (image-toggle-display-image))) +(defvar image-auto-resize-timer nil + "Timer for `image-auto-resize-on-window-resize' option.") + (defun image--window-state-change (window) ;; Wait for a bit of idle-time before actually performing the change, ;; so as to batch together sequences of closely consecutive size changes. @@ -950,8 +953,14 @@ Otherwise, display the image by calling `image-mode'." ;; consecutive calls happen without any redisplay between them, ;; the costly operation of image resizing should happen only once. (when (numberp image-auto-resize-on-window-resize) - (run-with-idle-timer image-auto-resize-on-window-resize nil - #'image-fit-to-window window))) + (when image-auto-resize-timer + (cancel-timer image-auto-resize-timer)) + (setq image-auto-resize-timer + (run-with-idle-timer image-auto-resize-on-window-resize nil + #'image-fit-to-window window)))) + +(defvar image-fit-to-window-lock nil + "Lock for `image-fit-to-window' timer function.") (defun image-fit-to-window (window) "Adjust size of image to display it exactly in WINDOW boundaries." @@ -968,7 +977,13 @@ Otherwise, display the image by calling `image-mode'." (when (and image-width image-height (or (not (= image-width window-width)) (not (= image-height window-height)))) - (image-toggle-display-image))))))))) + (unless image-fit-to-window-lock + (unwind-protect + (progn + (setq-local image-fit-to-window-lock t) + (ignore-error 'remote-file-error + (image-toggle-display-image))) + (setq image-fit-to-window-lock nil))))))))))) ;;; Animated images commit 5fe04f6b0773279a46b0449f0c890af3a03fb649 Author: Juri Linkov Date: Sat Dec 19 22:12:32 2020 +0200 No need to set isearch-input-method-function in isearch-transient-input-method diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el index 867a3d8697..1f5f8b7e32 100644 --- a/lisp/international/isearch-x.el +++ b/lisp/international/isearch-x.el @@ -55,7 +55,6 @@ (interactive) (let ((overriding-terminal-local-map nil)) (activate-transient-input-method)) - (setq isearch-input-method-function input-method-function) (setq-local input-method-function nil) (isearch-update)) commit 7c3d3b83358842857a0af99b89983cfa9a5512a1 Author: Stefan Kangas Date: Sat Dec 19 19:54:46 2020 +0100 Convert apropos-internal from C to Lisp (Bug#44529) This runs insignificantly faster in C, and is already fast enough on reasonably modern hardware. We might as well lift it to Lisp. This benchmark can be used to verify: (benchmark-run 10 (apropos-command "test")) => (0.12032415399999999 2 0.014772391999999995) ; C => (0.13513192100000002 2 0.017216643000000004) ; Lisp * lisp/subr.el (apropos-internal): New defun, converted from C. * src/keymap.c (Fapropos_internal): Remove defun. (apropos_accum): Remove function. (apropos_predicate, apropos_accumulate): Remove variables. (syms_of_keymap): Remove defsubr for Fapropos_internal, and definitions of the above variables. * test/src/keymap-tests.el (keymap-apropos-internal) (keymap-apropos-internal/predicate): Move tests from here... * test/lisp/subr-tests.el (apropos-apropos-internal) (apropos-apropos-internal/predicate): ...to here. diff --git a/lisp/subr.el b/lisp/subr.el index 77c19c5bbf..1b2d778454 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -5845,6 +5845,22 @@ This is the simplest safe way to acquire and release a mutex." (progn ,@body) (mutex-unlock ,sym))))) + +;;; Apropos. + +(defun apropos-internal (regexp &optional predicate) + "Show all symbols whose names contain match for REGEXP. +If optional 2nd arg PREDICATE is non-nil, (funcall PREDICATE SYMBOL) is done +for each symbol and a symbol is mentioned only if that returns non-nil. +Return list of symbols found." + (let (found) + (mapatoms (lambda (symbol) + (when (and (string-match regexp (symbol-name symbol)) + (or (not predicate) + (funcall predicate symbol))) + (push symbol found)))) + (sort found #'string-lessp))) + ;;; Misc. diff --git a/src/keymap.c b/src/keymap.c index e22eb411f6..ca2d33dba4 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -3243,49 +3243,11 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, } } -/* Apropos - finding all symbols whose names match a regexp. */ -static Lisp_Object apropos_predicate; -static Lisp_Object apropos_accumulate; - -static void -apropos_accum (Lisp_Object symbol, Lisp_Object string) -{ - register Lisp_Object tem; - - tem = Fstring_match (string, Fsymbol_name (symbol), Qnil); - if (!NILP (tem) && !NILP (apropos_predicate)) - tem = call1 (apropos_predicate, symbol); - if (!NILP (tem)) - apropos_accumulate = Fcons (symbol, apropos_accumulate); -} - -DEFUN ("apropos-internal", Fapropos_internal, Sapropos_internal, 1, 2, 0, - doc: /* Show all symbols whose names contain match for REGEXP. -If optional 2nd arg PREDICATE is non-nil, (funcall PREDICATE SYMBOL) is done -for each symbol and a symbol is mentioned only if that returns non-nil. -Return list of symbols found. */) - (Lisp_Object regexp, Lisp_Object predicate) -{ - Lisp_Object tem; - CHECK_STRING (regexp); - apropos_predicate = predicate; - apropos_accumulate = Qnil; - map_obarray (Vobarray, apropos_accum, regexp); - tem = Fsort (apropos_accumulate, Qstring_lessp); - apropos_accumulate = Qnil; - apropos_predicate = Qnil; - return tem; -} - void syms_of_keymap (void) { DEFSYM (Qkeymap, "keymap"); DEFSYM (Qdescribe_map_tree, "describe-map-tree"); - staticpro (&apropos_predicate); - staticpro (&apropos_accumulate); - apropos_predicate = Qnil; - apropos_accumulate = Qnil; DEFSYM (Qkeymap_canonicalize, "keymap-canonicalize"); @@ -3429,7 +3391,6 @@ be preferred. */); defsubr (&Stext_char_description); defsubr (&Swhere_is_internal); defsubr (&Sdescribe_buffer_bindings); - defsubr (&Sapropos_internal); } void diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el index e275e4b1c8..25da19574a 100644 --- a/test/lisp/subr-tests.el +++ b/test/lisp/subr-tests.el @@ -597,6 +597,18 @@ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350." (undo-boundary) (undo) (should (equal (buffer-string) "")))) + +;;; Apropos. + +(ert-deftest apropos-apropos-internal () + (should (equal (apropos-internal "^next-line$") '(next-line))) + (should (>= (length (apropos-internal "^help")) 100)) + (should-not (apropos-internal "^test-a-missing-symbol-foo-bar-zot$"))) + +(ert-deftest apropos-apropos-internal/predicate () + (should (equal (apropos-internal "^next-line$" #'commandp) '(next-line))) + (should (>= (length (apropos-internal "^help" #'commandp)) 15)) + (should-not (apropos-internal "^next-line$" #'keymapp))) (provide 'subr-tests) ;;; subr-tests.el ends here diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el index 6411cd1f0d..f58dac8740 100644 --- a/test/src/keymap-tests.el +++ b/test/src/keymap-tests.el @@ -248,19 +248,6 @@ g .. h foo 0 .. 3 foo "))))) - -;;;; apropos-internal - -(ert-deftest keymap-apropos-internal () - (should (equal (apropos-internal "^next-line$") '(next-line))) - (should (>= (length (apropos-internal "^help")) 100)) - (should-not (apropos-internal "^test-a-missing-symbol-foo-bar-zut$"))) - -(ert-deftest keymap-apropos-internal/predicate () - (should (equal (apropos-internal "^next-line$" #'commandp) '(next-line))) - (should (>= (length (apropos-internal "^help" #'commandp)) 15)) - (should-not (apropos-internal "^next-line$" #'keymapp))) - (provide 'keymap-tests) ;;; keymap-tests.el ends here commit 34a73666d9559d948815a53b63dc36cc878d5aff Author: Stefan Kangas Date: Sat Dec 19 17:14:33 2020 +0100 Shorten some over-wide docstrings in functions and macros * lisp/allout-widgets.el (allout-widgets-tally-string): * lisp/array.el (array-mode): * lisp/calc/calc-units.el (calc-spn): * lisp/cedet/ede/generic.el (ede-generic-new-autoloader): * lisp/cedet/semantic/analyze.el (semantic-analyze-find-tag-sequence-default) (semantic-analyze-find-tag-sequence): * lisp/cedet/semantic/bovine/c.el (semantic-c-evaluate-symbol-for-hideif): * lisp/cedet/semantic/bovine/make.el (semantic-lex-make-command): * lisp/cedet/semantic/db-typecache.el (semanticdb-typecache-include-tags): * lisp/cedet/semantic/doc.el (semantic-documentation-for-tag): * lisp/cedet/semantic/tag-ls.el (semantic--tag-attribute-similar-p): * lisp/emacs-lisp/advice.el (ad-map-arglists): * lisp/emacs-lisp/bytecomp.el (byte-constant2) (byte-save-restriction, byte-catch-OBSOLETE, byte-unwind-protect): * lisp/emacs-lisp/cl-generic.el (cl-generic-combine-methods): * lisp/emacs-lisp/seq.el (seq-partition, seq-set-equal-p) (seq-filter): * lisp/faces.el (face-attribute-specified-or, face-equal): * lisp/info.el (Info-prev-reference-or-link) (Info-next-reference-or-link): * lisp/isearch.el (with-isearch-suspended): * lisp/kmacro.el (kmacro-step-edit-macro, kmacro-set-counter): * lisp/org/org-agenda.el (org-agenda-filter-by-category): * lisp/ses.el (ses-cell-symbol): * lisp/w32-fns.el (w32-shell-dos-semantics): Shorten doc strings to not exceed 80-column limits. (Bug#44858) diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 7e7957762b..21517aea01 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -254,7 +254,7 @@ or deleted while this variable is nil.") (defvar allout-widgets-mode-inhibit) ; defined below ;;;_ > allout-widgets-tally-string (defun allout-widgets-tally-string () - "Return a string giving the number of tracked widgets, or empty string if not tracking. + "Return a string with number of tracked widgets, or empty string if not tracking. The string is formed for appending to the allout-mode mode-line lighter. diff --git a/lisp/array.el b/lisp/array.el index 0ad565b5bc..de2de3ce6c 100644 --- a/lisp/array.el +++ b/lisp/array.el @@ -817,14 +817,16 @@ The variables are: Variables you assign: array-max-row: The number of rows in the array. array-max-column: The number of columns in the array. - array-columns-per-line: The number of columns in the array per line of buffer. + array-columns-per-line: The number of columns in the array + per line of buffer. array-field-width: The width of each field, in characters. array-rows-numbered: A logical variable describing whether to ignore - row numbers in the buffer. + row numbers in the buffer. Variables which are calculated: array-line-length: The number of characters in a buffer line. - array-lines-per-row: The number of buffer lines used to display each row. + array-lines-per-row: The number of buffer lines used to + display each row. The following commands are available (an asterisk indicates it may take a numeric prefix argument): @@ -834,17 +836,17 @@ take a numeric prefix argument): * \\[array-next-row] Move down one row. * \\[array-previous-row] Move up one row. - * \\[array-copy-forward] Copy the current field into the column to the right. - * \\[array-copy-backward] Copy the current field into the column to the left. - * \\[array-copy-down] Copy the current field into the row below. - * \\[array-copy-up] Copy the current field into the row above. + * \\[array-copy-forward] Copy current field into the column to the right. + * \\[array-copy-backward] Copy current field into the column to the left. + * \\[array-copy-down] Copy current field into the row below. + * \\[array-copy-up] Copy current field into the row above. - * \\[array-copy-column-forward] Copy the current column into the column to the right. - * \\[array-copy-column-backward] Copy the current column into the column to the left. + * \\[array-copy-column-forward] Copy current column into the column to the right. + * \\[array-copy-column-backward] Copy current column into the column to the left. * \\[array-copy-row-down] Copy the current row into the row below. * \\[array-copy-row-up] Copy the current row into the row above. - \\[array-fill-rectangle] Copy the field at mark into every cell with row and column + \\[array-fill-rectangle] Copy field at mark into every cell with row and column between that of point and mark. \\[array-what-position] Display the current array row and column. @@ -855,7 +857,7 @@ take a numeric prefix argument): \\[array-expand-rows] Expand the array (remove row numbers and newlines inside rows) - \\[array-display-local-variables] Display the current values of local variables. + \\[array-display-local-variables] Display current values of local variables. Entering array mode calls the function `array-mode-hook'." (make-local-variable 'array-buffer-line) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 742b2bb872..e2ef6ee6ba 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -2157,7 +2157,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." (calc-unary-op "midi" 'calcFunc-midi arg))) (defun calc-spn (arg) - "Return the scientific pitch notation corresponding to the expression on the stack." + "Return scientific pitch notation corresponding to the expression on the stack." (interactive "P") (calc-slow-wrapper (calc-unary-op "spn" 'calcFunc-spn arg))) diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index b9805f6fac..0f202ddfc8 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -258,8 +258,8 @@ If one doesn't exist, create a new one for this directory." INTERNAL-NAME is obsolete and ignored. EXTERNAL-NAME is a human readable name to describe the project; it must be unique among all autoloaded projects. -PROJECTFILE is a file name that identifies a project of this type to EDE, such as -a Makefile, or SConstruct file. +PROJECTFILE is a file name that identifies a project of this type to EDE, such +as a Makefile, or SConstruct file. CLASS is the EIEIO class that is used to track this project. It should subclass `ede-generic-project'." (ede-add-project-autoload diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index cafdc3bee1..f2d2279c00 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -235,7 +235,8 @@ scoped. These are not local variables, but symbols available in a structure which doesn't need to be dereferenced. Optional argument TYPERETURN is a symbol in which the types of all found will be stored. If nil, that data is thrown away. -Optional argument THROWSYM specifies a symbol the throw on non-recoverable error. +Optional argument THROWSYM specifies a symbol the throw on non-recoverable +error. Remaining arguments FLAGS are additional flags to apply when searching.") (defun semantic-analyze-find-tag-sequence-default @@ -246,7 +247,8 @@ Remaining arguments FLAGS are additional flags to apply when searching.") SCOPE are extra tags which are in scope. TYPERETURN is a symbol in which to place a list of tag classes that are found in SEQUENCE. -Optional argument THROWSYM specifies a symbol the throw on non-recoverable error. +Optional argument THROWSYM specifies a symbol the throw on non-recoverable +error. Remaining arguments FLAGS are additional flags to apply when searching. This function knows of flags: `mustbeclassvariable'" diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 3649d1c2f1..7f0c16136c 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -368,7 +368,8 @@ Take the first interesting thing and convert it." (defun semantic-c-evaluate-symbol-for-hideif (spp-symbol) "Lookup the symbol SPP-SYMBOL (a string) to something hideif can use. -Pulls out the symbol list, and call `semantic-c-convert-spp-value-to-hideif-value'." +Pull out the symbol list, and call +`semantic-c-convert-spp-value-to-hideif-value'." (interactive "sSymbol name: ") (when (symbolp spp-symbol) (setq spp-symbol (symbol-name spp-symbol))) diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el index 07c55b46e2..3ca7dcd48e 100644 --- a/lisp/cedet/semantic/bovine/make.el +++ b/lisp/cedet/semantic/bovine/make.el @@ -50,7 +50,8 @@ nil) (define-lex-regex-analyzer semantic-lex-make-command - "A command in a Makefile consists of a line starting with TAB, and ending at the newline." + "Regexp for a command in a Makefile. +It consists of a line starting with TAB, and ending at the newline." "^\\(\t\\)" (let ((start (match-end 0))) (while (progn (end-of-line) diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 09f0e52e44..3b6f70ab32 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -343,7 +343,7 @@ all included files." nil) (cl-defmethod semanticdb-typecache-include-tags ((table semanticdb-table)) - "Update the typecache for TABLE, and return the merged types from the include tags. + "Update typecache for TABLE, and return the merged types from the include tags. Include-tags are the tags brought in via includes, all merged together into a master list." (let* ((cache (semanticdb-get-typecache table)) diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el index 896bc3bb42..e84e99e1e8 100644 --- a/lisp/cedet/semantic/doc.el +++ b/lisp/cedet/semantic/doc.el @@ -40,7 +40,7 @@ TAG might have DOCUMENTATION set in it already. If not, there may be some documentation in a comment preceding TAG's definition which we can look for. When appropriate, this can be overridden by a language specific enhancement. -Optional argument NOSNARF means to only return the lexical analyzer token for it. +Optional argument NOSNARF means return only the lexical analyzer token for it. If NOSNARF is `lex', then only return the lex token." (if (not tag) (setq tag (semantic-current-tag))) (save-excursion diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index 3ee11df7d8..d07e565248 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -93,8 +93,9 @@ for a given mode at a more granular level. Note that :type, :name, and anything in IGNORABLE-ATTRIBUTES will not be passed to this function. -Modes that override this function can call `semantic--tag-attribute-similar-p-default' -to do the default equality tests if ATTR is not special for that mode.") +Modes that override this function can call +`semantic--tag-attribute-similar-p-default' to do the default equality tests if +ATTR is not special for that mode.") (defun semantic--tag-attribute-similar-p-default (attr value1 value2 ignorable-attributes) "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarity." diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index c8a6676b66..caa436ce23 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -2405,8 +2405,9 @@ as if they had been supplied to a function with TARGET-ARGLIST directly. Excess source arguments will be neglected, missing source arguments will be supplied as nil. Returns a `funcall' or `apply' form with the second element being `function' which has to be replaced by an actual function argument. -Example: (ad-map-arglists \\='(a &rest args) \\='(w x y z)) will return - (funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))." +Example: + (ad-map-arglists \\='(a &rest args) \\='(w x y z)) will return + (funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))." (let* ((parsed-source-arglist (ad-parse-arglist source-arglist)) (source-reqopt-args (append (nth 0 parsed-source-arglist) (nth 1 parsed-source-arglist))) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 64f2c01082..7e1a3304cc 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -707,7 +707,8 @@ Each element is (INDEX . VALUE)") ;; These store their argument in the next two bytes (byte-defop 129 1 byte-constant2 - "for reference to a constant with vector index >= byte-constant-limit") + "for reference to a constant with vector +index >= byte-constant-limit") (byte-defop 130 0 byte-goto "for unconditional jump") (byte-defop 131 -1 byte-goto-if-nil "to pop value and jump if it's nil") (byte-defop 132 -1 byte-goto-if-not-nil "to pop value and jump if it's not nil") @@ -727,11 +728,14 @@ otherwise pop it") (byte-defop 139 0 byte-save-window-excursion-OBSOLETE "to make a binding to record entire window configuration") (byte-defop 140 0 byte-save-restriction - "to make a binding to record the current buffer clipping restrictions") + "to make a binding to record the current buffer clipping +restrictions") (byte-defop 141 -1 byte-catch-OBSOLETE ; Not generated since Emacs 25. - "for catch. Takes, on stack, the tag and an expression for the body") + "for catch. Takes, on stack, the tag and an expression for +the body") (byte-defop 142 -1 byte-unwind-protect - "for unwind-protect. Takes, on stack, an expression for the unwind-action") + "for unwind-protect. Takes, on stack, an expression for +the unwind-action") ;; For condition-case. Takes, on stack, the variable to bind, ;; an expression for the body, and a list of clauses. @@ -791,8 +795,8 @@ otherwise pop it") (defconst byte-discardN-preserve-tos byte-discardN) (byte-defop 183 -2 byte-switch - "to take a hash table and a value from the stack, and jump to the address -the value maps to, if any.") + "to take a hash table and a value from the stack, and jump to +the address the value maps to, if any.") ;; unused: 182-191 diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index b37b05b9a3..9ddf9e7333 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -811,8 +811,8 @@ It should return a function that expects the same arguments as the methods, and GENERIC is the generic function (mostly used for its name). METHODS is the list of the selected methods. The METHODS list is sorted from most specific first to most generic last. -The function can use `cl-generic-call-method' to create functions that call those -methods.") +The function can use `cl-generic-call-method' to create functions that call +those methods.") (unless (ignore-errors (cl-generic-generalizers t)) ;; Temporary definition to let the next defmethod succeed. diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index 4656277ea1..d91a33c140 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -317,7 +317,7 @@ list." ;;;###autoload (cl-defgeneric seq-filter (pred sequence) - "Return a list of all the elements for which (PRED element) is non-nil in SEQUENCE." + "Return a list of all elements for which (PRED element) is non-nil in SEQUENCE." (let ((exclude (make-symbol "exclude"))) (delq exclude (seq-map (lambda (elt) (if (funcall pred elt) @@ -411,7 +411,8 @@ Equality is defined by TESTFN if non-nil or by `equal' if nil." nil)) (cl-defgeneric seq-set-equal-p (sequence1 sequence2 &optional testfn) - "Return non-nil if SEQUENCE1 and SEQUENCE2 contain the same elements, regardless of order. + "Return non-nil if SEQUENCE1 and SEQUENCE2 contain the same elements. +This does not depend on the order of the elements. Equality is defined by TESTFN if non-nil or by `equal' if nil." (and (seq-every-p (lambda (item1) (seq-contains-p sequence2 item1 testfn)) sequence1) (seq-every-p (lambda (item2) (seq-contains-p sequence1 item2 testfn)) sequence2))) @@ -444,7 +445,7 @@ The result is a sequence of type TYPE, or a list if TYPE is nil." (seq-map function sequence))) (cl-defgeneric seq-partition (sequence n) - "Return a list of the elements of SEQUENCE grouped into sub-sequences of length N. + "Return list of elements of SEQUENCE grouped into sub-sequences of length N. The last sequence may contain less than N elements. If N is a negative integer or 0, nil is returned." (unless (< n 1) diff --git a/lisp/faces.el b/lisp/faces.el index 7355e1dd0a..d0307fe173 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -272,7 +272,7 @@ of a face name is the same for all frames." (defun face-equal (face1 face2 &optional frame) "Non-nil if faces FACE1 and FACE2 are equal. Faces are considered equal if all their attributes are equal. -If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame. +If optional argument FRAME is given, report on FACE1 and FACE2 in that frame. If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames). If FRAME is omitted or nil, use the selected frame." (internal-lisp-face-equal-p face1 face2 frame)) @@ -484,7 +484,7 @@ FACES may be either a single face or a list of faces. (defmacro face-attribute-specified-or (value &rest body) - "Return VALUE, unless it's `unspecified', in which case evaluate BODY and return the result." + "Return VALUE or, if it's `unspecified', the result of evaluating BODY." (let ((temp (make-symbol "value"))) `(let ((,temp ,value)) (if (not (eq ,temp 'unspecified)) diff --git a/lisp/info.el b/lisp/info.el index c049aa88a5..efaf440d19 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -3105,9 +3105,11 @@ See `Info-scroll-down'." (defun Info-next-reference-or-link (pat prop) "Move point to the next pattern-based cross-reference or property-based link. The next cross-reference is searched using the regexp PAT, and the next link -is searched using the text property PROP. Move point to the closest found position -of either a cross-reference found by `re-search-forward' or a link found by -`next-single-char-property-change'. Return the new position of point, or nil." +is searched using the text property PROP. Move point to the closest found +position of either a cross-reference found by `re-search-forward' or a link +found by `next-single-char-property-change'. + +Return the new position of point, or nil." (let ((pxref (save-excursion (re-search-forward pat nil t))) (plink (next-single-char-property-change (point) prop))) (when (and (< plink (point-max)) (not (get-char-property plink prop))) @@ -3120,10 +3122,12 @@ of either a cross-reference found by `re-search-forward' or a link found by (defun Info-prev-reference-or-link (pat prop) "Move point to the previous pattern-based cross-reference or property-based link. -The previous cross-reference is searched using the regexp PAT, and the previous link -is searched using the text property PROP. Move point to the closest found position -of either a cross-reference found by `re-search-backward' or a link found by -`previous-single-char-property-change'. Return the new position of point, or nil." +The previous cross-reference is searched using the regexp PAT, and the previous +link is searched using the text property PROP. Move point to the closest found +position of either a cross-reference found by `re-search-backward' or a link +found by `previous-single-char-property-change'. + +Return the new position of point, or nil." (let ((pxref (save-excursion (re-search-backward pat nil t))) (plink (previous-single-char-property-change (point) prop))) (when (and (> plink (point-min)) (not (get-char-property plink prop))) diff --git a/lisp/isearch.el b/lisp/isearch.el index 0d5c480c8d..13173a2857 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1603,7 +1603,8 @@ If this is set inside code wrapped by the macro "Exit Isearch mode, run BODY, and reinvoke the pending search. You can update the global isearch variables by setting new values to `isearch-new-string', `isearch-new-message', `isearch-new-forward', -`isearch-new-regexp-function', `isearch-new-case-fold', `isearch-new-nonincremental'." +`isearch-new-regexp-function', `isearch-new-case-fold', +`isearch-new-nonincremental'." ;; This code is very hairy for several reasons, explained in the code. ;; Mainly, isearch-mode must be terminated while editing and then restarted. ;; If there were a way to catch any change of buffer from the minibuffer, diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 3437dba5e6..17db48c329 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -289,7 +289,8 @@ the last increment." (defun kmacro-set-counter (arg) "Set the value of `kmacro-counter' to ARG, or prompt for value if no argument. -With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro." +With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the +macro." (interactive "NMacro counter value: ") (if (not (or defining-kbd-macro executing-kbd-macro)) (kmacro-display-counter (setq kmacro-initial-counter-value arg)) @@ -1272,7 +1273,8 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (defun kmacro-step-edit-macro () "Step edit and execute last keyboard macro. -To customize possible responses, change the \"bindings\" in `kmacro-step-edit-map'." +To customize possible responses, change the \"bindings\" in +`kmacro-step-edit-map'." (interactive) (let ((kmacro-step-edit-active t) (kmacro-step-edit-new-macro "") diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 5a2ba027f9..cd63b0ebef 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -7558,7 +7558,8 @@ With a prefix argument, do so in all agenda buffers." "Filter lines in the agenda buffer that have a specific category. The category is that of the current line. With a `\\[universal-argument]' prefix argument, exclude the lines of that category. -When there is already a category filter in place, this command removes the filter." +When there is already a category filter in place, this command removes the +filter." (interactive "P") (if (and org-agenda-filtered-by-category org-agenda-category-filter) diff --git a/lisp/ses.el b/lisp/ses.el index bfafc132bf..2a28ad3add 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -430,7 +430,8 @@ when to emit a progress message.") local-printer-list) (defmacro ses-cell-symbol (row &optional col) - "From a CELL or a pair (ROW,COL), get the symbol that names the local-variable holding its value. (0,0) => A1." + "Return symbol of the local-variable holding value of CELL or pair (ROW,COL). +For example, (0,0) => A1." (declare (debug t)) `(ses-cell--symbol ,(if col `(ses-get-cell ,row ,col) row))) (put 'ses-cell-symbol 'safe-function t) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index e159d1888e..f1dcc54043 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -55,7 +55,7 @@ w32-system-shells))) (defun w32-shell-dos-semantics () - "Return non-nil if the interactive shell being used expects MS-DOS shell semantics." + "Return non-nil if current interactive shell expects MS-DOS shell semantics." (or (w32-system-shell-p (w32-shell-name)) (and (member (downcase (file-name-nondirectory (w32-shell-name))) '("cmdproxy" "cmdproxy.exe")) commit f88a7897a80ee9129bdc444cafff32d026c4b6d8 Author: Stefan Kangas Date: Sat Dec 19 17:35:50 2020 +0100 Shorten over-wide docstrings in variables * lisp/cedet/semantic/util-modes.el (semantic-highlight-func-popup-menu): * lisp/emacs-lisp/elint.el (elint-top-form-logged): * lisp/erc/erc-dcc.el (erc-dcc-list): * lisp/expand.el (expand-pos): * lisp/font-lock.el (cpp-font-lock-keywords-source-depth): * lisp/gnus/gnus-sum.el (gnus-sort-gathered-threads-function): * lisp/gnus/message.el (message-cite-style-thunderbird): * lisp/gnus/nnmh.el (nnmh-be-safe): * lisp/gnus/nntp.el (nntp-open-telnet-envuser): * lisp/international/mule-cmds.el (current-transient-input-method): * lisp/net/tramp.el (tramp-file-name-structure): * lisp/org/ob-R.el (org-babel-R-write-object-command): * lisp/org/org-attach.el (org-attach-after-change-hook): * lisp/org/org.el (org-stamp-time-of-day-regexp): * lisp/progmodes/elisp-mode.el (elisp-xref-find-def-functions): * lisp/progmodes/ruby-mode.el (ruby-block-mid-re): * lisp/progmodes/verilog-mode.el (verilog-cache-enabled): * lisp/term.el (term-scroll-end): * lisp/textmodes/table.el (table-command-remap-alist) (table-inhibit-auto-fill-paragraph, table-command-remap-alist): * lisp/vc/ediff-diff.el (ediff-ignore-similar-regions): * lisp/vc/ediff-wind.el (ediff-mouse-pixel-threshold): * lisp/vc/smerge-mode.el (smerge-refine-ignore-whitespace): * lisp/vc/vc.el (vc-log-short-style): * lisp/view.el (view-exit-action): Shorten doc strings to not exceed 80-column limits. (Bug#44858) diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 776c6b1894..8bfee432c3 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -837,7 +837,8 @@ Argument EVENT describes the event that caused this function to be called." "Keymap for highlight-func minor mode.") (defvar semantic-highlight-func-popup-menu nil - "Menu used if the user clicks on the header line used by `semantic-highlight-func-mode'.") + "Menu used if the user clicks on the header line. +Used by `semantic-highlight-func-mode'.") (easy-menu-define semantic-highlight-func-popup-menu diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 79b72ff969..d0a0389b3b 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -521,7 +521,7 @@ Return nil if there are no more forms, t otherwise." "The currently linted top form, or nil.") (defvar elint-top-form-logged nil - "The value t if the currently linted top form has been mentioned in the log buffer.") + "Non-nil if the currently linted top form has been mentioned in the log buffer.") (defun elint-top-form (form) "Lint a top FORM." diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index 1bce986a80..04508a44b6 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -83,7 +83,8 @@ All values of the list must be uppercase strings.") (defvar erc-dcc-list nil "List of DCC connections. Looks like: - ((:nick \"nick!user@host\" :type GET :peer proc :parent proc :size size :file file) + ((:nick \"nick!user@host\" :type GET :peer proc + :parent proc :size size :file file) (:nick \"nick!user@host\" :type CHAT :peer proc :parent proc) (:nick \"nick\" :type SEND :peer server-proc :parent parent-proc :file file :sent :confirmed )) diff --git a/lisp/expand.el b/lisp/expand.el index 77e4fc2657..c4e1d22790 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -290,7 +290,7 @@ If ARG is omitted, point is placed at the end of the expanded text." (defvar expand-list nil "Temporary variable used by the Expand package.") (defvar expand-pos nil - "If non-nil, stores a vector containing markers to positions defined by the last expansion.") + "If non-nil, store a vector with position markers defined by the last expansion.") (make-variable-buffer-local 'expand-pos) (defvar expand-index 0 diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 0e771e8e0a..a2cf71f946 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -2280,8 +2280,8 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item." ;; "ifndef" "import" "include" "line" "pragma" "undef" "warning"))) ;; (defconst cpp-font-lock-keywords-source-depth 0 - "An integer representing regular expression depth of `cpp-font-lock-keywords-source-directives'. -Used in `cpp-font-lock-keywords'.") + "Regular expression depth of `cpp-font-lock-keywords-source-directives'. +This should be an integer. Used in `cpp-font-lock-keywords'.") (defconst cpp-font-lock-keywords (let* ((directives cpp-font-lock-keywords-source-directives) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index b8b055c02c..a0e7173998 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -1400,7 +1400,7 @@ the normal Gnus MIME machinery." (defvar gnus-thread-indent-array nil) (defvar gnus-thread-indent-array-level gnus-thread-indent-level) (defvar gnus-sort-gathered-threads-function #'gnus-thread-sort-by-number - "Function called to sort the articles within a thread after it has been gathered together.") + "Function to sort articles within a thread after it has been gathered together.") (defvar gnus-summary-save-parts-type-history nil) (defvar gnus-summary-save-parts-last-directory mm-default-directory) @@ -1526,7 +1526,7 @@ the type of the variable (string, integer, character, etc).") "Default shell command on article.") (defvar gnus-newsgroup-agentized nil - "Locally bound in each summary buffer to indicate whether the server has been agentized.") + "Locally bound in each summary buffer to indicate if server has been agentized.") (defvar gnus-newsgroup-begin nil) (defvar gnus-newsgroup-end nil) (defvar gnus-newsgroup-last-rmail nil) @@ -1556,7 +1556,7 @@ the type of the variable (string, integer, character, etc).") (defvar gnus-newsgroup-expunged-tally nil) (defvar gnus-newsgroup-marked nil - "Sorted list of ticked articles in the current newsgroup (a subset of unread art).") + "Sorted list of ticked articles in current newsgroup (a subset of unread art).") (defvar gnus-newsgroup-spam-marked nil "List of ranges of articles that have been marked as spam.") diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index cf4020c874..86800f28cc 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1200,7 +1200,8 @@ use in `gnus-posting-styles', such as: (message-yank-cited-prefix ">") (message-yank-empty-prefix ">") (message-citation-line-format "On %D %R %p, %N wrote:")) - "Message citation style used by Mozilla Thunderbird. Use with `message-cite-style'.") + "Message citation style used by Mozilla Thunderbird. +Use with `message-cite-style'.") (defconst message-cite-style-gmail '((message-cite-function 'message-cite-original) diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el index 581a408009..5584dad45f 100644 --- a/lisp/gnus/nnmh.el +++ b/lisp/gnus/nnmh.el @@ -46,7 +46,7 @@ "Hook run narrowed to an article before saving.") (defvoo nnmh-be-safe nil - "If non-nil, nnmh will check all articles to make sure whether they are new or not. + "If non-nil, nnmh will check all articles to make sure if they are new or not. Go through the .nnmh-articles file and compare with the actual articles in this folder. The articles that are \"new\" will be marked as unread by Gnus.") diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index a5c8244792..887dce3472 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1751,7 +1751,8 @@ If SEND-IF-FORCE, only send authinfo to the server if the ;; ========================================================================== (defvoo nntp-open-telnet-envuser nil - "If non-nil, telnet session (client and server both) will support the ENVIRON option and not prompt for login name.") + "If non-nil, telnet session supports the ENVIRON option. +Don't prompt for login name. This applies to both client and server.") (defvoo nntp-telnet-shell-prompt "bash\\|[$>] *\r?$" "Regular expression to match the shell prompt on the remote machine.") diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index d59f2c0ebf..e61c66e332 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1356,7 +1356,7 @@ This is the input method activated by the command :version "28.1") (defvar current-transient-input-method nil - "The current input method temporarily enabled by `activate-transient-input-method'. + "Current input method temporarily enabled by `activate-transient-input-method'. If nil, that means no transient input method is active now.") (make-variable-buffer-local 'current-transient-input-method) (put 'current-transient-input-method 'permanent-local t) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 30818fe7e6..6c1c09bc37 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1022,8 +1022,8 @@ See `tramp-file-name-structure'." 5 6 7 8 1)) (defvar tramp-file-name-structure nil ;Initialized when defining `tramp-syntax'! - "List of six elements (REGEXP METHOD USER HOST FILE HOP), detailing \ -the Tramp file name structure. + "List detailing the Tramp file name structure. +This is a list of six elements (REGEXP METHOD USER HOST FILE HOP). The first element REGEXP is a regular expression matching a Tramp file name. The regex should contain parentheses around the method name, diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el index 5e9d35f58e..b4cf360730 100644 --- a/lisp/org/ob-R.el +++ b/lisp/org/ob-R.el @@ -361,7 +361,7 @@ Each member of this list is a list with three members: ) } }(object=%s,transfer.file=\"%s\")" - "A template for an R command to evaluate a block of code and write the result to a file. + "Template for an R command to evaluate a block of code and write result to file. Has four %s escapes to be filled in: 1. Row names, \"TRUE\" or \"FALSE\" diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el index e6aa97e008..9360562b09 100644 --- a/lisp/org/org-attach.el +++ b/lisp/org/org-attach.el @@ -182,7 +182,7 @@ attachment folders based on ID." :type '(repeat (function :tag "Function with ID as input"))) (defvar org-attach-after-change-hook nil - "Hook to be called when files have been added or removed to the attachment folder.") + "Hook called when files have been added or removed to the attachment folder.") (defvar org-attach-open-hook nil "Hook that is invoked by `org-attach-open'. diff --git a/lisp/org/org.el b/lisp/org/org.el index 1f7e434cef..0d7c6c87fd 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -4112,7 +4112,8 @@ groups carry important information: "Regular expression to match a timestamp time or time range. After a match, the following groups carry important information: 0 the full match -1 date plus weekday, for back referencing to make sure both times are on the same day +1 date plus weekday, for back referencing to make sure + both times are on the same day 2 the first time, range or not 4 the second time, if it is a range.") diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index b7e0c45228..0e51553085 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -682,7 +682,7 @@ otherwise build the summary from TYPE and SYMBOL." (xref-make-elisp-location symbol type file))) (defvar elisp-xref-find-def-functions nil - "List of functions to be run from `elisp--xref-find-definitions' to add additional xrefs. + "List of functions run from `elisp--xref-find-definitions' to add more xrefs. Called with one arg; the symbol whose definition is desired. Each function should return a list of xrefs, or nil; the first non-nil result supersedes the xrefs produced by diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index fbc6e424eb..8cb0350dc0 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -75,7 +75,7 @@ (defconst ruby-block-mid-re (regexp-opt ruby-block-mid-keywords) - "Regexp to match where the indentation gets shallower in middle of block statements.") + "Regexp for where the indentation gets shallower in middle of block statements.") (defconst ruby-block-op-keywords '("and" "or" "not") diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index b1abefe534..f6e95b9cb6 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -10112,7 +10112,8 @@ variables to build the path." ;; A modi is: [module-name-string file-name begin-point] (defvar verilog-cache-enabled t - "Non-nil enables caching of signals, etc. Set to nil for debugging to make things SLOW!") + "Non-nil enables caching of signals, etc. +Set to nil for debugging to make things SLOW!") (defvar verilog-modi-cache-list nil "Cache of ((Module Function) Buf-Tick Buf-Modtime Func-Returns)... diff --git a/lisp/term.el b/lisp/term.el index 2e69af0735..d73a9b0d01 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -365,8 +365,8 @@ not allowed.") (defvar-local term-scroll-end nil "Bottom-most line (inclusive) of the scrolling region. `term-scroll-end' must be in the range [0,term-height). In addition, its -value has to be greater than `term-scroll-start', i.e. one line scroll regions are -not allowed.") +value has to be greater than `term-scroll-start', i.e. one line scroll regions +are not allowed.") (defvar term-pager-count nil "Number of lines before we need to page; if nil, paging is disabled.") (defvar term-saved-cursor nil) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index e42615e515..59d60272aa 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -853,10 +853,12 @@ simply by any key input." "Timer id for deferred cell update.") (defvar table-inhibit-update nil "Non-nil inhibits implicit cell and cache updates. -It inhibits `table-with-cache-buffer' to update data in both direction, cell to cache and cache to cell.") +It inhibits `table-with-cache-buffer' to update data in both directions, +cell to cache and cache to cell.") (defvar table-inhibit-auto-fill-paragraph nil "Non-nil inhibits auto fill paragraph when `table-with-cache-buffer' exits. -This is always set to nil at the entry to `table-with-cache-buffer' before executing body forms.") +This is always set to nil at the entry to `table-with-cache-buffer' before +executing body forms.") (defvar table-mode-indicator nil "For mode line indicator") ;; This is not a real minor-mode but placed in the minor-mode-alist @@ -957,7 +959,7 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu (describe-bindings . *table--cell-describe-bindings) (dabbrev-expand . *table--cell-dabbrev-expand) (dabbrev-completion . *table--cell-dabbrev-completion)) - "List of cons cells consisting of (ORIGINAL-COMMAND . TABLE-VERSION-OF-THE-COMMAND).") + "List of the form (ORIGINAL-COMMAND . TABLE-VERSION-OF-THE-COMMAND).") (defvar table-command-list ;; Construct the real contents of the `table-command-list'. diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index ccf5a7807f..adb6ce8053 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -149,7 +149,7 @@ This variable can be set either in .emacs or toggled interactively. Use `setq-default' if setting it in .emacs") (ediff-defvar-local ediff-ignore-similar-regions nil - "If t, skip over difference regions that differ only in the white space and line breaks. + "If t, skip difference regions that differ only in white space and line breaks. This variable can be set either in .emacs or toggled interactively. Use `setq-default' if setting it in .emacs") diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index c68dc71884..3d90ccb1cb 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -182,7 +182,7 @@ Used internally---not a user option.") ;; not used for now (defvar ediff-mouse-pixel-threshold 30 - "If the user moves mouse more than this many pixels, Ediff won't warp mouse into control window.") + "If mouse moved more than this many pixels, don't warp mouse into control window.") (defcustom ediff-grab-mouse t "If t, Ediff will always grab the mouse and put it in the control frame. diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 13f875b192..5c41761a04 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -925,7 +925,7 @@ Its behavior has mainly two restrictions: This only matters if `smerge-refine-weight-hack' is nil.") (defvar smerge-refine-ignore-whitespace t - "If non-nil, indicate that `smerge-refine' should try to ignore change in whitespace.") + "If non-nil, `smerge-refine' should try to ignore change in whitespace.") (defvar smerge-refine-weight-hack t "If non-nil, pass to diff as many lines as there are chars in the region. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 7d9af00de7..160016c3e5 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2386,8 +2386,9 @@ This function runs the hook `vc-retrieve-tag-hook' when finished." ;; for the root directory. (defvar vc-log-short-style '(directory) "Whether or not to show a short log. -If it contains `directory' then if the fileset contains a directory show a short log. -If it contains `file' then show short logs for files. +If it contains `directory', show a short log if the fileset +contains a directory. +If it contains `file', show short logs for files. Not all VC backends support short logs!") (defvar log-view-vc-fileset) diff --git a/lisp/view.el b/lisp/view.el index 6f576f8c04..c1b788a739 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -141,7 +141,8 @@ See RETURN-TO-ALIST argument of function `view-mode-exit' for the format of (put 'view-return-to-alist 'permanent-local t) (defvar view-exit-action nil - "If non-nil, a function with one argument (a buffer) called when finished viewing. + "If non-nil, a function called when finished viewing. +The function should take one argument (a buffer). Commands like \\[view-file] and \\[view-file-other-window] may set this to bury or kill the viewed buffer. Observe that the buffer viewed might not appear in any window at commit 5ab5c3898778406103e7183bf41c7d018077092b Author: Stefan Kangas Date: Sat Dec 19 17:26:58 2020 +0100 Shorten over-wide docstrings in defcustoms * lisp/calc/calc.el (calc-embedded-announce-formula-alist) (calc-embedded-open-formula, calc-embedded-close-formula) (calc-matrix-mode): * lisp/cedet/semantic/imenu.el (semantic-imenu-sort-bucket-function): * lisp/emacs-lisp/find-func.el (find-feature-regexp): * lisp/emulation/cua-base.el (cua-paste-pop-rotate-temporarily): * lisp/emulation/viper-init.el (viper-fast-keyseq-timeout) (viper-related-files-and-buffers-ring): * lisp/emulation/viper-keym.el (viper-want-ctl-h-help): * lisp/gnus/gnus-art.el (gnus-article-banner-alist): * lisp/gnus/gnus-group.el (gnus-keep-same-level): * lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): * lisp/gnus/gnus-sum.el (gnus-inhibit-user-auto-expire): * lisp/gnus/gnus-uu.el (gnus-uu-ignore-files-by-type) (gnus-uu-do-not-unpack-archives) (gnus-uu-unmark-articles-not-decoded) (gnus-uu-correct-stripped-uucode, gnus-uu-save-in-digest) (gnus-uu-post-include-before-composing): * lisp/gnus/gnus.el (gnus-use-long-file-name) (gnus-install-group-spam-parameters): * lisp/gnus/message.el (message-cite-style): * lisp/gnus/nnmail.el (nnmail-split-fancy-with-parent-ignore-groups) (nnmail-cache-ignore-groups): * lisp/ido.el (ido-rewrite-file-prompt-functions): * lisp/mail/feedmail.el (feedmail-fiddle-plex-user-list) (feedmail-spray-address-fiddle-plex-list): * lisp/mh-e/mh-e.el (mh-annotate-msg-hook): * lisp/net/imap.el (imap-process-connection-type): * lisp/net/rcirc.el (rcirc-omit-threshold): * lisp/net/tramp-sh.el (tramp-copy-size-limit): * lisp/nxml/nxml-mode.el (nxml-default-buffer-file-coding-system): * lisp/obsolete/landmark.el (landmark-max-stall-time): * lisp/obsolete/tls.el (tls-checktrust): * lisp/org/org-indent.el (org-indent-mode-turns-off-org-adapt-indentation) (org-indent-mode-turns-on-hiding-stars): * lisp/org/org-protocol.el (org-protocol-project-alist): * lisp/progmodes/cc-vars.el (c-doc-comment-style): * lisp/progmodes/cperl-mode.el (cperl-indent-subs-specially): * lisp/progmodes/flymake-proc.el (flymake-proc-allowed-file-name-masks): * lisp/progmodes/hideif.el (hide-ifdef-expand-reinclusion-protection): * lisp/simple.el (minibuffer-history-case-insensitive-variables): * lisp/tab-bar.el (tab-bar-close-last-tab-choice): * lisp/textmodes/reftex-vars.el (reftex-special-environment-functions): * lisp/vc/ediff-init.el (ediff-startup-hook, ediff-cleanup-hook) (ediff-metachars): * lisp/vc/ediff-merg.el (ediff-show-clashes-only): * lisp/vc/ediff-mult.el (ediff-default-filtering-regexp): Shorten doc strings to not exceed 80-column limits. (Bug#44858) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index bb02281111..9b45a55aa5 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -266,18 +266,18 @@ (sgml-mode . "\n\\(\n\\)*") (xml-mode . "\n\\(\n\\)*") (texinfo-mode . "@c Embed\n\\(@c .*\n\\)*")) - "Alist of major modes with appropriate values for `calc-embedded-announce-formula'." + "Alist of major modes for `calc-embedded-announce-formula'." :type '(alist :key-type (symbol :tag "Major mode") :value-type (regexp :tag "Regexp to announce formula"))) (defcustom calc-embedded-open-formula "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n" - "A regular expression for the opening delimiter of a formula used by calc-embedded." + "Regexp for the opening delimiter of a formula used by `calc-embedded'." :type '(regexp)) (defcustom calc-embedded-close-formula "\\'\\|\n$\\|\\$\\$?\\|\\\\]\\|^\\\\end[^{].*\n\\|^\\\\end{.*[^x]}.*\n\\|^@.*\n\\|^\\.EN.*\n\\|\\\\)\\|\n%\n\\|^\\.\\\\\"\n" - "A regular expression for the closing delimiter of a formula used by calc-embedded." + "Regexp for the closing delimiter of a formula used by calc-embedded." :type '(regexp)) (defcustom calc-embedded-open-close-formula-alist @@ -721,7 +721,8 @@ If nil, computations on numbers always yield numbers where possible.") (defcalcmodevar calc-matrix-mode nil "If `matrix', variables are assumed to be matrix-valued. If a number, variables are assumed to be NxN matrices. -If `sqmatrix', variables are assumed to be square matrices of an unspecified size. +If `sqmatrix', variables are assumed to be square matrices of an + unspecified size. If `scalar', variables are assumed to be scalar-valued. If nil, symbolic math routines make no assumptions about variables.") diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 25f7fdb842..c910dc8fc6 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -99,7 +99,8 @@ Overridden to nil if `semantic-imenu-bucketize-file' is nil." (defcustom semantic-imenu-sort-bucket-function nil "Function to use when sorting tags in the buckets of functions. -See `semantic-bucketize' and the FILTER argument for more details on this function." +See `semantic-bucketize' and the FILTER argument for more details +on this function." :group 'semantic-imenu :type '(radio (const :tag "No Sorting" nil) (const semantic-sort-tags-by-name-increasing) diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index ee94e1fbff..074e7db295 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -103,7 +103,7 @@ Please send improvements and fixes to the maintainer." (defcustom find-feature-regexp (concat ";;; Code:") - "The regexp used by `xref-find-definitions' when searching for a feature definition. + "Regexp used by `xref-find-definitions' when searching for a feature definition. Note it may contain up to one `%s' at the place where `format' should insert the feature name." ;; We search for ";;; Code" rather than (feature '%s) because the diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 926305e607..55578d0622 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -375,11 +375,11 @@ managers, so try setting this to nil, if prefix override doesn't work." (defcustom cua-paste-pop-rotate-temporarily nil "If non-nil, \\[cua-paste-pop] only rotates the kill-ring temporarily. -This means that both \\[yank] and the first \\[yank-pop] in a sequence always insert -the most recently killed text. Each immediately following \\[cua-paste-pop] replaces -the previous text with the next older element on the `kill-ring'. -With prefix arg, \\[universal-argument] \\[yank-pop] inserts the same text as the most -recent \\[yank-pop] (or \\[yank]) command." +This means that both \\[yank] and the first \\[yank-pop] in a sequence always +insert the most recently killed text. Each immediately following \\[cua-paste-pop] +replaces the previous text with the next older element on the `kill-ring'. +With prefix arg, \\[universal-argument] \\[yank-pop] inserts the same text as the +most recent \\[yank-pop] (or \\[yank]) command." :type 'boolean :group 'cua) diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 6c4afe519f..c2aae9b87f 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -475,7 +475,8 @@ text." ;; Fast keyseq and ESC keyseq timeouts (defcustom viper-fast-keyseq-timeout 200 - "Key sequence separated by no more than this many milliseconds is viewed as a Vi-style macro, if such a macro is defined. + "Max milliseconds for a key sequence to be regarded as a Vi-style macro. +Only regard key sequence as a macro if it is defined. Setting this too high may slow down your typing. Setting this value too low will make it hard to use Vi-style timeout macros." :type 'integer @@ -705,7 +706,7 @@ If nil, the cursor will move backwards without deleting anything." (viper-deflocalvar viper-related-files-and-buffers-ring nil "") (defcustom viper-related-files-and-buffers-ring nil - "List of file and buffer names that are considered to be related to the current buffer. + "List of file and buffer names to consider related to the current buffer. Related buffers can be cycled through via :R and :P commands." :type 'boolean :group 'viper-misc) diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index d76cf71b31..6a0fc2e984 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -69,7 +69,7 @@ major mode in effect." :group 'viper) (defcustom viper-want-ctl-h-help nil - "If non-nil, C-h gets bound to help-command; otherwise, C-h gets the usual Vi bindings." + "If non-nil, bind C-h to help-command; otherwise, C-h gets the usual Vi bindings." :type 'boolean :group 'viper) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 5b50bcbbe1..79d4d9087f 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -289,7 +289,9 @@ asynchronously. The compressed face will be piped to this command." (defcustom gnus-article-banner-alist nil "Banner alist for stripping. For example, - ((egroups . \"^[ \\t\\n]*-------------------+\\\\( \\\\(e\\\\|Yahoo! \\\\)Groups Sponsor -+\\\\)?....\\n\\\\(.+\\n\\\\)+\"))" + ((egroups . (concat \"^[ \\t\\n]*-------------------+\\\\\" + \"( \\\\(e\\\\|Yahoo! \\\\)Groups Sponsor -+\\\\)?\" + \"....\\n\\\\(.+\\n\\\\)+\")))" :version "21.1" :type '(repeat (cons symbol regexp)) :group 'gnus-article-washing) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 24534a1b66..9bb3ec765f 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -60,7 +60,7 @@ :type 'string) (defcustom gnus-keep-same-level nil - "Non-nil means that the next newsgroup after the current will be on the same level. + "Non-nil means that the newsgroup after this one will be on the same level. When you type, for instance, `n' after reading the last article in the current newsgroup, you will go to the next newsgroup. If this variable is nil, the next newsgroup will be the next from the group diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index 94f2cc310f..33c5803f5a 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el @@ -248,7 +248,7 @@ If you use score decays, you might want to set values higher than (integer :tag "Score")))))) (defcustom gnus-adaptive-word-length-limit nil - "Words of a length lesser than this limit will be ignored when doing adaptive scoring." + "Words shorter than this limit will be ignored when doing adaptive scoring." :version "22.1" :group 'gnus-score-adapt :type '(radio (const :format "Unlimited " nil) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 16152e252a..b8b055c02c 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -744,7 +744,8 @@ string with the suggested prefix." :type '(repeat character)) (defcustom gnus-inhibit-user-auto-expire t - "If non-nil, user marking commands will not mark an article as expirable, even if the group has auto-expire turned on." + "If non-nil, user marking commands will not mark an article as expirable. +This is true even if the group has auto-expire turned on." :version "21.1" :group 'gnus-summary :type 'boolean) diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 70aeac00d7..5980051ee4 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -162,7 +162,7 @@ Note that this variable can be used in conjunction with the (regexp :format "%v"))) (defcustom gnus-uu-ignore-files-by-type nil - "A regular expression saying what files that shouldn't be viewed, based on MIME file type. + "Regexp matching files that shouldn't be viewed, based on MIME file type. If, for instance, you want gnus-uu to ignore all audio files and all mpegs, you could say something like @@ -224,7 +224,7 @@ Default is \"/tmp/\"." :type 'directory) (defcustom gnus-uu-do-not-unpack-archives nil - "Non-nil means that gnus-uu won't peek inside archives looking for files to display. + "If non-nil, gnus-uu won't peek inside archives looking for files to display. Default is nil." :group 'gnus-extract-archive :type 'boolean) @@ -265,19 +265,19 @@ it nil." :type 'boolean) (defcustom gnus-uu-unmark-articles-not-decoded nil - "Non-nil means that gnus-uu will mark articles that were unsuccessfully decoded as unread. + "If non-nil, gnus-uu will mark unsuccessfully decoded articles as unread. Default is nil." :group 'gnus-extract :type 'boolean) (defcustom gnus-uu-correct-stripped-uucode nil - "Non-nil means that gnus-uu will *try* to fix uuencoded files that have had trailing spaces deleted. + "If non-nil, *try* to fix uuencoded files that have had trailing spaces deleted. Default is nil." :group 'gnus-extract :type 'boolean) (defcustom gnus-uu-save-in-digest nil - "Non-nil means that gnus-uu, when asked to save without decoding, will save in digests. + "If non-nil, gnus-uu, when asked to save without decoding, will save in digests. If this variable is nil, gnus-uu will just save everything in a file without any embellishments. The digesting almost conforms to RFC1153 - no easy way to specify any meaningful volume and issue numbers were found, @@ -1858,7 +1858,7 @@ uuencode and adds MIME headers." (function :tag "Other"))) (defcustom gnus-uu-post-include-before-composing nil - "Non-nil means that gnus-uu will ask for a file to encode before you compose the article. + "If non-nil, gnus-uu asks for a file to encode before you compose the article. If this variable is t, you can either include an encoded file with \\[gnus-uu-post-insert-binary-in-article] or have one included for you when you post the article." :group 'gnus-extract-post diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 8e8af1521f..653ef1bbfd 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1195,7 +1195,7 @@ Also see `gnus-large-ephemeral-newsgroup'." integer)) (defcustom gnus-use-long-file-name (not (memq system-type '(usg-unix-v))) - "Non-nil means that the default name of a file to save articles in is the group name. + "Non-nil means that the default file name to save articles in is the group name. If it's nil, the directory form of the group name is used instead. If this variable is a list, and the list contains the element @@ -1618,7 +1618,8 @@ total number of articles in the group.") ;; group parameters for spam processing added by Ted Zlatanov (defcustom gnus-install-group-spam-parameters t "Disable the group parameters for spam detection. -Enable if `G c' in XEmacs is giving you trouble, and make sure to submit a bug report." +Enable if `G c' in XEmacs is giving you trouble, and make sure to +submit a bug report." :version "22.1" :type 'boolean :group 'gnus-start) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index b6c1c0b071..cf4020c874 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1172,7 +1172,8 @@ Presets to impersonate popular mail agents are found in the message-cite-style-* variables. This variable is intended for use in `gnus-posting-styles', such as: - ((posting-from-work-p) (eval (setq-local message-cite-style message-cite-style-outlook)))" + ((posting-from-work-p) (eval (setq-local message-cite-style + message-cite-style-outlook)))" :version "24.1" :group 'message-insertion :type '(choice (const :tag "Do not override variables" :value nil) diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 57801d6f9e..6ee29a25cd 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -115,7 +115,7 @@ If nil, the first match found will be used." :type 'boolean) (defcustom nnmail-split-fancy-with-parent-ignore-groups nil - "Regexp that matches group names to be ignored when applying `nnmail-split-fancy-with-parent'. + "Regexp matching group names ignored by `nnmail-split-fancy-with-parent'. This can also be a list of regexps." :version "22.1" :group 'nnmail-split @@ -124,7 +124,8 @@ This can also be a list of regexps." (repeat :value (".*") regexp))) (defcustom nnmail-cache-ignore-groups nil - "Regexp that matches group names to be ignored when inserting message ids into the cache (`nnmail-cache-insert'). + "Regexp matching group ignored when inserting message ids into the cache. +This is used by `nnmail-cache-insert'. This can also be a list of regexps." :version "22.1" :group 'nnmail-split diff --git a/lisp/ido.el b/lisp/ido.el index 99241ce1a3..277ce15a3a 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -842,7 +842,7 @@ variables: max-width - the max width of the resulting dirname; nil means no limit prompt - the basic prompt (e.g. \"Find File: \") literal - the string shown if doing \"literal\" find; set to nil to omit - vc-off - the string shown if version control is inhibited; set to nil to omit + vc-off - the string shown if version control is inhibited; use nil to omit prefix - either nil or a fixed prefix for the dirname The following variables are available, but should not be changed: diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 6f8c013ba3..2907093ea7 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -807,7 +807,8 @@ fiddle-plex. feedmail will use this list of fiddle-plexes to manipulate user-specified message header fields. It does this after it has completed all normal -message header field manipulation and before calling `feedmail-last-chance-hook'. +message header field manipulation and before calling +`feedmail-last-chance-hook'. For an explanation of fiddle-plexes, see the documentation for the variable `feedmail-fiddle-plex-blurb'. In contrast to some other fiddle-plex @@ -889,13 +890,14 @@ called and will consult `feedmail-spray-this-address' to find the stripped envelope email address (no comments or angle brackets). The function should return an embellished form of the address. -The recipe for sending form letters is: (1) create a message with all -addressees on Bcc: headers; (2) tell feedmail to remove Bcc: headers -before sending the message; (3) create a function which will embellish -stripped addresses, if desired; (4) define `feedmail-spray-address-fiddle-plex-list' -appropriately; (5) send the message with `feedmail-enable-spray' set -non-nil; (6) stand back and watch co-workers wonder at how efficient -you are at accomplishing inherently inefficient things." +The recipe for sending form letters is: (1) create a message with +all addressees on Bcc: headers; (2) tell feedmail to remove Bcc: +headers before sending the message; (3) create a function which +will embellish stripped addresses, if desired; (4) define +`feedmail-spray-address-fiddle-plex-list' appropriately; (5) send +the message with `feedmail-enable-spray' set non-nil; (6) stand +back and watch co-workers wonder at how efficient you are at +accomplishing inherently inefficient things." :group 'feedmail-spray :type 'sexp ; too complex to be described accurately ) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 3ac5c8f7ae..e5f69a5ae8 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -3182,7 +3182,7 @@ folder, which is also available in `mh-current-folder'." :package-version '(MH-E . "8.0")) (defcustom-mh mh-annotate-msg-hook nil - "Hook run whenever a message is sent and after the scan lines and message are annotated. + "Hook run when a message is sent and after annotating the scan lines and message. Hook functions can access the current folder name with `mh-current-folder' and obtain the message numbers of the annotated messages with `mh-annotate-list'." diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 0394f0efea..27c2d869f6 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -190,7 +190,7 @@ until a successful connection is made." :type '(repeat string)) (defcustom imap-process-connection-type nil - "Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL. + "Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell and SSL. The `process-connection-type' variable controls the type of device used to communicate with subprocesses. Values are nil to use a pipe, or t or `pty' to use a pty. The value has no effect if the diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index c4b68f1be4..6a32fa9255 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1507,7 +1507,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'." (make-variable-buffer-local 'rcirc-last-sender) (defcustom rcirc-omit-threshold 100 - "Number of lines since last activity from a nick before `rcirc-omit-responses' are omitted." + "Lines since last activity from a nick before `rcirc-omit-responses' are omitted." :type 'integer) (defcustom rcirc-log-process-buffers nil diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e30fe61de4..e6e718ebe3 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -58,8 +58,7 @@ If it is nil, no compression at all will be applied." ;;;###tramp-autoload (defcustom tramp-copy-size-limit 10240 - "The maximum file size where inline copying is preferred over an \ -out-of-the-band copy. + "Maximum file size where inline copying is preferred to an out-of-the-band copy. If it is nil, out-of-the-band copy will be used without a check." :group 'tramp :type '(choice (const nil) integer)) diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index 5bb904e691..080b8c0c6e 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -107,8 +107,10 @@ and when the encoding declaration specifies `UTF-16'." (defcustom nxml-default-buffer-file-coding-system nil "Default value for `buffer-file-coding-system' for a buffer for a new file. -A value of nil means use the default value of `buffer-file-coding-system' as normal. -A buffer's `buffer-file-coding-system' affects what \\[nxml-insert-xml-declaration] inserts." +A value of nil means use the default value of +`buffer-file-coding-system' as normal. +A buffer's `buffer-file-coding-system' affects what +\\[nxml-insert-xml-declaration] inserts." :group 'nxml :type 'coding-system) diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el index df3c5d6cc9..39e0f50e73 100644 --- a/lisp/obsolete/landmark.el +++ b/lisp/obsolete/landmark.el @@ -1278,7 +1278,8 @@ Used to move the robot when he is stuck in a rut for some reason." :group 'landmark) (defcustom landmark-max-stall-time 2 "The maximum number of cycles that the robot can remain stuck in a place. -After this limit is reached, landmark-random-move is called to push him out of it." +After this limit is reached, landmark-random-move is called to +push him out of it." :type 'integer :group 'landmark) diff --git a/lisp/obsolete/tls.el b/lisp/obsolete/tls.el index d1b215cbfb..a9d7b84373 100644 --- a/lisp/obsolete/tls.el +++ b/lisp/obsolete/tls.el @@ -130,8 +130,10 @@ the external program knows about the root certificates you consider trustworthy, e.g.: \(setq tls-program - \\='(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\" - \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\"))" + \\='(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt \\ +-p %p %h\" + \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt \\ +-p %p %h --protocols ssl3\"))" :type '(choice (const :tag "Always" t) (const :tag "Never" nil) (const :tag "Ask" ask)) diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el index 73b077965c..708b5c305e 100644 --- a/lisp/org/org-indent.el +++ b/lisp/org/org-indent.el @@ -85,15 +85,13 @@ it may be prettier to customize the `org-indent' face." :type 'character) (defcustom org-indent-mode-turns-off-org-adapt-indentation t - "Non-nil means setting the variable `org-indent-mode' will \ -turn off indentation adaptation. + "Non-nil means setting `org-indent-mode' will turn off indentation adaptation. For details see the variable `org-adapt-indentation'." :group 'org-indent :type 'boolean) (defcustom org-indent-mode-turns-on-hiding-stars t - "Non-nil means setting the variable `org-indent-mode' will \ -turn on `org-hide-leading-stars'." + "Non-nil means setting `org-indent-mode' will turn on `org-hide-leading-stars'." :group 'org-indent :type 'boolean) diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index 4bc7cee31f..92ec24415b 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -181,7 +181,8 @@ Possible properties are: :working-directory - the local working directory. This is, what base-url will be replaced with. :redirects - A list of cons cells, each of which maps a regular - expression to match to a path relative to :working-directory. + expression to match to a path relative to + :working-directory. Example: @@ -202,7 +203,8 @@ Example: :working-directory \"~/site/content/post/\" :online-suffix \".html\" :working-suffix \".md\" - :rewrites ((\"\\(https://site.com/[0-9]+/[0-9]+/[0-9]+/\\)\" . \".md\"))) + :rewrites ((\"\\(https://site.com/[0-9]+/[0-9]+/[0-9]+/\\)\" + . \".md\"))) (\"GNU emacs OpenGrok\" :base-url \"https://opengrok.housegordon.com/source/xref/emacs/\" :working-directory \"~/dev/gnu-emacs/\"))) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 9e6f9527ca..8772ed0632 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -575,7 +575,8 @@ comment styles: javadoc -- Javadoc style for \"/** ... */\" comments (default in Java mode). autodoc -- Pike autodoc style for \"//! ...\" comments (default in Pike mode). - gtkdoc -- GtkDoc style for \"/** ... **/\" comments (default in C and C++ modes). + gtkdoc -- GtkDoc style for \"/** ... **/\" comments + (default in C and C++ modes). doxygen -- Doxygen style. The value may also be a list of doc comment styles, in which case all diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 15987a3b9b..87542ea133 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -232,7 +232,9 @@ Versions 5.2 ... 5.20 behaved as if this were nil." :group 'cperl-indentation-details) (defcustom cperl-indent-subs-specially t - "Non-nil means indent subs that are inside other blocks (hash values, for example) relative to the beginning of the \"sub\" keyword, rather than relative to the statement that contains the declaration." + "If non-nil, indent subs inside other blocks relative to \"sub\" keyword. +Otherwise, indent them relative to statement that contains the declaration. +This applies to, for example, hash values." :type 'boolean :group 'cperl-indentation-details) diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el index 152dc725c7..744c110f6b 100644 --- a/lisp/progmodes/flymake-proc.el +++ b/lisp/progmodes/flymake-proc.el @@ -120,8 +120,10 @@ This is an alist with elements of the form: REGEXP INIT [CLEANUP [NAME]] REGEXP is a regular expression that matches a file name. INIT is the init function to use. -CLEANUP is the cleanup function to use, default `flymake-proc-simple-cleanup'. -NAME is the file name function to use, default `flymake-proc-get-real-file-name'." +CLEANUP is the cleanup function to use, default + `flymake-proc-simple-cleanup'. +NAME is the file name function to use, default + `flymake-proc-get-real-file-name'." :group 'flymake :type '(alist :key-type (regexp :tag "File regexp") :value-type diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 9c8343fca0..fb487f7e1f 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -153,8 +153,8 @@ The first time we visit such a file, _XXX_HEADER_FILE_INCLUDED_ is undefined, and so nothing is hidden. The next time we visit it, everything will be hidden. -This behavior is generally undesirable. If this option is non-nil, the outermost -#if is always visible." +This behavior is generally undesirable. If this option is non-nil, the +outermost #if is always visible." :type 'boolean :version "25.1") diff --git a/lisp/simple.el b/lisp/simple.el index 090162b973..9ed7a11de1 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2200,7 +2200,8 @@ in this use of the minibuffer.") "Minibuffer history variables for which matching should ignore case. If a history variable is a member of this list, then the \\[previous-matching-history-element] and \\[next-matching-history-element]\ - commands ignore case when searching it, regardless of `case-fold-search'." + commands ignore case when searching it, +regardless of `case-fold-search'." :type '(repeat variable) :group 'minibuffer) diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 9506b1b22e..8c649bd507 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -852,8 +852,10 @@ If `recent', select the most recently visited tab." "Defines what to do when the last tab is closed. If nil, do nothing and show a message, like closing the last window or frame. If `delete-frame', delete the containing frame, as a web browser would do. -If `tab-bar-mode-disable', disable tab-bar-mode so that tabs no longer show in the frame. -If the value is a function, call that function with the tab to be closed as an argument." +If `tab-bar-mode-disable', disable tab-bar-mode so that tabs no longer show in +the frame. +If the value is a function, call that function with the tab to be closed as an + argument." :type '(choice (const :tag "Do nothing and show message" nil) (const :tag "Close the containing frame" delete-frame) (const :tag "Disable tab-bar-mode" tab-bar-mode-disable) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index c9fd19d232..f73b849b6d 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -741,8 +741,8 @@ The function must take an argument BOUND. If non-nil, BOUND is a boundary for backwards searches which should be observed. Here is an example. The LaTeX package linguex.sty defines list macros -`\\ex.', `\\a.', etc for lists which are terminated by `\\z.' or an empty -line. +`\\ex.', `\\a.', etc for lists which are terminated by `\\z.' or an +empty line. \\ex. \\label{ex:12} Some text in an exotic language ... \\a. \\label{ex:13} more stuff @@ -766,10 +766,12 @@ And here is the setup for RefTeX: (save-excursion ;; Search for any of the linguex item macros at the beginning of a line (if (re-search-backward - \"^[ \\t]*\\\\(\\\\\\\\\\\\(ex\\\\|a\\\\|b\\\\|c\\\\|d\\\\|e\\\\|f\\\\)g?\\\\.\\\\)\" bound t) + (concat \"^[ \\t]*\\\\(\\\\\\\\\\\\(ex\\\\|a\\\\|\" + \"b\\\\|c\\\\|d\\\\|e\\\\|f\\\\)g?\\\\.\\\\)\") + bound t) (progn (setq p1 (match-beginning 1)) - ;; Make sure no empty line or \\z. is between us and the item macro + ;; Make sure no empty line or \\z. is between us and item macro (if (re-search-forward \"\\n[ \\t]*\\n\\\\|\\\\\\\\z\\\\.\" pos t) ;; Return nil because list was already closed nil diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 8974692751..3d16f316a6 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -432,7 +432,7 @@ Can be used to move the frame where it is desired." :type 'hook :group 'ediff-hook) (defcustom ediff-startup-hook nil - "Hooks to run in the control buffer after Ediff has been set up and is ready for the job." + "Hooks to run in the control buffer after Ediff has been set up and is ready." :type 'hook :group 'ediff-hook) (defcustom ediff-select-hook nil @@ -480,7 +480,7 @@ set local variables that determine how the display looks like." :type 'hook :group 'ediff-hook) (defcustom ediff-cleanup-hook nil - "Hooks to run on exiting Ediff but before killing the control and variant buffers." + "Hooks to run on exiting Ediff, before killing the control and variant buffers." :type 'hook :group 'ediff-hook) @@ -1268,7 +1268,7 @@ Instead, C-h would jump to previous difference." ;; Metacharacters that have to be protected from the shell when executing ;; a diff/diff3 command. (defcustom ediff-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]" - "Regexp that matches characters that must be quoted with `\\' in shell command line. + "Regexp matching characters that must be quoted with `\\' in shell command line. This default should work without changes." :type 'regexp :group 'ediff) diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index 22656761d9..1c1d5219c7 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el @@ -70,7 +70,7 @@ STRING4 :group 'ediff-merge) (defcustom ediff-show-clashes-only nil - "If t, show only those diff regions where both buffers disagree with the ancestor. + "If t, show only diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be skipped over. A value of nil means show all regions." :type 'boolean diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index b48377815a..3d79630f3b 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -181,7 +181,7 @@ directories.") (defvar ediff-filtering-regexp-history nil "") (defcustom ediff-default-filtering-regexp nil - "The default regular expression used as a filename filter in multifile comparisons. + "Default regular expression used as a filename filter in multifile comparisons. Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." :type 'sexp ; yuck - why not just a regexp? :risky t) commit 4c7df434a0410a46157743045255c03395231cc6 Author: Mattias Engdegård Date: Sat Dec 19 16:24:55 2020 +0100 Correct units and spacing in memory-report * lisp/emacs-lisp/memory-report.el (memory-report--format): Use IEC unit prefixes and a space before. diff --git a/lisp/emacs-lisp/memory-report.el b/lisp/emacs-lisp/memory-report.el index 04ae87d9ea..b532ddc56c 100644 --- a/lisp/emacs-lisp/memory-report.el +++ b/lisp/emacs-lisp/memory-report.el @@ -232,11 +232,11 @@ by counted more than once." (defun memory-report--format (bytes) (setq bytes (/ bytes 1024.0)) - (let ((units '("kB" "MB" "GB" "TB"))) + (let ((units '("KiB" "MiB" "GiB" "TiB"))) (while (>= bytes 1024) (setq bytes (/ bytes 1024.0)) (setq units (cdr units))) - (format "%6.1f%s" bytes (car units)))) + (format "%6.1f %s" bytes (car units)))) (defun memory-report--gc-elem (elems type) (* (nth 1 (assq type elems)) commit 8f91fe3063c1a4523520624054458229cc376d9b Author: Basil L. Contovounesios Date: Sat Dec 19 12:40:00 2020 +0000 Set indent-tabs-mode for c-mode in .dir-locals.el * .dir-locals.el (c-mode): Enforce existing indent-tabs-mode policy. (Bug#34765) diff --git a/.dir-locals.el b/.dir-locals.el index 27d50c6069..b313945936 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -9,6 +9,7 @@ (c-noise-macro-names . ("INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED" "UNINIT" "CALLBACK" "ALIGN_STACK")) (electric-quote-comment . nil) (electric-quote-string . nil) + (indent-tabs-mode . t) (mode . bug-reference-prog))) (objc-mode . ((c-file-style . "GNU") (electric-quote-comment . nil) commit 2224a64d3110be09ab6e11771e0c835777f61f82 Author: Eli Zaretskii Date: Sat Dec 19 15:25:08 2020 +0200 ; Revert unintended change. diff --git a/src/xterm.c b/src/xterm.c index 7f8728e47c..3de0d2e73c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8947,9 +8947,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, if (!f && (f = any) && configureEvent.xconfigure.window == FRAME_X_WINDOW (f) - && (FRAME_VISIBLE_P(f) - || !(configureEvent.xconfigure.width <= 1 - && configureEvent.xconfigure.height <= 1))) + && FRAME_VISIBLE_P(f)) { block_input (); if (FRAME_X_DOUBLE_BUFFERED_P (f)) @@ -8964,10 +8962,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, f = 0; } #endif - if (f - && (FRAME_VISIBLE_P(f) - || !(configureEvent.xconfigure.width <= 1 - && configureEvent.xconfigure.height <= 1))) + if (f && FRAME_VISIBLE_P(f)) { #ifdef USE_GTK /* For GTK+ don't call x_net_wm_state for the scroll bar commit 64d97212f42bc0305560a0ae2cc2f16a3a851117 Author: Eli Zaretskii Date: Sat Dec 19 13:18:11 2020 +0200 Fix over-wide doc strings * lisp/vc/ediff-init.el (ediff-before-flag-bol) (ediff-after-flag-eol, ediff-before-flag-mol): * lisp/org/org-ctags.el (org-ctags-open-link-functions): * lisp/mail/feedmail.el (feedmail-sendmail-f-doesnt-sell-me-out): * lisp/language/ethio-util.el (ethio-use-three-dot-question) (ethio-quote-vowel-always, ethio-W-sixth-always): * lisp/gnus/nnvirtual.el (nnvirtual-mapping-table) (nnvirtual-mapping-offsets, nnvirtual-mapping-reads) (nnvirtual-mapping-marks, nnvirtual-info-installed): * lisp/gnus/gnus.el (charset): * lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars) (gnus-outlook-deuglify-no-wrap-chars) (gnus-outlook-deuglify-attrib-cut-regexp): Fix doc strings to not exceed 80-column limits. (Bug#44858) diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el index 647f643c96..fdc5302a28 100644 --- a/lisp/gnus/deuglify.el +++ b/lisp/gnus/deuglify.el @@ -250,21 +250,25 @@ :group 'gnus-outlook-deuglify) (defcustom gnus-outlook-deuglify-unwrap-stop-chars nil ;; ".?!" or nil - "Characters that inhibit unwrapping if they are the last one on the cited line above the possible wrapped line." + "Characters that, when at end of cited line, inhibit unwrapping. +When one of these characters is the last one on the cited line +above the possibly wrapped line, it disallows unwrapping." :version "22.1" :type '(radio (const :format "None " nil) (string :value ".?!")) :group 'gnus-outlook-deuglify) (defcustom gnus-outlook-deuglify-no-wrap-chars "`" - "Characters that inhibit unwrapping if they are the first one in the possibly wrapped line." + "Characters that, when at beginning of line, inhibit unwrapping. +When one of these characters is the first one in the possibly +wrapped line, it disallows unwrapping." :version "22.1" :type 'string :group 'gnus-outlook-deuglify) (defcustom gnus-outlook-deuglify-attrib-cut-regexp "\\(On \\|Am \\)?\\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\),[^,]+, " - "Regular expression matching the beginning of an attribution line that should be cut off." + "Regexp matching beginning of attribution line that should be cut off." :version "22.1" :type 'regexp :group 'gnus-outlook-deuglify) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index abe7b1ae76..8e8af1521f 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1545,7 +1545,7 @@ Use with caution.") ("\\(^\\|:\\)soc.culture.vietnamese\\>" vietnamese-viqr) ("\\(^\\|:\\)\\(comp\\|rec\\|alt\\|sci\\|soc\\|news\\|gnu\\|bofh\\)\\>" iso-8859-1)) :variable-document - "Alist of regexps (to match group names) and default charsets to be used when reading." + "Alist of regexps (to match group names) and charsets to be used when reading." :variable-group gnus-charset :variable-type '(repeat (list (regexp :tag "Group") (symbol :tag "Charset"))) diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el index 54c2f7be82..3e9e608a09 100644 --- a/lisp/gnus/nnvirtual.el +++ b/lisp/gnus/nnvirtual.el @@ -61,22 +61,27 @@ component group will show up when you enter the virtual group.") (defvoo nnvirtual-current-group nil) (defvoo nnvirtual-mapping-table nil - "Table of rules on how to map between component group and article number to virtual article number.") + "Table of rules for mapping groups and articles to virtual article numbers. +These rules determine how to map between component group and article number +on the one hand, and virtual article number on the other hand.") (defvoo nnvirtual-mapping-offsets nil - "Table indexed by component group to an offset to be applied to article numbers in that group.") + "Table of mapping offsets to be applied to article numbers in a group. +The table is indexed by component group number of the group.") (defvoo nnvirtual-mapping-len 0 "Number of articles in this virtual group.") (defvoo nnvirtual-mapping-reads nil - "Compressed sequence of read articles on the virtual group as computed from the unread status of individual component groups.") + "Compressed sequence of read articles on the virtual group. +It is computed from the unread status of individual component groups.") (defvoo nnvirtual-mapping-marks nil - "Compressed marks alist for the virtual group as computed from the marks of individual component groups.") + "Compressed marks alist for the virtual group. +It is computed from the marks of individual component groups.") (defvoo nnvirtual-info-installed nil - "T if we have already installed the group info for this group, and shouldn't blast over it again.") + "t if the group info for this group is already installed.") (defvoo nnvirtual-status-string "") diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 55e59ab516..263ddb235e 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -113,17 +113,21 @@ vertically stacked dots. All SERA <--> FIDEL converters refer this variable.") (defvar ethio-use-three-dot-question nil - "Non-nil means associate ASCII question mark with Ethiopic old style question mark (three vertically stacked dots). + "If non-nil, associate ASCII question mark with Ethiopic question mark. +The Ethiopic old style question mark is three vertically stacked dots. If nil, associate ASCII question mark with Ethiopic stylized question mark. All SERA <--> FIDEL converters refer this variable.") (defvar ethio-quote-vowel-always nil - "Non-nil means always put an apostrophe before an isolated vowel (except at word initial) in FIDEL --> SERA conversion. + "Non-nil means always put an apostrophe before an isolated vowel. +This happens in FIDEL --> SERA conversions. Isolated vowels at +word beginning do not get an apostrophe put before them. If nil, put an apostrophe only between a 6th-form consonant and an isolated vowel.") (defvar ethio-W-sixth-always nil - "Non-nil means convert the Wu-form of a 12-form consonant to \"W'\" instead of \"Wu\" in FIDEL --> SERA conversion.") + "Non-nil means convert the Wu-form of a 12-form consonant to \"W'\". +This is instead of \"Wu\" in FIDEL --> SERA conversion.") (defvar ethio-numeric-reduction 0 "Degree of reduction in converting Ethiopic digits into Arabic digits. diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 6effe13986..6f8c013ba3 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -622,7 +622,7 @@ to arrange for the message to get a From: line." (defcustom feedmail-sendmail-f-doesnt-sell-me-out nil - "Says whether the sendmail program issues a warning header if called with \"-f\". + "Whether sendmail should issue a warning header if called with \"-f\". The sendmail program has a useful feature to let you set the envelope FROM address via a command line option, \"-f\". Unfortunately, it also has a widely disliked default behavior of selling you out if you do that by inserting diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index 08885d26f6..bb1f2b8364 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el @@ -165,7 +165,7 @@ See the ctags documentation for more information.") '(org-ctags-find-tag org-ctags-ask-rebuild-tags-file-then-find-tag org-ctags-ask-append-topic) - "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS when ORG-CTAGS is active." + "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS by ORG-CTAGS." :group 'org-ctags :version "24.1" :type 'hook diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 04926af16e..8974692751 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -554,19 +554,19 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.") ;; Highlighting (defcustom ediff-before-flag-bol "->>" - "Flag placed before a highlighted block of differences, if block starts at beginning of a line." + "Flag placed before highlighted block of differences at beginning of a line." :type 'string :tag "Region before-flag at beginning of line" :group 'ediff) (defcustom ediff-after-flag-eol "<<-" - "Flag placed after a highlighted block of differences, if block ends at end of a line." + "Flag placed after highlighted block of differences that ends at end of line." :type 'string :tag "Region after-flag at end of line" :group 'ediff) (defcustom ediff-before-flag-mol "->>" - "Flag placed before a highlighted block of differences, if block starts in mid-line." + "Flag placed before highlighted block of differences that starts mid-line." :type 'string :tag "Region before-flag in the middle of line" :group 'ediff) diff --git a/src/xterm.c b/src/xterm.c index 3de0d2e73c..7f8728e47c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8947,7 +8947,9 @@ handle_one_xevent (struct x_display_info *dpyinfo, if (!f && (f = any) && configureEvent.xconfigure.window == FRAME_X_WINDOW (f) - && FRAME_VISIBLE_P(f)) + && (FRAME_VISIBLE_P(f) + || !(configureEvent.xconfigure.width <= 1 + && configureEvent.xconfigure.height <= 1))) { block_input (); if (FRAME_X_DOUBLE_BUFFERED_P (f)) @@ -8962,7 +8964,10 @@ handle_one_xevent (struct x_display_info *dpyinfo, f = 0; } #endif - if (f && FRAME_VISIBLE_P(f)) + if (f + && (FRAME_VISIBLE_P(f) + || !(configureEvent.xconfigure.width <= 1 + && configureEvent.xconfigure.height <= 1))) { #ifdef USE_GTK /* For GTK+ don't call x_net_wm_state for the scroll bar