Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267

3 files changed, 100 insertions, 24 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d7ebedc53f8..b605875da89 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2004-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-emphasis-alist): Don't hide asterisks by
+        default; improve customization type.
+        (gnus-emphasis-custom-with-format): New macro.
+        (gnus-emphasis-custom-value-to-external): New function.
+        (gnus-emphasis-custom-value-to-internal): New function.
+
+2004-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-msg.el (gnus-configure-posting-styles): Don't cause the
+        "Args out of range" error.  Reported by Arnaud Giersch
+        <arnaud.giersch@free.fr>.
+
 2004-11-04  Richard M. Stallman  <rms@gnu.org>
 
         * spam.el (spam group): Add :version.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c0266300983..a87348188f9 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -321,27 +321,55 @@ advertisements.  For example:
   :version "21.4"
   :group 'gnus-article-washing)
 
+(defmacro gnus-emphasis-custom-with-format (&rest body)
+  `(let ((format "\
+\\(\\s-\\|^\\|\\=\\|[-\"]\\|\\s(\\)\\(%s\\(\\w+\\(\\s-+\\w+\\)*[.,]?\\)%s\\)\
+\\(\\([-,.;:!?\"]\\|\\s)\\)+\\s-\\|[?!.]\\s-\\|\\s)\\|\\s-\\)"))
+     ,@body))
+
+(defun gnus-emphasis-custom-value-to-external (value)
+  (gnus-emphasis-custom-with-format
+   (if (consp (car value))
+       (list (format format (car (car value)) (cdr (car value)))
+             2
+             (if (nth 1 value) 2 3)
+             (nth 2 value))
+     value)))
+
+(defun gnus-emphasis-custom-value-to-internal (value)
+  (gnus-emphasis-custom-with-format
+   (let ((regexp (concat "\\`"
+                         (format (regexp-quote format)
+                                 "\\([^()]+\\)" "\\([^()]+\\)")
+                         "\\'"))
+         pattern)
+     (if (string-match regexp (setq pattern (car value)))
+         (list (cons (match-string 1 pattern) (match-string 2 pattern))
+               (= (nth 2 value) 2)
+               (nth 3 value))
+       value))))
+
 (defcustom gnus-emphasis-alist
-  (let ((format
-         "\\(\\s-\\|^\\|\\=\\|[-\"]\\|\\s(\\)\\(%s\\(\\w+\\(\\s-+\\w+\\)*[.,]?\\)%s\\)\\(\\([-,.;:!?\"]\\|\\s)\\)+\\s-\\|[?!.]\\s-\\|\\s)\\|\\s-\\)")
-        (types
-         '(("\\*" "\\*" bold)
+  (let ((types
+         '(("\\*" "\\*" bold nil 2)
            ("_" "_" underline)
            ("/" "/" italic)
            ("_/" "/_" underline-italic)
            ("_\\*" "\\*_" underline-bold)
            ("\\*/" "/\\*" bold-italic)
            ("_\\*/" "/\\*_" underline-bold-italic))))
-    `(,@(mapcar
-         (lambda (spec)
-           (list
-            (format format (car spec) (cadr spec))
-            2 3 (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
-         types)
-        ("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
-         2 3 gnus-emphasis-strikethru)
-        ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
-         2 3 gnus-emphasis-underline)))
+    (nconc
+     (gnus-emphasis-custom-with-format
+      (mapcar (lambda (spec)
+                (list (format format (car spec) (cadr spec))
+                      (or (nth 3 spec) 2)
+                      (or (nth 4 spec) 3)
+                      (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
+              types))
+     '(("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
+        2 3 gnus-emphasis-strikethru)
+       ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
+        2 3 gnus-emphasis-underline))))
   "*Alist that says how to fontify certain phrases.
 Each item looks like this:
 
@@ -352,11 +380,43 @@ is a number that says what regular expression grouping used to find
 the entire emphasized word.  The third is a number that says what
 regexp grouping should be displayed and highlighted.  The fourth
 is the face used for highlighting."
-  :type '(repeat (list :value ("" 0 0 default)
-                       regexp
-                       (integer :tag "Match group")
-                       (integer :tag "Emphasize group")
-                       face))
+  :type
+  '(repeat
+    (menu-choice
+     :format "%[Customizing Style%]\n%v"
+     :indent 2
+     (group :tag "Default"
+            :value ("" 0 0 default)
+            :value-create
+            (lambda (widget)
+              (let ((value (widget-get
+                            (cadr (widget-get (widget-get widget :parent)
+                                              :args))
+                            :value)))
+                (if (not (eq (nth 2 value) 'default))
+                    (widget-put
+                     widget
+                     :value
+                     (gnus-emphasis-custom-value-to-external value))))
+              (widget-group-value-create widget))
+            (regexp :format "%t: %v\n" :size 1)
+            (integer :format "Match group: %v\n" :size 0)
+            (integer  :format "Emphasize group: %v\n" :size 0)
+            face)
+     (group :tag "Simple"
+            :value (("_" . "_") nil default)
+            (cons :format "%v"
+                  (regexp :format "Start regexp: %v\n" :size 0)
+                  (regexp :format "End regexp: %v\n" :size 0))
+            (boolean :format "Show start and end patterns: %[%v%]\n"
+                     :on " On " :off " Off ")
+            face)))
+  :get (lambda (symbol)
+         (mapcar 'gnus-emphasis-custom-value-to-internal
+                 (default-value symbol)))
+  :set (lambda (symbol value)
+         (set-default symbol (mapcar 'gnus-emphasis-custom-value-to-external
+                                     value)))
   :group 'gnus-article-emphasis)
 
 (defcustom gnus-emphasize-whitespace-regexp "^[ \t]+\\|[ \t]*\n"
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 6b093480940..7948efc2572 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1871,11 +1871,13 @@ this is a reply."
             (when (and filep v)
               (setq v (with-temp-buffer
                         (insert-file-contents v)
-                        (goto-char (point-max))
-                        (skip-chars-backward "\n")
-                        (delete-region (+ (point) (if (bolp) 0 1))
-                                       (point-max))
-                        (buffer-string))))
+                        (buffer-substring
+                         (point-min)
+                         (progn
+                           (goto-char (point-max))
+                           (if (zerop (skip-chars-backward "\n"))
+                               (point)
+                             (1+ (point))))))))
             (setq results (delq (assoc element results) results))
             (push (cons element v) results))))
       ;; Now we have all the styles, so we insert them.