13 files changed, 260 insertions, 92 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fc26846057..b42647a61bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,56 @@
+2007-04-19  Kevin Ryde  <user42@zip.com.au>
+
+        * arc-mode.el (archive-find-type): lzh-exe for lzh self-extracting exe.
+        (archive-lzh-summarize): Add optional start arg for where to start
+        looking at the archive.
+        (archive-lzh-exe-summarize, archive-lzh-exe-extract): New functions.
+
+        * international/mule.el (auto-coding-alist): no-conversion for .exe
+        and .EXE.
+
+2007-04-19  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-in-function-trailer-p): Fix this: when a
+        function return type contains "struct", "union", etc.
+        c-end-of-defun goes too far forward.
+
+2007-04-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * paren.el (show-paren-function): Reset window-start to avoid
+        recentering.
+
+2007-04-19  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/todo-mode.el: Fix typo: "threshhold" -> "threshold".
+
+2007-04-18  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/diary-lib.el (diary-header-line-format): Add a custom
+        :set function.
+        (diary-list-entries): Only switch to diary-mode from
+        default-major-mode (reverts 2007-03-21 change).  Otherwise, if in
+        diary-mode set header-line-format, in case of any customization.
+
+2007-04-18  Levin Du  <zslevin@gmail.com>  (tiny change)
+
+        * calendar/parse-time.el (parse-time-string-chars): Check if CHAR
+        is less than the length of parse-time-syntax.
+
+2007-04-17  David Kastrup  <dak@gnu.org>
+
+        * replace.el (query-replace-regexp-eval): Deprecate.
+
+2007-04-17  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-beginning-of-defun): With -ve arg and
+        point too close to EOB, leave point at EOB rather than last `}'.
+
+2007-04-17  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+        * textmodes/bibtex.el (bibtex-include-OPTkey)
+        (bibtex-user-optional-fields, bibtex-entry-field-alist):
+        Fix defcustom.
+
 2007-04-17  Glenn Morris  <rgm@gnu.org>
 
         * calendar/cal-dst.el (calendar-dst-find-startend): If YEAR cannot
@@ -66,8 +119,7 @@
 
 2007-04-13  Chong Yidong  <cyd@stupidchicken.com>
 
-        * progmodes/compile.el (compilation-start): Revert 2007-03-25
-        change.
+        * progmodes/compile.el (compilation-start): Revert 2007-03-25 change.
 
         * files.el: Ditto.
 
@@ -135,8 +187,8 @@
 
 2007-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * desktop.el (desktop-save, desktop-create-buffer): Replace mapcar with
-        dolist.
+        * desktop.el (desktop-save, desktop-create-buffer): Replace mapcar
+        with dolist.
         (after-init-hook): Don't quote lambda.
         (desktop-first-buffer): Don't wrap it in eval-when-compile.
         (desktop-internal-v2s): Remove unused var `el'.
@@ -715,6 +767,13 @@
         (number-of-diary-entries): Change :set to use diary-set-maybe-redraw.
         (diary-list-entries): Always run diary-mode.
 
+2007-03-20  Kenichi Handa  <handa@m17n.org>
+
+        * international/quail.el (quail-setup-completion-buf): Make the
+        completion buffer read-only.
+        (quail-completion): Adjusted for the above change.  Leave the
+        modified flag nil.
+
 2007-03-20  David Kastrup  <dak@gnu.org>
 
         * files.el (magic-mode-alist): Require literal "%!PS" string for
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 8630d3e8b06..1a22ac628e6 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -700,6 +700,10 @@ archive.
                 (string-match "\\.[aA][rR][cC]$"
                               (or buffer-file-name (buffer-name))))
            'arc)
+          ;; This pattern modelled on the BSD/GNU+Linux `file' command.
+          ;; Have seen capital "LHA's", and file has lower case "LHa's" too.
+          ;; Note this regexp is also in archive-exe-p.
+          ((looking-at "MZ\\(.\\|\n\\)\\{34\\}LH[aA]'s SFX ") 'lzh-exe)
           (t (error "Buffer format not recognized")))))
 ;; -------------------------------------------------------------------------
 (defun archive-summarize (&optional shut-up)
@@ -1398,8 +1402,8 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 ;; -------------------------------------------------------------------------
 ;; Section: Lzh Archives
 
-(defun archive-lzh-summarize ()
-  (let ((p 1)
+(defun archive-lzh-summarize (&optional start)
+  (let ((p (or start 1)) ;; 1 for .lzh, something further on for .exe
         (totalsize 0)
         (maxlen 8)
         files
@@ -1621,6 +1625,34 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
    ;; This should work even though newmode will be dynamically accessed.
    (lambda (old) (archive-calc-mode old newmode t))
    files "a unix-style mode" 8))
+
+;; -------------------------------------------------------------------------
+;; Section: Lzh Self-Extracting .exe Archives
+;;
+;; No support for modifying these files.  It looks like the lha for unix
+;; program (as of version 1.14i) can't create or retain the DOS exe part.
+;; If you do an "lha a" on a .exe for instance it renames and writes to a
+;; plain .lzh.
+
+(defun archive-lzh-exe-summarize ()
+  "Summarize the contents of an LZH self-extracting exe, for `archive-mode'."
+
+  ;; Skip the initial executable code part and apply archive-lzh-summarize
+  ;; to the archive part proper.  The "-lh5-" etc regexp here for the start
+  ;; is the same as in archive-find-type.
+  ;;
+  ;; The lha program (version 1.14i) does this in skip_msdos_sfx1_code() by
+  ;; a similar scan.  It looks for "..-l..-" plus for level 0 or 1 a test of
+  ;; the header checksum, or level 2 a test of the "attribute" and size.
+  ;;
+  (re-search-forward "..-l[hz][0-9ds]-" nil)
+  (archive-lzh-summarize (match-beginning 0)))
+
+;; `archive-lzh-extract' runs "lha pq", and that works for .exe as well as
+;; .lzh files
+(defalias 'archive-lzh-exe-extract 'archive-lzh-extract
+  "Extract a member from an LZH self-extracting exe, for `archive-mode'.")
+
 ;; -------------------------------------------------------------------------
 ;; Section: Zip Archives
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index df01a508031..ee93b60eb98 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -276,6 +276,7 @@ The format of the header is specified by `diary-header-line-format'."
   :group   'diary
   :type    'boolean
   :initialize 'custom-initialize-default
+  ;; FIXME overkill.
   :set 'diary-set-maybe-redraw
   :version "22.1")
 
@@ -292,6 +293,9 @@ before edit/copy"
 Only used if `diary-header-line-flag' is non-nil."
   :group   'diary
   :type    'sexp
+  :initialize 'custom-initialize-default
+  ;; FIXME overkill.
+  :set 'diary-set-maybe-redraw
   :version "22.1")
 
 (defvar diary-saved-point)              ; internal
@@ -434,10 +438,17 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list."
             (or (verify-visited-file-modtime diary-buffer)
                 (revert-buffer t t))))
         ;; Setup things like the header-line-format and invisibility-spec.
-        ;; This used to only run if the major-mode was default-major-mode,
-        ;; but that meant eg changes to header-line-format did not
-        ;; take effect from one diary invocation to the next.
-        (diary-mode)
+        (if (eq major-mode default-major-mode)
+            (diary-mode)
+          ;; This kludge is to make customizations to
+          ;; diary-header-line-flag after diary has been displayed
+          ;; take effect. Unconditionally calling (diary-mode)
+          ;; clobbers file local variables.
+          ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00363.html
+          ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00404.html
+          (if (eq major-mode 'diary-mode)
+              (setq header-line-format (and diary-header-line-flag
+                                            diary-header-line-format))))
         ;; d-s-p is passed to the diary display function.
         (let ((diary-saved-point (point)))
           (save-excursion
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index 4a786da7726..0913bc92160 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -66,7 +66,8 @@
   (aref parse-time-digits char))
 
 (defsubst parse-time-string-chars (char)
-  (aref parse-time-syntax char))
+  (and (< char (length parse-time-syntax))
+       (aref parse-time-syntax char)))
 
 (put 'parse-error 'error-conditions '(parse-error error))
 (put 'parse-error 'error-message "Parsing error")
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 9449c84cb2a..f70400ed27d 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -205,11 +205,11 @@
 ;;      by the binary insertion algorithm.  However, you may not
 ;;      really have a need for such accurate priorities amongst your
 ;;      TODO items.  If you now think about the binary insertion
-;;      halfing the size of the window each time, then the threshhold
+;;      halfing the size of the window each time, then the threshold
 ;;      is the window size at which it will stop.  If you set the
-;;      threshhold to zero, the upper and lower bound will coincide at
+;;      threshold to zero, the upper and lower bound will coincide at
 ;;      the end of the loop and you will insert your item just before
-;;      that point.  If you set the threshhold to, e.g. 8, it will stop
+;;      that point.  If you set the threshold to, e.g. 8, it will stop
 ;;      as soon as the window size drops below that amount and will
 ;;      insert the item in the approximate centre of that window.  I
 ;;      got the idea for this feature after reading a very helpful
@@ -307,10 +307,10 @@ If you have 8 items in your TODO list, then you may get asked 4
 questions by the binary insertion algorithm.  However, you may not
 really have a need for such accurate priorities amongst your TODO
 items.  If you now think about the binary insertion halfing the size
-of the window each time, then the threshhold is the window size at
-which it will stop.  If you set the threshhold to zero, the upper and
+of the window each time, then the threshold is the window size at
+which it will stop.  If you set the threshold to zero, the upper and
 lower bound will coincide at the end of the loop and you will insert
-your item just before that point.  If you set the threshhold to,
+your item just before that point.  If you set the threshold to,
 e.g. 8, it will stop as soon as the window size drops below that
 amount and will insert the item in the approximate center of that
 window."
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8f094dd6537..b02dc6c2f8e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2007-04-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-mime-strip-charset-parameters): New function.
+        (gnus-mime-view-part-as-charset): Use it; redisplay subpart currently
+        displayed of multipart/alternative part if it is invoked from summary
+        buffer.
+        (gnus-article-part-wrapper): Select article window.
+
+        * mm-view.el (mm-inline-text-html-render-with-w3m)
+        (mm-inline-text-html-render-with-w3m-standalone)
+        (mm-inline-render-with-function): Use mail-parse-charset by default.
+
 2007-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-msg.el (gnus-inews-yank-articles): Use
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 552f3a68f49..6ae52b5eedd 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4606,6 +4606,21 @@ are decompressed."
            (mm-string-to-multibyte contents)))
         (goto-char b)))))
 
+(defun gnus-mime-strip-charset-parameters (handle)
+  "Strip charset parameters from HANDLE."
+  (if (stringp (car handle))
+      (mapc #'gnus-mime-strip-charset-parameters (cdr handle))
+    (let* ((type (mm-handle-type (if (equal (mm-handle-media-type handle)
+                                            "message/external-body")
+                                     (progn
+                                       (unless (mm-handle-cache handle)
+                                         (mm-extern-cache-contents handle))
+                                       (mm-handle-cache handle))
+                                   handle)))
+           (charset (assq 'charset (cdr type))))
+      (when charset
+        (delq charset type)))))
+
 (defun gnus-mime-view-part-as-charset (&optional handle arg)
   "Insert the MIME part under point into the current buffer using the
 specified charset."
@@ -4614,7 +4629,7 @@ specified charset."
   (let ((handle (or handle (get-text-property (point) 'gnus-data)))
         (fun (get-text-property (point) 'gnus-callback))
         (gnus-newsgroup-ignored-charsets 'gnus-all)
-        gnus-newsgroup-charset type charset)
+        gnus-newsgroup-charset form preferred parts)
     (when handle
       (if (mm-handle-undisplayer handle)
           (mm-remove-part handle))
@@ -4622,17 +4637,24 @@ specified charset."
         (setq gnus-newsgroup-charset
               (or (cdr (assq arg gnus-summary-show-article-charset-alist))
                   (mm-read-coding-system "Charset: ")))
-        ;; Strip the charset parameter from `handle'.
-        (setq type (mm-handle-type
-                    (if (equal (mm-handle-media-type handle)
-                               "message/external-body")
-                        (progn
-                          (unless (mm-handle-cache handle)
-                            (mm-extern-cache-contents handle))
-                          (mm-handle-cache handle))
-                      handle))
-              charset (assq 'charset (cdr type)))
-        (delq charset type)
+        (gnus-mime-strip-charset-parameters handle)
+        (when (and (consp (setq form (cdr-safe fun)))
+                   (setq form (ignore-errors
+                                (assq 'gnus-mime-display-alternative form)))
+                   (setq preferred (caddr form))
+                   (progn
+                     (when (eq (car preferred) 'quote)
+                       (setq preferred (cadr preferred)))
+                     (not (equal preferred
+                                 (get-text-property (point) 'gnus-data))))
+                   (setq parts (get-text-property (point) 'gnus-part))
+                   (setq parts (cdr (assq parts
+                                          gnus-article-mime-handle-alist)))
+                   (equal (mm-handle-media-type parts) "multipart/alternative")
+                   (setq parts (reverse (cdr parts))))
+          (setcar (cddr form)
+                  (list 'quote (or (cadr (member preferred parts))
+                                   (car parts)))))
         (funcall fun handle)))))
 
 (defun gnus-mime-view-part-externally (&optional handle)
@@ -4688,13 +4710,22 @@ If no internal viewer is available, use an external viewer."
         (funcall (cdr action-pair)))))
 
 (defun gnus-article-part-wrapper (n function)
-  (save-current-buffer
-    (set-buffer gnus-article-buffer)
-    (when (> n (length gnus-article-mime-handle-alist))
-      (error "No such part"))
-    (gnus-article-goto-part n)
-    (let ((handle (cdr (assq n gnus-article-mime-handle-alist))))
-      (funcall function handle))))
+  (let ((window (get-buffer-window gnus-article-buffer 'visible))
+        frame)
+    (when window
+      ;; It is necessary to select the article window so that
+      ;; `gnus-article-goto-part' may really move the point.
+      (setq frame (selected-frame))
+      (gnus-select-frame-set-input-focus (window-frame window))
+      (unwind-protect
+          (save-window-excursion
+            (select-window window)
+            (when (> n (length gnus-article-mime-handle-alist))
+              (error "No such part"))
+            (gnus-article-goto-part n)
+            (let ((handle (cdr (assq n gnus-article-mime-handle-alist))))
+              (funcall function handle)))
+        (gnus-select-frame-set-input-focus frame)))))
 
 (defun gnus-article-pipe-part (n)
   "Pipe MIME part N, which is the numerical prefix."
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 14d480fe7df..888c814bf24 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -238,7 +238,8 @@
   (mm-setup-w3m)
   (let ((text (mm-get-part handle))
         (b (point))
-        (charset (mail-content-type-get (mm-handle-type handle) 'charset)))
+        (charset (or (mail-content-type-get (mm-handle-type handle) 'charset)
+                     mail-parse-charset)))
     (save-excursion
       (insert (if charset (mm-decode-string text charset) text))
       (save-restriction
@@ -302,7 +303,9 @@
   "Render a text/html part using w3m."
   (if (mm-w3m-standalone-supports-m17n-p)
       (let ((source (mm-get-part handle))
-            (charset (mail-content-type-get (mm-handle-type handle) 'charset))
+            (charset (or (mail-content-type-get (mm-handle-type handle)
+                                                'charset)
+                         (symbol-name mail-parse-charset)))
             cs)
         (unless (and charset
                      (setq cs (mm-charset-to-coding-system charset))
@@ -368,7 +371,8 @@
 
 (defun mm-inline-render-with-function (handle func &rest args)
   (let ((source (mm-get-part handle))
-        (charset (mail-content-type-get (mm-handle-type handle) 'charset)))
+        (charset (or (mail-content-type-get (mm-handle-type handle) 'charset)
+                     mail-parse-charset)))
     (mm-insert-inline
      handle
      (mm-with-multibyte-buffer
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index e873aadb8b4..7e137d987b3 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1586,8 +1586,10 @@ text, and convert it in the temporary buffer.  Otherwise, convert in-place."
 ;;; FILE I/O
 
 (defcustom auto-coding-alist
-  '(("\\.\\(arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\)\\'" . no-conversion)
-    ("\\.\\(ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\)\\'" . no-conversion)
+  ;; .exe and .EXE are added to support archive-mode looking at DOS
+  ;; self-extracting exe archives.
+  '(("\\.\\(arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|exe\\)\\'" . no-conversion)
+    ("\\.\\(ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|EXE\\)\\'" . no-conversion)
     ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
     ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
     ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
diff --git a/lisp/paren.el b/lisp/paren.el
index 95f718d5683..17f0c401901 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -143,6 +143,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
       (let ((oldpos (point))
             (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
                        ((eq (syntax-class (syntax-after (point)))      4) 1)))
+            (window-start (window-start))
             pos mismatch face)
         ;;
         ;; Find the other end of the sexp.
@@ -247,7 +248,12 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
           ;;
           ;; Always set the overlay face, since it varies.
           (overlay-put show-paren-overlay 'priority show-paren-priority)
-          (overlay-put show-paren-overlay 'face face)))
+          (overlay-put show-paren-overlay 'face face))
+        ;; If there are continued lines, the above operations can
+        ;; force redisplay to recenter the window (since there is no
+        ;; way for it to know that the overlay changes to the buffer
+        ;; are harmless).  So reset the window-start.
+        (set-window-start (selected-window) window-start))
     ;; show-paren-mode is nil in this buffer.
     (and show-paren-overlay
          (delete-overlay show-paren-overlay))
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 79043c87b63..9ef4aaace72 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1360,10 +1360,24 @@ No indentation or other \"electric\" behavior is performed."
   (and c-opt-block-decls-with-vars-key
        (save-excursion
          (c-syntactic-skip-backward "^;}" lim)
-         (and (eq (char-before) ?\})
-              (eq (car (c-beginning-of-decl-1 lim)) 'previous)
-              (looking-at c-opt-block-decls-with-vars-key)
-              (point)))))
+         (let ((eo-block (point))
+               bod)
+           (and (eq (char-before) ?\})
+                (eq (car (c-beginning-of-decl-1 lim)) 'previous)
+                (setq bod (point))
+                ;; Look for struct or union or ...  If we find one, it might
+                ;; be the return type of a function, or the like.  Exclude
+                ;; this case.
+                (c-syntactic-re-search-forward
+                 (concat "[;=\(\[{]\\|\\("
+                         c-opt-block-decls-with-vars-key
+                         "\\)")
+                 eo-block t t t)
+                (match-beginning 1)     ; Is there a "struct" etc., somewhere?
+                (not (eq (char-before) ?_))
+                (c-syntactic-re-search-forward "[;=\(\[{]" eo-block t t t)
+                (eq (char-before) ?\{)
+                bod)))))
 
 (defun c-where-wrt-brace-construct ()
   ;; Determine where we are with respect to functions (or other brace
@@ -1531,7 +1545,7 @@ defun."
               (setq arg (c-forward-to-nth-EOF-} (- arg) where)))
           ;; Move forward to the next opening brace....
           (when (and (= arg 0)
-                     (c-syntactic-re-search-forward "{" nil t))
+                     (c-syntactic-re-search-forward "{" nil 'eob))
             (backward-char)
             ;; ... and backward to the function header.
             (c-beginning-of-decl-1)
diff --git a/lisp/replace.el b/lisp/replace.el
index a8dfd043c72..ed1fa9a6b59 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -303,6 +303,11 @@ Use \\[repeat-complex-command] after this command for details."
 
 (defun query-replace-regexp-eval (regexp to-expr &optional delimited start end)
   "Replace some things after point matching REGEXP with the result of TO-EXPR.
+
+Interactive use of this function is deprecated in favor of the
+`\\,' feature of `query-replace-regexp'.  For non-interactive use, a loop
+using `search-forward-regexp' and `replace-match' is preferred.
+
 As each match is found, the user must type a character saying
 what to do with it.  For directions, type \\[help-command] at that time.
 
@@ -354,6 +359,11 @@ Fourth and fifth arg START and END specify the region to operate on."
   (perform-replace regexp (cons 'replace-eval-replacement to-expr)
                    t 'literal delimited nil nil start end))
 
+(make-obsolete 'query-replace-regexp-eval
+  "for interactive use, use the special `\\,' feature of
+`query-replace-regexp' instead.  Non-interactively, a loop
+using `search-forward-regexp' and `replace-match' is preferred." "22.1")
+
 (defun map-query-replace-regexp (regexp to-strings &optional n start end)
   "Replace some matches for REGEXP with various strings, in rotation.
 The second argument TO-STRINGS contains the replacement strings,
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 0545ca85812..0b413e3b7ab 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -86,7 +86,7 @@ If this is a function, call it to generate the initial field text."
   :group 'bibtex
   :type '(choice (const :tag "None" nil)
                  (string :tag "Initial text")
-                 (function :tag "Initialize Function" :value fun)
+                 (function :tag "Initialize Function")
                  (const :tag "Default" t)))
 (put 'bibtex-include-OPTkey 'risky-local-variable t)
 
@@ -98,11 +98,8 @@ CROSSREF-OPTIONAL lists in `bibtex-entry-field-alist' (which see)."
   :group 'bibtex
   :type '(repeat (group (string :tag "Field")
                         (string :tag "Comment")
-                        (option (group :inline t
-                                       :extra-offset -4
-                                       (choice :tag "Init" :value ""
-                                               string
-                                               function))))))
+                        (option (choice :tag "Init"
+                                        (const nil) string function)))))
 (put 'bibtex-user-optional-fields 'risky-local-variable t)
 
 (defcustom bibtex-entry-format
@@ -454,45 +451,34 @@ of the field, and ALTERNATIVE-FLAG (either nil or t) marks if the
 field is an alternative.  ALTERNATIVE-FLAG may be t only in the
 REQUIRED or CROSSREF-REQUIRED lists."
   :group 'bibtex
-  :type '(repeat (list (string :tag "Entry name")
-                       (list (repeat :tag "required"
-                                     (group (string :tag "Field")
-                                            (string :tag "Comment")
-                                            (option (choice :tag "Init" :value nil
-                                                            (const nil)
-                                                            (string :tag "string")
-                                                            (function :tag "function")))
-                                            (option (choice (const nil)
-                                                            (const :tag "Alternative" t)))))
-                             (repeat :tag "optional"
-                                     (group (string :tag "Field")
-                                            (string :tag "Comment")
-                                            (option (choice :tag "Init" :value nil
-                                                            (const nil)
-                                                            (string :tag "string")
-                                                            (function :tag "function")))
-                                            (option (choice (const nil)
-                                                            (const :tag "Alternative" t))))))
-                       (option
-                        (list :tag "Crossref"
-                              (repeat :tag "required"
-                                      (group (string :tag "Field")
-                                             (string :tag "Comment")
-                                             (option (choice :tag "Init" :value nil
-                                                             (const nil)
-                                                             (string :tag "string")
-                                                             (function :tag "function")))
-                                             (option (choice (const nil)
-                                                             (const :tag "Alternative" t)))))
-                              (repeat :tag "optional"
-                                      (group (string :tag "Field")
-                                             (string :tag "Comment")
-                                             (option (choice :tag "Init" :value nil
-                                                             (const nil)
-                                                             (string :tag "string")
-                                                             (function :tag "function")))
-                                             (option (choice (const nil)
-                                                             (const :tag "Alternative" t))))))))))
+  :type '(repeat (group (string :tag "Entry name")
+                        (group (repeat :tag "Required fields"
+                                       (group (string :tag "Field")
+                                              (string :tag "Comment")
+                                              (option (choice :tag "Init" :value nil
+                                                              (const nil) string function))
+                                              (option (choice :tag "Alternative"
+                                                              (const :tag "No" nil)
+                                                              (const :tag "Yes" t)))))
+                               (repeat :tag "Optional fields"
+                                       (group (string :tag "Field")
+                                              (string :tag "Comment")
+                                              (option (choice :tag "Init" :value nil
+                                                              (const nil) string function)))))
+                        (option :extra-offset -4
+                         (group (repeat :tag "Crossref: required fields"
+                                        (group (string :tag "Field")
+                                               (string :tag "Comment")
+                                               (option (choice :tag "Init" :value nil
+                                                               (const nil) string function))
+                                               (option (choice :tag "Alternative"
+                                                               (const :tag "No" nil)
+                                                               (const :tag "Yes" t)))))
+                                (repeat :tag "Crossref: optional fields"
+                                        (group (string :tag "Field")
+                                               (string :tag "Comment")
+                                               (option (choice :tag "Init" :value nil
+                                                               (const nil) string function)))))))))
 (put 'bibtex-entry-field-alist 'risky-local-variable t)
 
 (defcustom bibtex-comment-start "@Comment"