Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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


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

17 files changed, 373 insertions, 204 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81da604aea5..aea6e7d6d10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,87 @@
+2004-05-22  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/paragraphs.el (sentence-end): Match unicode curly quotes
+        as a close quote.
+
+        * textmodes/bibtex.el: Use assoc-string, not assoc-ignore-case.
+
+        * progmodes/idlw-shell.el (idlwave-shell-get-object-class): 
+        Use assoc-string, not assoc-ignore-case.
+        
+        * progmodes/ada-mode.el: Use assoc-string, not assoc-ignore-case.
+
+        * emacs-lisp/lisp.el (mark-defun, narrow-to-defun):
+        If moving back then fwd gets a defun that ends before point,
+        try again moving fwd then back.
+
+        * files.el (file-name-non-special): Allow t in file-arg-indices
+        to mean requote the return value.  Use `identity' as an element
+        rather than as the whole value.
+
+        * gs.el (gs-options): Add -dSAFER.  Mark it risky.
+
+2004-05-22  Juanma Barranquero  <lektu@terra.es>
+
+        * help-fns.el (help-add-fundoc-usage): Use %S only for output of
+        `help-make-usage'.
+        (help-highlight-arguments): Skip function name before searching
+        for arguments.
+
+2004-05-21  Juanma Barranquero  <lektu@terra.es>
+
+        * allout.el (allout-chart-subtree, allout-rebullet-topic-grunt):
+        Don't mention in the docstring these arguments meant for
+        internal (recursive) use only.
+        (allout-char-spec): Comment out (it's not implemented).
+        (allout-old-expose-topic, allout-exposure): Fix docstring and add
+        obsolescence declaration.
+        (allout-flatten-exposed-to-buffer)
+        (allout-indented-exposed-to-buffer): Fix typos in docstring.
+        (my-mark-marker): Doc fix.
+        (produce-allout-mode-map, allout-sibling-index)
+        (allout-isearch-expose, allout-distinctive-bullet)
+        (allout-open-topic, allout-reindent-body)
+        (allout-rebullet-heading, allout-process-exposed)
+        (allout-insert-listified, allout-latex-verb-quote)
+        (allout-insert-latex-header, allout-insert-latex-trailer):
+        Make arguments match their use in docstring.
+        (allout-primary-bullet, allout-old-style-prefixes)
+        (allout-inhibit-protection, allout-init, allout-mode)
+        (allout-before-change-protect, allout-flag-region):
+        Use "Emacs" instead of "emacs" in docstrings.
+
+2004-05-21  Masayuki Ataka  <ataka@milk.freemail.ne.jp>  (tiny change)
+
+        * international/characters.el: Modify syntax of more characters.
+
+2004-05-21  Masatake YAMATO  <jet@gyve.org>
+
+        * progmodes/etags.el (tags-apropos, list-tags): Require
+        apropos.
+        (etags-tags-completion-table): Show parsing progress.
+
+2004-05-20  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * locate.el (locate-prompt-for-command): Shorten first line of
+        docstring.
+        (locate-mode): Expand docstring and include keymap summary.
+
+        * files.el (find-file-noselect-1): Limit the scope of the
+        `inhibit-read-only' binding.  Make sure that `inhibit-read-only'
+        is, by default, nil during the execution of
+        `find-file-not-found-functions' and `find-file-hook'.
+
+2004-05-20  Michael Mauger  <mmaug@yahoo.com>
+
+        * facemenu.el (facemenu-color-name-equal): New function.
+        (list-colors-display): Use it to compare colors instead of
+        facemenu-color-equal.
+
+2004-05-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * compare-w.el (compare-windows-face): Use min-colors instead of
+        checking for tty or pc types.
+
 2004-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (do-auto-fill): Remove unused vars `bol' and `opoint'.
@@ -23,7 +107,7 @@
 2004-05-19  Masatake YAMATO  <jet@gyve.org>
 
         * wid-edit.el (widget-radio-button-notify): Revert my last
-        change. Reported by Katsumi Yamaoka <yamaoka@jpl.org>.
+        change.  Reported by Katsumi Yamaoka <yamaoka@jpl.org>.
 
 2004-05-19  Kenichi Handa  <handa@m17n.org>
 
@@ -598,7 +682,7 @@
         list of arguments in a string.
         (help-highlight-arguments): Highlight the function arguments and
         all uses of them in the docstring.
-        (describe-function-1): Use it. Do docstring output via `insert',
+        (describe-function-1): Use it.  Do docstring output via `insert',
         not 'princ', so text attributes are preserved.
 
         * winner.el (winner-mode-map): Move `winner-undo' and
@@ -623,7 +707,7 @@
         (bibtex-parse-entry): Fix docstring.
         (bibtex-print-help-message): Use bibtex-field-list.
         (bibtex-make-field): Use bibtex-field-list.
-        (bibtex-entry-index): Bugfix. Return crossref key if required.
+        (bibtex-entry-index): Bugfix.  Return crossref key if required.
         (bibtex-lessp): Fix docstring.
 
 2004-05-03  Luc Teirlinck  <teirllm@auburn.edu>
diff --git a/lisp/allout.el b/lisp/allout.el
index 458db865535..dd4495cfa84 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,6 +1,6 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
-;; Copyright (C) 1992, 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 93, 94, 2001, 02, 2004 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <klm@zope.com>
 ;; Maintainer: Ken Manheimer <klm@zope.com>
@@ -46,7 +46,7 @@
 ;;
 ;; The outline menubar additions provide quick reference to many of
 ;; the features, and see the docstring of the function `allout-init'
-;; for instructions on priming your emacs session for automatic
+;; for instructions on priming your Emacs session for automatic
 ;; activation of `allout-mode'.
 ;;
 ;; See the docstring of the variables `allout-layout' and
@@ -162,7 +162,7 @@ prefix, which is concluded by bullets that includes the value of this
 var and the respective allout-*-bullets-string vars.
 
 The value of an asterisk (`*') provides for backwards compatibility
-with the original emacs outline mode.  See `allout-plain-bullets-string'
+with the original Emacs outline mode.  See `allout-plain-bullets-string'
 and `allout-distinctive-bullets-string' for the range of available
 bullets."
   :type 'string
@@ -263,7 +263,7 @@ from regular comments that start at bol.")
 
 Non-nil restricts the topic creation and modification
 functions to asterix-padded prefixes, so they look exactly
-like the original emacs-outline style prefixes.
+like the original Emacs-outline style prefixes.
 
 Whatever the setting of this variable, both old and new style prefixes
 are always respected by the topic maneuvering functions."
@@ -491,7 +491,7 @@ those that do not have the variable `comment-start' set.  A value of
 (defcustom allout-inhibit-protection nil
   "*Non-nil disables warnings and confirmation-checks for concealed-text edits.
 
-Outline mode uses emacs change-triggered functions to detect unruly
+Outline mode uses Emacs change-triggered functions to detect unruly
 changes to concealed regions.  Set this var non-nil to disable the
 protection, potentially increasing text-entry responsiveness a bit.
 
@@ -708,7 +708,7 @@ Works with respect to `allout-plain-bullets-string' and
 (defvar allout-mode-map nil "Keybindings for (allout) outline minor mode.")
 ;;;_   > produce-allout-mode-map (keymap-alist &optional base-map)
 (defun produce-allout-mode-map (keymap-list &optional base-map)
-  "Produce keymap for use as allout-mode-map, from keymap-list.
+  "Produce keymap for use as allout-mode-map, from KEYMAP-LIST.
 
 Built on top of optional BASE-MAP, or empty sparse map if none specified.
 See doc string for allout-keybindings-list for format of binding list."
@@ -939,7 +939,7 @@ MODE is one of the following symbols:
  - anything else \(eg, t) for auto-activation and auto-layout, without
    any confirmation check.
 
-Use this function to setup your emacs session for automatic activation
+Use this function to setup your Emacs session for automatic activation
 of allout outline mode, contingent to the buffer-specific setting of
 the `allout-layout' variable.  (See `allout-layout' and
 `allout-expose-topic' docstrings for more details on auto layout).
@@ -948,8 +948,8 @@ the `allout-layout' variable.  (See `allout-layout' and
 `allout-find-file-hook' in `find-file-hook', and giving
 `allout-auto-activation' a suitable setting.
 
-To prime your emacs session for full auto-outline operation, include
-the following two lines in your emacs init file:
+To prime your Emacs session for full auto-outline operation, include
+the following two lines in your Emacs init file:
 
 \(require 'allout)
 \(allout-init t)"
@@ -1044,7 +1044,7 @@ Below is a description of the bindings, and then explanation of
 special `allout-mode' features and terminology.  See also the outline
 menubar additions for quick reference to many of the features, and see
 the docstring of the function `allout-init' for instructions on
-priming your emacs session for automatic activation of `allout-mode'.
+priming your Emacs session for automatic activation of `allout-mode'.
 
 
 The bindings are dictated by the `allout-keybindings-list' and
@@ -1102,7 +1102,7 @@ C-c = p	allout-flatten-exposed-to-buffer
                                 Like above 'copy-exposed', but convert topic
                                 prefixes to section.subsection... numeric
                                 format.
-ESC ESC (allout-init t) Setup emacs session for outline mode
+ESC ESC (allout-init t) Setup Emacs session for outline mode
                                 auto-activation.
 
                  HOT-SPOT Operation
@@ -1132,7 +1132,7 @@ twice in a row to get to the hot-spot.
 
 Topic hierarchy constituents - TOPICS and SUBTOPICS:
 
-TOPIC:  A basic, coherent component of an emacs outline.  It can
+TOPIC:  A basic, coherent component of an Emacs outline.  It can
         contain other topics, and it can be subsumed by other topics,
 CURRENT topic:
         The visible topic most immediately containing the cursor.
@@ -1303,7 +1303,7 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
         )
 
                                        ; selective-display is the
-                                       ; emacs conditional exposure
+                                       ; Emacs conditional exposure
                                        ; mechanism:
       (allout-resumptions 'selective-display '(t))
       (if allout-inhibit-protection
@@ -1537,7 +1537,7 @@ Actually, returns prefix beginning point."
 (defun allout-sibling-index (&optional depth)
   "Item number of this prospective topic among its siblings.
 
-If optional arg depth is greater than current depth, then we're
+If optional arg DEPTH is greater than current depth, then we're
 opening a new level, and return 0.
 
 If less than this depth, ascend to that depth and count..."
@@ -1622,8 +1622,7 @@ Return the location of the beginning of the heading, or nil if not found."
   "Produce a location \"chart\" of subtopics of the containing topic.
 
 Optional argument LEVELS specifies the depth \(relative to start
-depth) for the chart.  Subsequent optional args are not for public
-use.
+depth) for the chart.
 
 Charts are used to capture outline structure, so that outline altering
 routines need assess the structure only once, and then use the chart
@@ -1636,9 +1635,11 @@ list containing, recursively, the charts for the respective subtopics.
 The chart for a topics' offspring precedes the entry for the topic
 itself.
 
-The other function parameters are for internal recursion, and should
-not be specified by external callers.  ORIG-DEPTH is depth of topic at
-starting point, and PREV-DEPTH is depth of prior topic."
+\(fn &optional levels)"
+
+  ;; The other function parameters are for internal recursion, and should
+  ;; not be specified by external callers.  ORIG-DEPTH is depth of topic at
+  ;; starting point, and PREV-DEPTH is depth of prior topic."
 
   (let ((original (not orig-depth))     ; `orig-depth' set only in recursion.
         chart curr-depth)
@@ -1652,7 +1653,7 @@ starting point, and PREV-DEPTH is depth of prior topic."
 
     ;; Loop over the current levels' siblings.  Besides being more
     ;; efficient than tail-recursing over a level, it avoids exceeding
-    ;; the typically quite constrained emacs max-lisp-eval-depth.
+    ;; the typically quite constrained Emacs max-lisp-eval-depth.
     ;;
     ;; Probably would speed things up to implement loop-based stack
     ;; operation rather than recursing for lower levels.  Bah.
@@ -1741,36 +1742,36 @@ start point."
         (setq chart (cdr chart))))
     result))
 ;;;_   X allout-chart-spec (chart spec &optional exposing)
-(defun allout-chart-spec (chart spec &optional exposing)
-  "Not yet \(if ever) implemented.
-
-Produce exposure directives given topic/subtree CHART and an exposure SPEC.
-
-Exposure spec indicates the locations to be exposed and the prescribed
-exposure status.  Optional arg EXPOSING is an integer, with 0
-indicating pending concealment, anything higher indicating depth to
-which subtopic headers should be exposed, and negative numbers
-indicating (negative of) the depth to which subtopic headers and
-bodies should be exposed.
-
-The produced list can have two types of entries.  Bare numbers
-indicate points in the buffer where topic headers that should be
-exposed reside.
-
- - bare negative numbers indicates that the topic starting at the
-   point which is the negative of the number should be opened,
-   including their entries.
- - bare positive values indicate that this topic header should be
-   opened.
- - Lists signify the beginning and end points of regions that should
-   be flagged, and the flag to employ.  (For concealment: `\(\?r\)', and
-   exposure:"
-  (while spec
-    (cond ((listp spec)
-           )
-          )
-    (setq spec (cdr spec)))
-  )
+;; (defun allout-chart-spec (chart spec &optional exposing)
+;;   "Not yet \(if ever) implemented.
+
+;; Produce exposure directives given topic/subtree CHART and an exposure SPEC.
+
+;; Exposure spec indicates the locations to be exposed and the prescribed
+;; exposure status.  Optional arg EXPOSING is an integer, with 0
+;; indicating pending concealment, anything higher indicating depth to
+;; which subtopic headers should be exposed, and negative numbers
+;; indicating (negative of) the depth to which subtopic headers and
+;; bodies should be exposed.
+
+;; The produced list can have two types of entries.  Bare numbers
+;; indicate points in the buffer where topic headers that should be
+;; exposed reside.
+
+;;  - bare negative numbers indicates that the topic starting at the
+;;    point which is the negative of the number should be opened,
+;;    including their entries.
+;;  - bare positive values indicate that this topic header should be
+;;    opened.
+;;  - Lists signify the beginning and end points of regions that should
+;;    be flagged, and the flag to employ.  (For concealment: `\(\?r\)', and
+;;    exposure:"
+;;   (while spec
+;;     (cond ((listp spec)
+;;         )
+;;        )
+;;     (setq spec (cdr spec)))
+;;   )
 
 ;;;_  - Within Topic
 ;;;_   > allout-goto-prefix ()
@@ -2138,7 +2139,7 @@ Changes to concealed regions are ignored while file is being written.
 writes, like crypt and zip modes.)
 
 Locally bound in outline buffers to `before-change-functions', which
-in emacs 19 is run before any change to the buffer.
+in Emacs 19 is run before any change to the buffer.
 
 Any functions which set [`this-command' to `undo', or which set]
 `allout-override-protect' non-nil (as does, eg, allout-flag-chars)
@@ -2153,7 +2154,7 @@ are exempt from this restriction."
                                         ; Both beginning and end chars must
                                         ; be exposed:
              (save-excursion (if (memq this-command '(newline open-line))
-                                 ;; Compensate for stupid emacs {new,
+                                 ;; Compensate for stupid Emacs {new,
                                  ;; open-}line display optimization:
                                  (setq beg (1+ beg)
                                        end (1+ end)))
@@ -2165,7 +2166,7 @@ are exempt from this restriction."
       (save-match-data
         (if (equal this-command 'undo)
                  ;; Allow undo without inhibition.
-                 ;; - Undoing new and open-line hits stupid emacs redisplay
+                 ;; - Undoing new and open-line hits stupid Emacs redisplay
                  ;;   optimization (em 19 cmds.c, ~ line 200).
                  ;; - Presumably, undoing what was properly protected when
                  ;;   done.
@@ -2331,7 +2332,7 @@ return to regular interpretation of self-insert characters."
         (let* ((this-key-num (cond
                               ((numberp last-command-char)
                                last-command-char)
-                              ;; XXX Only xemacs has characterp.
+                              ;; XXX Only XEmacs has characterp.
                               ((and (fboundp 'characterp)
                                     (characterp last-command-char))
                                (char-to-int last-command-char))
@@ -2385,7 +2386,7 @@ Called as part of `allout-post-command-business'."
 
 ;;;_   > allout-flag-region (from to flag)
 (defmacro allout-flag-region (from to flag)
-  "Hide or show lines from FROM to TO, via emacs selective-display FLAG char.
+  "Hide or show lines from FROM to TO, via Emacs selective-display FLAG char.
 Ie, text following flag C-m \(carriage-return) is hidden until the
 next C-j (newline) char.
 
@@ -2398,7 +2399,7 @@ Returns the endpoint of the region."
 
 ;;;_   > allout-isearch-expose (mode)
 (defun allout-isearch-expose (mode)
-  "Mode is either 'clear, 'start, 'continue, or 'final."
+  "MODE is either 'clear, 'start, 'continue, or 'final."
   ;; allout-isearch-prior-pos encodes exposure status of prior pos:
   ;; (pos was-vis header-pos end-pos)
   ;; pos        - point of concern
@@ -2507,7 +2508,7 @@ Offer one suitable for current depth DEPTH as default."
   )
 ;;;_   > allout-distinctive-bullet (bullet)
 (defun allout-distinctive-bullet (bullet)
-  "True if bullet is one of those on `allout-distinctive-bullets-string'."
+  "True if BULLET is one of those on `allout-distinctive-bullets-string'."
   (string-match (regexp-quote bullet) allout-distinctive-bullets-string))
 ;;;_   > allout-numbered-type-prefix (&optional prefix)
 (defun allout-numbered-type-prefix (&optional prefix)
@@ -2679,7 +2680,7 @@ index for each successive sibling)."
   )
 ;;;_   > allout-open-topic (relative-depth &optional before use_sib_bullet)
 (defun allout-open-topic (relative-depth &optional before use_sib_bullet)
-  "Open a new topic at depth DEPTH.
+  "Open a new topic at depth RELATIVE-DEPTH.
 
 New topic is situated after current one, unless optional flag BEFORE
 is non-nil, or unless current line is complete empty (not even
@@ -2900,7 +2901,7 @@ Maintains outline hanging topic indentation if
         (do-auto-fill))))
 ;;;_    > allout-reindent-body (old-depth new-depth &optional number)
 (defun allout-reindent-body (old-depth new-depth &optional number)
-  "Reindent body lines which were indented at old-depth to new-depth.
+  "Reindent body lines which were indented at OLD-DEPTH to NEW-DEPTH.
 
 Optional arg NUMBER indicates numbering is being added, and it must
 be accommodated.
@@ -2974,15 +2975,13 @@ Note that refill of indented paragraphs is not done."
 
   "Adjust bullet of current topic prefix.
 
-All args are optional.
-
 If SOLICIT is non-nil, then the choice of bullet is solicited from
 user.  If it's a character, then that character is offered as the
 default, otherwise the one suited to the context \(according to
 distinction or depth) is offered.  If non-nil, then the
 context-specific bullet is just used.
 
-Second arg DEPTH forces the topic prefix to that depth, regardless
+Second arg NEW-DEPTH forces the topic prefix to that depth, regardless
 of the topic's current depth.
 
 Third arg NUMBER-CONTROL can force the prefix to or away from
@@ -3095,13 +3094,13 @@ With repeat count, shift topic depth by that amount."
 contained subtopics.  See `allout-rebullet-heading' for rebulleting
 behavior.
 
-All arguments are optional.
-
-First arg RELATIVE-DEPTH means to shift the depth of the entire
+Arg RELATIVE-DEPTH means to shift the depth of the entire
 topic that amount.
 
-The rest of the args are for internal recursive use by the function
-itself.  The are STARTING-DEPTH, STARTING-POINT, and INDEX."
+\(fn &optional RELATIVE-DEPTH)"
+
+  ;; All args except the first one are for internal recursive use by the
+  ;; function itself.
 
   (let* ((relative-depth (or relative-depth 0))
          (new-depth (allout-depth))
@@ -3900,11 +3899,7 @@ Examples:
       max-pos)))
 ;;;_   > allout-old-expose-topic (spec &rest followers)
 (defun allout-old-expose-topic (spec &rest followers)
-
-  "Deprecated.  Use `allout-expose-topic' \(with different schema
-format) instead.
-
-Dictate wholesale exposure scheme for current topic, according to SPEC.
+  "Dictate wholesale exposure scheme for current topic, according to SPEC.
 
 SPEC is either a number or a list.  Optional successive args
 dictate exposure for subsequent siblings of current topic.
@@ -3931,7 +3926,7 @@ dictates the exposure depth of the topic as a whole.  Subsequent
 elements of the list are nested SPECs, dictating the specific exposure
 for the corresponding offspring of the topic.
 
-Optional FOLLOWER arguments dictate exposure for succeeding siblings."
+Optional FOLLOWERS arguments dictate exposure for succeeding siblings."
 
   (interactive "xExposure spec: ")
   (let ((depth (allout-current-depth))
@@ -3976,6 +3971,9 @@ Optional FOLLOWER arguments dictate exposure for succeeding siblings."
       (allout-old-expose-topic (car followers))
       (setq followers (cdr followers)))
     max-pos))
+(make-obsolete 'allout-old-expose-topic
+               "use `allout-expose-topic' (with different schema format) instead."
+               "19.23")
 ;;;_   > allout-new-exposure '()
 (defmacro allout-new-exposure (&rest spec)
   "Literal frontend for `allout-expose-topic', doesn't evaluate arguments.
@@ -4006,9 +4004,7 @@ Examples:
         (list 'allout-expose-topic (list 'quote spec))))
 ;;;_   > allout-exposure '()
 (defmacro allout-exposure (&rest spec)
-  "Being deprecated - use more recent `allout-new-exposure' instead.
-
-Literal frontend for `allout-old-expose-topic', doesn't evaluate arguments
+  "Literal frontend for `allout-old-expose-topic', doesn't evaluate arguments
 and retains start position."
   (list 'save-excursion
         '(if (not (or (allout-goto-prefix)
@@ -4016,6 +4012,7 @@ and retains start position."
              (error "Can't find any outline topics"))
         (cons 'allout-old-expose-topic
               (mapcar (function (lambda (x) (list 'quote x))) spec))))
+(make-obsolete 'allout-exposure 'allout-new-exposure "19.23")
 
 ;;;_ #7 Systematic outline presentation - copying, printing, flattening
 
@@ -4223,12 +4220,10 @@ header and body.  The elements of that list are:
 ;;;_   > allout-process-exposed (&optional func from to frombuf
 ;;;                                         tobuf format)
 (defun allout-process-exposed (&optional func from to frombuf tobuf
-                                          format &optional start-num)
+                                          format start-num)
   "Map function on exposed parts of current topic; results to another buffer.
 
-All args are options; default values itemized below.
-
-Apply FUNCTION to exposed portions FROM position TO position in buffer
+Apply FUNC to exposed portions FROM position TO position in buffer
 FROMBUF to buffer TOBUF.  Sixth optional arg, FORMAT, designates an
 alternate presentation form:
 
@@ -4241,7 +4236,7 @@ alternate presentation form:
                        except for distinctive bullets.
 
 Defaults:
-  FUNCTION:     `allout-insert-listified'
+  FUNC:         `allout-insert-listified'
   FROM:         region start, if region active, else start of buffer
   TO:           region end, if region active, else end of buffer
   FROMBUF:      current buffer
@@ -4286,11 +4281,13 @@ Defaults:
 (defun allout-insert-listified (listified)
   "Insert contents of listified outline portion in current buffer.
 
-Listified is a list representing each topic header and body:
+LISTIFIED is a list representing each topic header and body:
 
  \`(depth prefix text)'
 
-or \`(depth prefix text bullet-plus)'
+or
+
+ \`(depth prefix text bullet-plus)'
 
 If `bullet-plus' is specified, it is inserted just after the entire prefix."
   (setq listified (cdr listified))
@@ -4356,14 +4353,14 @@ alternate presentation format for the outline:
 (defun allout-flatten-exposed-to-buffer (&optional arg tobuf)
   "Present numeric outline of outline's exposed portions in another buffer.
 
-The resulting outline is not compatable with outline mode - use
+The resulting outline is not compatible with outline mode - use
 `allout-copy-exposed-to-buffer' if you want that.
 
 Use `allout-indented-exposed-to-buffer' for indented presentation.
 
 With repeat count, copy the exposed portions of only current topic.
 
-Other buffer has current buffers name with \" exposed\" appended to
+Other buffer has current buffer's name with \" exposed\" appended to
 it, unless optional second arg TOBUF is specified, in which case it is
 used verbatim."
   (interactive "P")
@@ -4372,22 +4369,22 @@ used verbatim."
 (defun allout-indented-exposed-to-buffer (&optional arg tobuf)
   "Present indented outline of outline's exposed portions in another buffer.
 
-The resulting outline is not compatable with outline mode - use
+The resulting outline is not compatible with outline mode - use
 `allout-copy-exposed-to-buffer' if you want that.
 
 Use `allout-flatten-exposed-to-buffer' for numeric sectional presentation.
 
 With repeat count, copy the exposed portions of only current topic.
 
-Other buffer has current buffers name with \" exposed\" appended to
+Other buffer has current buffer's name with \" exposed\" appended to
 it, unless optional second arg TOBUF is specified, in which case it is
 used verbatim."
   (interactive "P")
   (allout-copy-exposed-to-buffer arg tobuf 'indent))
 
 ;;;_  - LaTeX formatting
-;;;_   > allout-latex-verb-quote (str &optional flow)
-(defun allout-latex-verb-quote (str &optional flow)
+;;;_   > allout-latex-verb-quote (string &optional flow)
+(defun allout-latex-verb-quote (string &optional flow)
   "Return copy of STRING for literal reproduction across latex processing.
 Expresses the original characters \(including carriage returns) of the
 string across latex processing."
@@ -4397,7 +4394,7 @@ string across latex processing."
                        (concat "\\char" (number-to-string char) "{}"))
                       ((= char ?\n) "\\\\")
                       (t (char-to-string char)))))
-             str
+             string
              ""))
 ;;;_   > allout-latex-verbatim-quote-curr-line ()
 (defun allout-latex-verbatim-quote-curr-line ()
@@ -4418,12 +4415,12 @@ environment.  Leaves point at the end of the line."
       (insert "\\")
       (setq end (1+ end))
       (goto-char (1+ (match-end 0))))))
-;;;_   > allout-insert-latex-header (buf)
-(defun allout-insert-latex-header (buf)
+;;;_   > allout-insert-latex-header (buffer)
+(defun allout-insert-latex-header (buffer)
   "Insert initial latex commands at point in BUFFER."
   ;; Much of this is being derived from the stuff in appendix of E in
   ;; the TeXBook, pg 421.
-  (set-buffer buf)
+  (set-buffer buffer)
   (let ((doc-style (format "\n\\documentstyle{%s}\n"
                            "report"))
         (page-numbering (if allout-number-pages
@@ -4492,10 +4489,10 @@ environment.  Leaves point at the end of the line."
                     hoffset
                     vspace)
             )))
-;;;_   > allout-insert-latex-trailer (buf)
-(defun allout-insert-latex-trailer (buf)
+;;;_   > allout-insert-latex-trailer (buffer)
+(defun allout-insert-latex-trailer (buffer)
   "Insert concluding latex commands at point in BUFFER."
-  (set-buffer buf)
+  (set-buffer buffer)
   (insert "\n\\end{document}\n"))
 ;;;_   > allout-latexify-one-item (depth prefix bullet text)
 (defun allout-latexify-one-item (depth prefix bullet text)
@@ -4706,9 +4703,9 @@ function.  If HOOK is void, it is first set to nil."
                  (cons function (symbol-value hook)))))))
 ;;;_  : my-mark-marker to accommodate divergent emacsen:
 (defun my-mark-marker (&optional force buffer)
-  "Accommodate the different signature for mark-marker across emacsen.
+  "Accommodate the different signature for mark-marker across Emacsen.
 
-GNU XEmacs takes two optional args, while mainline GNU Emacs does not,
+XEmacs takes two optional args, while GNU Emacs does not,
 so pass them along when appropriate."
   (if (featurep 'xemacs)
       (mark-marker force buffer)
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index d283016750f..7e23c9efedf 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -1,6 +1,6 @@
 ;;; compare-w.el --- compare text between windows for Emacs
 
-;; Copyright (C) 1986, 1989, 1993, 1997, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1986,1989,1993,1997,2003,2004 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience files
@@ -117,12 +117,12 @@ and the value `((4) (4))' for horizontally split windows."
   :group 'compare-w)
 
 (defface compare-windows-face
-  '((((type tty pc) (class color))
-     (:background "turquoise3"))
-    (((class color) (background light))
+  '((((class color) (min-colors 88) (background light))
      (:background "paleturquoise"))
-    (((class color) (background dark))
+    (((class color) (min-colors 88) (background dark))
      (:background "paleturquoise4"))
+    (((class color))
+     (:background "turquoise3"))
     (t (:underline t)))
   "Face for highlighting of compare-windows difference regions."
   :group 'compare-w)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 8fe839b474d..53b9e7507ef 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -281,15 +281,31 @@ already marked."
             (end-of-defun)
             (point))))
         (t
-         ;; Do it in this order for the sake of languages with nested
-         ;; functions where several can end at the same place as with
-         ;; the offside rule, e.g. Python.
-         (push-mark (point))
-         (beginning-of-defun)
-         (push-mark (point) nil t)
-         (end-of-defun)
-         (exchange-point-and-mark)
-         (re-search-backward "^\n" (- (point) 1) t))))
+         (let ((opoint (point))
+               beg end)
+           (push-mark opoint)
+           ;; Try first in this order for the sake of languages with nested
+           ;; functions where several can end at the same place as with
+           ;; the offside rule, e.g. Python.
+           (beginning-of-defun)
+           (setq beg (point))
+           (end-of-defun)
+           (setq end (point))
+           (while (looking-at "^\n")
+             (forward-line 1))
+           (if (> (point) opoint)
+               (progn
+                 ;; We got the right defun.
+                 (push-mark beg nil t)
+                 (goto-char end)
+                 (exchange-point-and-mark))
+             ;; beginning-of-defun moved back one defun
+             ;; so we got the wrong one.
+             (goto-char opoint)
+             (end-of-defun)
+             (push-mark (point) nil t)
+             (beginning-of-defun))
+           (re-search-backward "^\n" (- (point) 1) t)))))
 
 (defun narrow-to-defun (&optional arg)
   "Make text outside current defun invisible.
@@ -298,13 +314,28 @@ Optional ARG is ignored."
   (interactive)
   (save-excursion
     (widen)
-    ;; Do it in this order for the sake of languages with nested
-    ;; functions where several can end at the same place as with the
-    ;; offside rule, e.g. Python.
-    (beginning-of-defun)
-    (let ((beg (point)))
+    (let ((opoint (point))
+          beg end)
+      ;; Try first in this order for the sake of languages with nested
+      ;; functions where several can end at the same place as with
+      ;; the offside rule, e.g. Python.
+      (beginning-of-defun)
+      (setq beg (point))
       (end-of-defun)
-      (narrow-to-region beg (point)))))
+      (setq end (point))
+      (while (looking-at "^\n")
+        (forward-line 1))
+      (unless (> (point) opoint)
+        ;; beginning-of-defun moved back one defun
+        ;; so we got the wrong one.
+        (goto-char opoint)
+        (end-of-defun)
+        (setq end (point))
+        (beginning-of-defun)
+        (setq beg (point)))
+      (goto-char end)
+      (re-search-backward "^\n" (- (point) 1) t)
+      (narrow-to-region beg end))))
 
 (defun insert-pair (arg &optional open close)
   "Enclose following ARG sexps in a pair of OPEN and CLOSE characters.
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 3893e320655..e9af58fc73d 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -480,9 +480,19 @@ of colors that the current display can handle."
   (when (and (null list) (> (display-color-cells) 0))
     (setq list (defined-colors))
     ;; Delete duplicate colors.
+
+    ;; Identify duplicate colors by the name rather than the color
+    ;; value.  For example, on MS-Windows, logical colors are added to
+    ;; the list that might have the same value but have different
+    ;; names and meanings.  For example, `SystemMenuText' (the color
+    ;; w32 uses for the text in menu entries) and `SystemWindowText'
+    ;; (the default color w32 uses for the text in windows and
+    ;; dialogs) may be the same display color and be adjacent in the
+    ;; list.  Detecting duplicates by name insures that both of these
+    ;; colors remain despite identical color values.
     (let ((l list))
       (while (cdr l)
-        (if (facemenu-color-equal (car l) (car (cdr l)))
+        (if (facemenu-color-name-equal (car l) (car (cdr l)))
             (setcdr l (cdr (cdr l)))
           (setq l (cdr l)))))
     (when (memq (display-visual-class) '(gray-scale pseudo-color direct-color))
@@ -515,6 +525,22 @@ determine the correct answer."
   (cond ((equal a b) t)
         ((equal (color-values a) (color-values b)))))
 
+(defun facemenu-color-name-equal (a b)
+  "Return t if colors A and B are the same color.
+A and B should be strings naming colors.  These names are
+downcased, stripped of spaces and the string `grey' is turned
+into `gray'.  This accommodates alternative spellings of colors
+found commonly in the list.  It returns nil if the colors differ."
+  (progn
+    (setq a (replace-regexp-in-string "grey" "gray"
+            (replace-regexp-in-string " " ""
+             (downcase a)))
+         b (replace-regexp-in-string "grey" "gray"
+            (replace-regexp-in-string " " ""
+             (downcase b))))
+
+    (equal a b)))
+
 (defun facemenu-add-face (face &optional start end)
   "Add FACE to text between START and END.
 If START is nil or START to END is empty, add FACE to next typed character
diff --git a/lisp/files.el b/lisp/files.el
index 99cad16cf5b..ccd30a4de30 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1357,41 +1357,42 @@ that are visiting the various files."
                                 rawfile truename number))))))
 
 (defun find-file-noselect-1 (buf filename nowarn rawfile truename number)
-  (let ((inhibit-read-only t)
-        error)
+  (let (error)
     (with-current-buffer buf
       (kill-local-variable 'find-file-literally)
       ;; Needed in case we are re-visiting the file with a different
       ;; text representation.
       (kill-local-variable 'buffer-file-coding-system)
       (kill-local-variable 'cursor-type)
-      (erase-buffer)
-      (and (default-value 'enable-multibyte-characters)
-           (not rawfile)
-           (set-buffer-multibyte t))
-      (if rawfile
-          (condition-case ()
-              (insert-file-contents-literally filename t)
-            (file-error
-             (when (and (file-exists-p filename)
-                        (not (file-readable-p filename)))
-               (kill-buffer buf)
-               (signal 'file-error (list "File is not readable"
-                                         filename)))
-             ;; Unconditionally set error
-             (setq error t)))
-        (condition-case ()
-            (insert-file-contents filename t)
-          (file-error
-           (when (and (file-exists-p filename)
-                      (not (file-readable-p filename)))
-             (kill-buffer buf)
-             (signal 'file-error (list "File is not readable"
-                                       filename)))
-           ;; Run find-file-not-found-hooks until one returns non-nil.
-           (or (run-hook-with-args-until-success 'find-file-not-found-functions)
-               ;; If they fail too, set error.
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (and (default-value 'enable-multibyte-characters)
+             (not rawfile)
+             (set-buffer-multibyte t))
+        (if rawfile
+            (condition-case ()
+                (insert-file-contents-literally filename t)
+              (file-error
+               (when (and (file-exists-p filename)
+                          (not (file-readable-p filename)))
+                 (kill-buffer buf)
+                 (signal 'file-error (list "File is not readable"
+                                           filename)))
+               ;; Unconditionally set error
                (setq error t)))))
+      (condition-case ()
+          (let ((inhibit-read-only t))
+            (insert-file-contents filename t))
+        (file-error
+         (when (and (file-exists-p filename)
+                    (not (file-readable-p filename)))
+           (kill-buffer buf)
+           (signal 'file-error (list "File is not readable"
+                                     filename)))
+         ;; Run find-file-not-found-hooks until one returns non-nil.
+         (or (run-hook-with-args-until-success 'find-file-not-found-functions)
+             ;; If they fail too, set error.
+             (setq error t))))
       ;; Record the file's truename, and maybe use that as visited name.
       (if (equal filename buffer-file-name)
           (setq buffer-file-truename truename)
@@ -4486,10 +4487,12 @@ With prefix arg, silently save all file-visiting buffers, then kill."
                           (directory-file-name . nil)
                           (file-name-sans-versions . nil)
                           ;; `identity' means just return the first arg
-                          ;; as stripped of its quoting.
-                          (substitute-in-file-name . identity)
+                          ;; not stripped of its quoting.
+                          (substitute-in-file-name identity)
                           (file-name-completion 1)
                           (file-name-all-completions 1)
+                          ;; t means add "/:" to the result.
+                          (file-truename t 0)
                           (rename-file 0 1)
                           (copy-file 0 1)
                           (make-symbolic-link 0 1)
@@ -4497,9 +4500,12 @@ With prefix arg, silently save all file-visiting buffers, then kill."
                   ;; For all other operations, treat the first argument only
                   ;; as the file name.
                   '(nil 0))))
+        method
         ;; Copy ARGUMENTS so we can replace elements in it.
         (arguments (copy-sequence arguments)))
-    ;; Strip off the /: from the file names that have this handler.
+    (if (symbolp (car file-arg-indices))
+        (setq method (pop file-arg-indices)))
+    ;; Strip off the /: from the file names that have it.
     (save-match-data
       (while (consp file-arg-indices)
         (let ((pair (nthcdr (car file-arg-indices) arguments)))
@@ -4510,9 +4516,12 @@ With prefix arg, silently save all file-visiting buffers, then kill."
                            "/"
                          (substring (car pair) 2)))))
         (setq file-arg-indices (cdr file-arg-indices))))
-    (if (eq file-arg-indices 'identity)
-        (car arguments)
-      (apply operation arguments))))
+    (cond ((eq method 'identity)
+           (car arguments))
+          (method
+           (concat "/:" (apply operation arguments)))
+          (t
+           (apply operation arguments)))))
 
 (define-key ctl-x-map "\C-f" 'find-file)
 (define-key ctl-x-map "\C-r" 'find-file-read-only)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 68df8d0941e..78c9f15f912 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -14,6 +14,10 @@
 
         * nnimap.el (nnimap-demule): Avoid string-as-multibyte.
 
+2004-04-21  Richard M. Stallman  <rms@gnu.org>
+
+        * mailcap.el (mailcap-mime-data): Mark as risky.
+
 2004-03-27  Juanma Barranquero  <lektu@terra.es>
 
         * gnus-srvr.el (gnus-server-prepare): Remove spurious call to `cdr'.
diff --git a/lisp/gs.el b/lisp/gs.el
index f160dca197a..284b18251ec 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -39,12 +39,14 @@
 (defvar gs-options
   '("-q"
     ;"-dNOPAUSE"
+    "-dSAFER"
     "-dBATCH"
     "-sDEVICE=<device>"
     "<file>")
   "List of command line arguments to pass to Ghostscript.
 Arguments may contain place-holders `<file>' for the name of the
 input file, and `<device>' for the device to use.")
+(put 'gs-options 'risky-local-variable t)
 
 (defun gs-options (device file)
   "Return a list of command line options with place-holders replaced.
@@ -55,7 +57,6 @@ FILE is the value to substitute for the place-holder `<file>'."
                     option (replace-regexp-in-string "<file>" file option)))
           gs-options))
 
-
 ;; The GHOSTVIEW property (taken from gv 3.5.8).
 ;;
 ;; Type:
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e0692119a21..e7e09a431bd 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -181,14 +181,14 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
   (unless (stringp docstring) (setq docstring "Not documented"))
   (if (or (string-match "\n\n(fn\\(\\( .*\\)?)\\)\\'" docstring) (eq arglist t))
       docstring
-    (format "%s%s%S" docstring
+    (concat docstring
             (if (string-match "\n?\n\\'" docstring)
                 (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "")
               "\n\n")
             (if (and (stringp arglist)
                      (string-match "\\`([^ ]+\\(.*\\))\\'" arglist))
                 (concat "(fn" (match-string 1 arglist) ")")
-              (help-make-usage 'fn arglist)))))
+              (format "%S" (help-make-usage 'fn arglist))))))
 
 (defun help-function-arglist (def)
   ;; Handle symbols aliased to other symbols.
@@ -275,6 +275,7 @@ else ARG is returned in uppercase normal."
             (next (not (or args (looking-at "\\["))))
             (opt nil))
         ;; Make a list of all arguments
+        (skip-chars-forward "^ ")
         (while next
           (or opt (not (looking-at " &")) (setq opt t))
           (if (not (re-search-forward " \\([\\[(]*\\)\\([^] &)\.]+\\)" nil t))
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index ebf2a3af27d..809c457c6e1 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -657,7 +657,7 @@
 (modify-category-entry (make-char 'korean-ksc5601 43) ?K)
 (modify-category-entry (make-char 'korean-ksc5601 44) ?Y)
 
-(let ((parens "$(C!2!3!4!5!6!7!8!9!:!;!<!=(B" )
+(let ((parens "$(C!2!3!4!5!6!7!8!9!:!;!<!=#(#)#[#]#{#}(B" )
       open close)
   (dotimes (i (/ (length parens) 2))
     (setq open (aref parens (* i 2))
diff --git a/lisp/locate.el b/lisp/locate.el
index eb8074c9f6c..e61ec87d4e4 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -160,7 +160,7 @@
   :group 'locate)
 
 (defcustom locate-prompt-for-command nil
-  "If non-nil, the default behavior of the locate command is to prompt for a command to run.
+  "If non-nil, the locate command prompts for a command to run.
 Otherwise, that behavior is invoked via a prefix argument."
   :group 'locate
   :type 'boolean
@@ -329,7 +329,11 @@ shown; this is often useful to constrain a big search."
 ;; Default directory is set to "/" so that dired commands, which
 ;; expect to be in a tree, will work properly
 (defun locate-mode ()
-  "Major mode for the `*Locate*' buffer made by \\[locate]."
+  "Major mode for the `*Locate*' buffer made by \\[locate].
+In that buffer, you can use almost all the usual dired bindings.
+\\[locate-find-directory] visits the directory of the file on the current line.
+
+\\{locate-mode-map}"
   (kill-all-local-variables)
   ;; Avoid clobbering this variables
   (make-local-variable 'dired-subdir-alist)
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index abc8db6d2c3..f7688e24069 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1466,8 +1466,8 @@ The standard casing rules will no longer apply to this word."
     ;;  If the word is already in the list, even with a different casing
     ;;  we simply want to replace it.
     (if (and (not (equal ada-case-exception '()))
-             (assoc-ignore-case word ada-case-exception))
-        (setcar (assoc-ignore-case word ada-case-exception) word)
+             (assoc-string word ada-case-exception t))
+        (setcar (assoc-string word ada-case-exception t) word)
       (add-to-list 'ada-case-exception (cons word t))
       )
 
@@ -1519,8 +1519,8 @@ word itself has a special casing."
     ;;  If the word is already in the list, even with a different casing
     ;;  we simply want to replace it.
     (if (and (not (equal ada-case-exception-substring '()))
-             (assoc-ignore-case word ada-case-exception-substring))
-        (setcar (assoc-ignore-case word ada-case-exception-substring) word)
+             (assoc-string word ada-case-exception-substring t))
+        (setcar (assoc-string word ada-case-exception-substring t) word)
       (add-to-list 'ada-case-exception-substring (cons word t))
       )
 
@@ -1548,9 +1548,9 @@ word itself has a special casing."
             (if (char-equal (string-to-char word) ?*)
                 (progn
                   (setq word (substring word 1))
-                  (unless (assoc-ignore-case word ada-case-exception-substring)
+                  (unless (assoc-string word ada-case-exception-substring t)
                     (add-to-list 'ada-case-exception-substring (cons word t))))
-              (unless (assoc-ignore-case word ada-case-exception)
+              (unless (assoc-string word ada-case-exception t)
                 (add-to-list 'ada-case-exception (cons word t)))))
 
           (forward-line 1))
@@ -1618,8 +1618,8 @@ the exceptions defined in `ada-case-exception-file'."
                                    (point)))
             match)
         ;;  If we have an exception, replace the word by the correct casing
-        (if (setq match (assoc-ignore-case (buffer-substring start end)
-                                           ada-case-exception))
+        (if (setq match (assoc-string (buffer-substring start end)
+                                      ada-case-exception t))
 
             (progn
               (delete-region start end)
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index ef5d1eba998..184077f6a3a 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1248,7 +1248,11 @@ where they were found."
 
 
 (defun etags-tags-completion-table ()
-  (let ((table (make-vector 511 0)))
+  (let ((table (make-vector 511 0))
+        (point-max (/ (float (point-max)) 100.0))
+        (msg-fmt (format 
+                  "Making tags completion table for %s...%%d%%%%"
+                  buffer-file-name)))
     (save-excursion
       (goto-char (point-min))
       ;; This monster regexp matches an etags tag line.
@@ -1264,11 +1268,12 @@ where they were found."
 \\([-a-zA-Z0-9_+*$?:]+\\)[^-a-zA-Z0-9_+*$?:\177]*\\)\177\
 \\(\\([^\n\001]+\\)\001\\)?\\([0-9]+\\)?,\\([0-9]+\\)?\n"
               nil t)
-        (intern (if (match-beginning 5)
-                    ;; There is an explicit tag name.
-                    (buffer-substring (match-beginning 5) (match-end 5))
-                  ;; No explicit tag name.  Best guess.
-                  (buffer-substring (match-beginning 3) (match-end 3)))
+        (intern (prog1 (if (match-beginning 5)
+                           ;; There is an explicit tag name.
+                           (buffer-substring (match-beginning 5) (match-end 5))
+                         ;; No explicit tag name.  Best guess.
+                         (buffer-substring (match-beginning 3) (match-end 3)))
+                  (message msg-fmt (/ (point) point-max)))
                 table)))
     table))
 
@@ -1866,6 +1871,7 @@ directory specification."
         (or gotany
             (error "File %s not in current tags tables" file)))))
   (with-current-buffer "*Tags List*"
+    (require 'apropos)
     (apropos-mode)
     (setq buffer-read-only t)))
 
@@ -1884,6 +1890,7 @@ directory specification."
           (funcall tags-apropos-function regexp))))
     (etags-tags-apropos-additional regexp))
   (with-current-buffer "*Tags List*"
+    (require 'apropos)
     (apropos-mode)
     ;; apropos-mode is derived from fundamental-mode and it kills
     ;; all local variables.
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index a600939ef71..ae0c43c2730 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1823,8 +1823,8 @@ Change the default directory for the process buffer to concur."
        'hide 'wait)
       ;; If we don't know anything about the class, update shell routines
       (if (and idlwave-shell-get-object-class
-               (not (assoc-ignore-case idlwave-shell-get-object-class
-                                       (idlwave-class-alist))))
+               (not (assoc-string idlwave-shell-get-object-class
+                                  (idlwave-class-alist) t)))
           (idlwave-shell-maybe-update-routine-info))
       idlwave-shell-get-object-class)))
 
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 5c95b138720..99e693abb94 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1502,7 +1502,7 @@ FUN will not be called for @String entries."
         (save-excursion
           (if (or (and (not bibtex-sort-ignore-string-entries)
                        (string-equal "string" (downcase entry-type)))
-                  (assoc-ignore-case entry-type bibtex-entry-field-alist))
+                  (assoc-string entry-type bibtex-entry-field-alist t))
               (funcall fun key beg end)))
         (goto-char end)))))
 
@@ -1771,9 +1771,10 @@ Formats current entry according to variable `bibtex-entry-format'."
         (re-search-forward bibtex-entry-type)
         (let ((beg-type (1+ (match-beginning 0)))
               (end-type (match-end 0)))
-          (setq entry-list (assoc-ignore-case (buffer-substring-no-properties
-                                               beg-type end-type)
-                                              bibtex-entry-field-alist))
+          (setq entry-list (assoc-string (buffer-substring-no-properties
+                                          beg-type end-type)
+                                         bibtex-entry-field-alist
+                                         t))
 
           ;; unify case of entry name
           (when (memq 'unify-case format)
@@ -1846,8 +1847,8 @@ Formats current entry according to variable `bibtex-entry-format'."
             (if (memq 'opts-or-alts format)
                 (cond ((and empty-field
                             (or opt-alt
-                                (let ((field (assoc-ignore-case
-                                              field-name req-field-list)))
+                                (let ((field (assoc-string
+                                              field-name req-field-list t)))
                                   (or (not field)       ; OPT field
                                       (nth 3 field))))) ; ALT field
                        ;; Either it is an empty ALT field. Then we have checked
@@ -1918,15 +1919,17 @@ Formats current entry according to variable `bibtex-entry-format'."
               ;; if empty field, complain
               (if (and empty-field
                        (memq 'required-fields format)
-                       (assoc-ignore-case field-name req-field-list))
+                       (assoc-string field-name req-field-list t))
                   (error "Mandatory field `%s' is empty" field-name))
 
               ;; unify case of field name
               (if (memq 'unify-case format)
-                  (let ((fname (car (assoc-ignore-case
-                                     field-name (append (nth 0 (nth 1 entry-list))
-                                                        (nth 1 (nth 1 entry-list))
-                                                        bibtex-user-optional-fields)))))
+                  (let ((fname (car (assoc-string
+                                     field-name
+                                     (append (nth 0 (nth 1 entry-list))
+                                             (nth 1 (nth 1 entry-list))
+                                             bibtex-user-optional-fields)
+                                     t))))
                     (if fname
                         (progn
                           (delete-region beg-name end-name)
@@ -2258,8 +2261,8 @@ Return alist of keys if parsing was completed, `aborted' otherwise."
                                     ;; This is a crossref.
                                     (buffer-substring-no-properties
                                      (1+ (match-beginning 3)) (1- (match-end 3))))
-                                   ((assoc-ignore-case (bibtex-type-in-head)
-                                                       bibtex-entry-field-alist)
+                                   ((assoc-string (bibtex-type-in-head)
+                                                  bibtex-entry-field-alist t)
                                     ;; This is an entry.
                                     (match-string-no-properties bibtex-key-in-head)))))
                     (if (and (stringp key)
@@ -2314,7 +2317,7 @@ Return alist of strings if parsing was completed, `aborted' otherwise."
                 ;; user has aborted by typing a key --> return `aborted'
                 (throw 'userkey 'aborted))
             (setq key (bibtex-reference-key-in-string bounds))
-            (if (not (assoc-ignore-case key strings))
+            (if (not (assoc-string key strings t))
                 (push (cons key (bibtex-text-in-string bounds t))
                       strings))
             (goto-char (bibtex-end-of-text-in-string bounds)))
@@ -2654,7 +2657,7 @@ non-nil.
 More specifically, the return value is a cons pair (REQUIRED . OPTIONAL),
 where REQUIRED and OPTIONAL are lists of the required and optional field
 names for ENTRY-TYPE according to `bibtex-entry-field-alist'."
-  (let ((e (assoc-ignore-case entry-type bibtex-entry-field-alist))
+  (let ((e (assoc-string entry-type bibtex-entry-field-alist t))
         required optional)
     (unless e
       (error "Bibtex entry type %s not defined" entry-type))
@@ -2721,10 +2724,10 @@ according to `bibtex-entry-field-alist', but are not yet present."
                         (substring (cdr (assoc "=type=" fields-alist))
                                    1)))) ; don't want @
       (dolist (field (car field-list))
-        (unless (assoc-ignore-case (car field) fields-alist)
+        (unless (assoc-string (car field) fields-alist t)
           (bibtex-make-field field)))
       (dolist (field (cdr field-list))
-        (unless (assoc-ignore-case (car field) fields-alist)
+        (unless (assoc-string (car field) fields-alist t)
           (bibtex-make-optional-field field))))))
 
 (defun bibtex-parse-entry ()
@@ -2792,7 +2795,7 @@ Move point to the end of the last field."
           (let* ((name (buffer-substring
                         (if (looking-at "ALT\\|OPT") (match-end 0) (point))
                         (bibtex-end-of-name-in-field bounds)))
-                 (text (assoc-ignore-case name other)))
+                 (text (assoc-string name other t)))
             (goto-char (bibtex-start-of-text-in-field bounds))
             (if (not (and (looking-at bibtex-empty-field-re) text))
                 (goto-char (bibtex-end-of-field bounds))
@@ -2825,9 +2828,10 @@ Move point to the end of the last field."
            (field-list (bibtex-field-list (progn (re-search-backward
                                                   bibtex-entry-maybe-empty-head nil t)
                                                  (bibtex-type-in-head))))
-           (comment (assoc-ignore-case field-name
-                                       (append (car field-list)
-                                               (cdr field-list)))))
+           (comment (assoc-string field-name
+                                  (append (car field-list)
+                                          (cdr field-list))
+                                  t)))
       (if comment
           (message (nth 1 comment))
         (message "No comment available")))))
@@ -3235,8 +3239,8 @@ Returns t if test was successful, nil otherwise."
                  (let* ((entry-list (progn
                                       (goto-char beg)
                                       (bibtex-search-entry nil end)
-                                      (assoc-ignore-case (bibtex-type-in-head)
-                                                         bibtex-entry-field-alist)))
+                                      (assoc-string (bibtex-type-in-head)
+                                                    bibtex-entry-field-alist t)))
                         (req (copy-sequence (elt (elt entry-list 1) 0)))
                         (creq (copy-sequence (elt (elt entry-list 2) 0)))
                         crossref-there bounds)
@@ -3252,8 +3256,8 @@ Returns t if test was successful, nil otherwise."
                            (push (list (bibtex-current-line)
                                        "Questionable month field")
                                  error-list))
-                       (setq req (delete (assoc-ignore-case field-name req) req)
-                             creq (delete (assoc-ignore-case field-name creq) creq))
+                       (setq req (delete (assoc-string field-name req t) req)
+                             creq (delete (assoc-string field-name creq t) creq))
                        (if (equal field-name "crossref")
                            (setq crossref-there t))))
                    (if crossref-there
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 5d21fda6a9a..aff42866349 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Manuel Serrano <Manuel.Serrano@unice.fr>
+;; Maintainer: FSF
 ;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index a86be8646c9..1b2628760e1 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -171,7 +171,7 @@ followed by two spaces, unless it's inside some sort of quotes or
 parenthesis.  See Info node `Sentences'."
   (or sentence-end
       (concat (if sentence-end-without-period "\\w  \\|")
-              "\\([.?!][]\"')}]*"
+              "\\([.?!][]\"'\xd0c9)}]*"
               (if sentence-end-double-space
                   "\\($\\| $\\|\t\\|  \\)" "\\($\\|[\t ]\\)")
               "\\|[" sentence-end-without-space "]+\\)"