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 647f643c962eb91f48c93a6f285f4c10315f390b..fdc5302a28f5392353e719d89177434a8f9ef8cf 100644 (file)
--- 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 abe7b1ae76a2af9bccd5edbe5637330345c89078..8e8af1521fadf29d851eeb578960046d21dda5a6 100644 (file)
--- 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 54c2f7be820ea33f8c2fa3311244ab68bdc53931..3e9e608a099363e1c69ad64fa4f42a81ef64ae41 100644 (file)
--- 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 55e59ab516fb2ce86cfb7877efa1aee6bcaefd0c..263ddb235e3409380acf7391d4f964befa59d7c9 100644 (file)
--- 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 6effe139864b788586e2ff546242009ba8574202..6f8c013ba3543cc97e3aacb04d815946afd3f9c9 100644 (file)
--- 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 08885d26f660bbbf7ef4334b28c94019d86e9308..bb1f2b83647914d35118b6f2844da3807f481510 100644 (file)
--- 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 04926af16efe9f863eeb241744ad94010606fa6d..8974692751f484aaaabb2832f548de83fbd08820 100644 (file)
--- 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 3de0d2e73c0e0a812526790f953f1285412ad563..7f8728e47c446960700a1c6b1b60f3d5cd12f047 100644 (file)
--- 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