Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
   Support " [...]" style defaults in minibuffer-electric-default-mode

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
   (read-number): Use canonical format for default in prompt.

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

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


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

12 files changed, 191 insertions, 85 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf08d2643f3..83f8a0e1cf0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,51 @@
+2004-06-03  Miles Bader  <miles@gnu.org>
+
+        * subr.el (read-number): Use canonical format for default in prompt.
+
+        * minibuf-eldef.el (minibuffer-default-in-prompt-regexps): Add
+        regexp for " [...]" style defaults.
+
+2004-06-02  Romain Francoise  <romain@orebokech.com>
+
+        * ibuf-ext.el (ibuffer-jump-to-buffer): Add support for filter
+        groups: if the user asks for a hidden buffer, open the
+        corresponding filter group to expose it.
+
+        * ibuffer.el (ibuffer-mode-map): Add key binding `M-g' to
+        `ibuffer-jump-to-buffer'.
+        (ibuffer-jump-offer-only-visible-buffers): New user option.
+
+2004-06-02  Juanma Barranquero  <lektu@terra.es>
+
+        * faces.el (frame-update-faces): Add empty docstring so the one
+        for `ignore' doesn't show through.
+
+        * subr.el (process-kill-without-query): Remove spurious "\n" on
+        obsolescence string.
+        (focus-frame, unfocus-frame): Add obsolescence declaration and
+        empty docstring.
+
+        * international/mule.el (register-char-codings): Make alias for
+        `ignore'.  Move docstring to obsolescence info and remove
+        redundancy.
+
+2004-06-02  Kim F. Storm  <storm@cua.dk>
+
+        * frame.el (blink-cursor-start): Turn cursor off initially so blink
+        starts after blink-cursor-delay rather than 2*blink-cursor-delay.
+
+2004-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-arch.el (vc-arch-state): Don't assume the file exists.
+
+2004-05-31  Lars Hansen  <larsh@math.ku.dk>
+
+        * desktop.el (desktop-save): Don't save minor modes without a
+        known mode initialization function.
+
 2004-05-30  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * replace.el (query-replace-interactive): Convert defvar into
-        defcustom.
+        * replace.el (query-replace-interactive): Convert defvar -> defcustom.
 
         * autorevert.el: Update `Commentary' section.
 
@@ -17,8 +61,8 @@
         Sync with Tramp.
 
         * net/tramp.el (tramp-let-maybe): Reverse args of `get'.
-        (tramp-let-maybe): Move to an earlier spot in the file.  Patch by
-        Andreas Schwab.
+        (tramp-let-maybe): Move to an earlier spot in the file.
+        Patch by Andreas Schwab.
 
 2004-05-30  Andreas Schwab  <schwab@suse.de>
 
@@ -47,21 +91,20 @@
 
         * ange-ftp.el (ange-ftp-file-remote-p): New defun.
         (top): Remove setting of `file-remote-p' property for
-        `ange-ftp-hook-function'.  Add `ange-ftp' property to
-        `file-remote-p'.
+        `ange-ftp-hook-function'.  Add `ange-ftp' property to `file-remote-p'.
 
 2004-05-29  Michael Albinus  <michael.albinus@gmx.de>
 
         Version 2.0.41 of Tramp released.
 
-        * tramp.el (tramp-wait-for-regexp, tramp-wait-for-output): Throw
-        away if process has died.  Reported by Luc Teirlinck
-        <teirllm@dms.auburn.edu>.
-        (tramp-out-of-band-prompt-regexp): Renamed to
+        * tramp.el (tramp-wait-for-regexp, tramp-wait-for-output):
+        Throw away if process has died.
+        Reported by Luc Teirlinck <teirllm@dms.auburn.edu>.
+        (tramp-out-of-band-prompt-regexp): Rename to
         `tramp-process-alive-regexp', because its usage is widen.
         (tramp-actions-copy-out-of-band): Apply it.
-        (tramp-actions-before-shell, tramp-multi-actions): Add
-        `tramp-action-process-alive' action.
+        (tramp-actions-before-shell, tramp-multi-actions):
+        Add `tramp-action-process-alive' action.
         (tramp-action-process-alive): New defun.
         (tramp-file-name-handler-alist, tramp-file-name-for-operation):
         Add entry for `file-remote-p'.
@@ -73,8 +116,8 @@
         `file-remote-p'.
 
         * tramp-uu.el (tramp-uuencode-region): Padding characters aren't
-        counted for (last) line.  Reported by Aaron Ucko
-        <ucko@ncbi.nlm.nih.gov>.
+        counted for (last) line.  [They should or they shouldn't?  --Stef]
+        Reported by Aaron Ucko <ucko@ncbi.nlm.nih.gov>.
 
 2004-05-29  Kai Grossjohann  <kai.grossjohann@gmx.net>
 
@@ -97,8 +140,8 @@
         filenames starting with "/:" -- those are reserved for
         file-name-non-special.
 
-        * tramp-smb.el (tramp-smb-open-connection): Use
-        tramp-set-process-query-on-exit-flag compat function.
+        * tramp-smb.el (tramp-smb-open-connection):
+        Use tramp-set-process-query-on-exit-flag compat function.
 
 2004-05-29  Richard M. Stallman  <rms@gnu.org>
 
@@ -108,7 +151,7 @@
         (eval-last-sexp-print-value): Print char equivalent regardless
         of standard-output value.
 
-        * thumbs.el (thumbs-subst-char-in-string): Deleted.
+        * thumbs.el (thumbs-subst-char-in-string): Delete.
         (thumbs-thumbname): Use subst-char-in-string.
         (thumbs-resize-image): Use condition-case, not ignore-errors.
         (thumbs-kill-buffer): Likewise.
@@ -217,8 +260,10 @@
 2004-05-28  Juanma Barranquero  <lektu@terra.es>
 
         * cus-edit.el (customize-face, customize-face-other-window)
-        (custom-face-edit-delete): Make arguments match their use in docstring.
-        (custom-unloaded-symbol-p, custom-unloaded-widget-p): Docstring typo.
+        (custom-face-edit-delete): Make arguments match their use in
+        docstring.
+        (custom-unloaded-symbol-p, custom-unloaded-widget-p): Fix typo in
+        docstring.
 
         * cvs-status.el (cvs-tree-merge, cvs-tags->tree): Use `butlast',
         not `cvs-butlast'.
@@ -693,7 +738,8 @@
 
 2004-05-11  Juanma Barranquero  <lektu@terra.es>
 
-        * custom.el (custom-initialize-default, defcustom): Typo in docstring.
+        * custom.el (custom-initialize-default, defcustom):
+        Fix typo in docstring.
 
         * files.el (set-visited-file-name, file-expand-wildcards):
         Fix docstring.
diff --git a/lisp/comint.el b/lisp/comint.el
index c5e903fc58f..12d8e1fcbb7 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1182,7 +1182,7 @@ start of the text to scan for history references, rather
 than the logical beginning of line."
   (save-excursion
     (let ((toend (- (line-end-position) (point)))
-          (start (comint-line-beginning-position)))
+          (start (or start (comint-line-beginning-position))))
       (goto-char start)
       (while (progn
                (skip-chars-forward "^!^" (- (line-end-position) toend))
@@ -1482,7 +1482,8 @@ Similarly for Soar, Scheme, etc."
                                 (concat input "\n")))
 
           (let ((beg (marker-position pmark))
-                (end (if no-newline (point) (1- (point)))))
+              (end (if no-newline (point) (1- (point))))
+              (inhibit-modification-hooks t))
             (when (> end beg)
               ;; Set text-properties for the input field
               (add-text-properties
@@ -1578,7 +1579,8 @@ See `comint-carriage-motion' for details.")
 freeze its attributes in place, even when more input comes a long
 and moves the prompt overlay."
   (when comint-last-prompt-overlay
-    (let ((inhibit-read-only t))
+    (let ((inhibit-read-only t)
+          (inhibit-modification-hooks t))
       (add-text-properties (overlay-start comint-last-prompt-overlay)
                            (overlay-end comint-last-prompt-overlay)
                            (overlay-properties comint-last-prompt-overlay)))))
@@ -1709,7 +1711,8 @@ Make backspaces delete the previous character."
             (goto-char (process-mark process)) ; in case a filter moved it
 
             (unless comint-use-prompt-regexp-instead-of-fields
-              (let ((inhibit-read-only t))
+              (let ((inhibit-read-only t)
+                    (inhibit-modification-hooks t))
                 (add-text-properties comint-last-output-start (point)
                                      '(rear-nonsticky t
                                        field output
@@ -1718,7 +1721,8 @@ Make backspaces delete the previous character."
             ;; Highlight the prompt, where we define `prompt' to mean
             ;; the most recent output that doesn't end with a newline.
             (let ((prompt-start (save-excursion (forward-line 0) (point)))
-                  (inhibit-read-only t))
+                  (inhibit-read-only t)
+                  (inhibit-modification-hooks t))
               (when comint-prompt-read-only
                 (or (= (point-min) prompt-start)
                     (get-text-property (1- prompt-start) 'read-only)
@@ -2347,7 +2351,8 @@ read-only property of `fence', unless it already is read-only.
 If the character after point does not have a front-sticky
 read-only property, any read-only property of `fence' on the
 preceding newline is removed."
-  (let* ((pt (point)) (lst (get-text-property pt 'front-sticky)))
+  (let* ((pt (point)) (lst (get-text-property pt 'front-sticky))
+         (inhibit-modification-hooks t))
     (and (bolp)
          (not (bobp))
          (if (and (get-text-property pt 'read-only)
@@ -2966,10 +2971,8 @@ Typing SPC flushes the help buffer."
 
     ;; Read the next key, to process SPC.
     (let (key first)
-      (if (save-excursion
-            (set-buffer (get-buffer "*Completions*"))
-            (set (make-local-variable
-                  'comint-displayed-dynamic-completions)
+      (if (with-current-buffer (get-buffer "*Completions*")
+            (set (make-local-variable 'comint-displayed-dynamic-completions)
                  completions)
             (setq key (read-key-sequence nil)
                   first (aref key 0))
diff --git a/lisp/desktop.el b/lisp/desktop.el
index a21d132e03b..3888262f02f 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -326,7 +326,7 @@ NAME is the name of the buffer-local variable indicating that the minor
 mode is active.  RESTORE-FUNCTION is the function to activate the minor mode.
 called.  RESTORE-FUNCTION nil means don't try to restore the minor mode.
 Only minor modes for which the name of the buffer-local variable
-and the name of the minor mode function are different have to added to
+and the name of the minor mode function are different have to be added to
 this table."
   :type 'sexp
   :group 'desktop)
@@ -589,16 +589,17 @@ See also `desktop-base-file-name'."
                     major-mode
                     ;; minor modes
                     (let (ret)
-                      (mapcar
-                        #'(lambda (mim)
+                      (mapc
+                        #'(lambda (minor-mode)
                           (and
-                            (boundp mim)
-                            (symbol-value mim)
-                            (setq ret
-                              (cons
-                                (let ((special (assq mim desktop-minor-mode-table)))
-                                  (if special (cadr special) mim))
-                                ret))))
+                            (boundp minor-mode)
+                            (symbol-value minor-mode)
+                            (let ((special (assq minor-mode desktop-minor-mode-table)))
+                              (when (or special (functionp minor-mode))
+                                (setq ret
+                                  (cons
+                                    (if special (cadr special) minor-mode)
+                                    ret))))))
                         (mapcar #'car minor-mode-alist))
                       ret)
                     (point)
diff --git a/lisp/faces.el b/lisp/faces.el
index 06b5ec3fc97..721c2fa3631 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1809,7 +1809,7 @@ created."
 
 ;; Update a frame's faces when we change its default font.
 
-(defalias 'frame-update-faces 'ignore)
+(defalias 'frame-update-faces 'ignore "")
 (make-obsolete 'frame-update-faces "no longer necessary." "21.1")
 
 ;; Update the colors of FACE, after FRAME's own colors have been
diff --git a/lisp/frame.el b/lisp/frame.el
index b02660dff3b..585d78cdc13 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1350,6 +1350,7 @@ if appropriate.  It also arranges to cancel that timer when the next
 command starts, by installing a pre-command hook."
   (when (null blink-cursor-timer)
     (add-hook 'pre-command-hook 'blink-cursor-end)
+    (internal-show-cursor nil nil)
     (setq blink-cursor-timer
           (run-with-timer blink-cursor-interval blink-cursor-interval
                           'blink-cursor-timer-function))))
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 9492d5565f6..96678d2bc9a 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1,6 +1,6 @@
 ;;; ibuf-ext.el --- extensions for ibuffer
 
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@ -1224,19 +1224,62 @@ to move by.  The default is `ibuffer-marked-char'."
 
 ;;;###autoload
 (defun ibuffer-jump-to-buffer (name)
-  "Move point to the buffer whose name is NAME."
+  "Move point to the buffer whose name is NAME.
+
+If called interactively, prompt for a buffer name and go to the
+corresponding line in the Ibuffer buffer.  If said buffer is in a
+hidden group filter, open it.
+
+If `ibuffer-jump-offer-only-visible-buffers' is non-nil, only offer
+visible buffers in the completion list.  Calling the command with
+a prefix argument reverses the meaning of that variable."
   (interactive (list nil))
-  (let ((table (mapcar #'(lambda (x)
-                           (cons (buffer-name (car x))
-                                 (caddr x)))
-                       (ibuffer-current-state-list t))))
-    (when (null table)
-      (error "No buffers!"))
-    (when (interactive-p)
-      (setq name (completing-read "Jump to buffer: " table nil t)))
-    (ibuffer-aif (assoc name table)
-        (goto-char (cdr it))
-      (error "No buffer with name %s" name))))
+  (let ((only-visible ibuffer-jump-offer-only-visible-buffers))
+    (when current-prefix-arg
+      (setq only-visible (not only-visible)))
+    (if only-visible
+        (let ((table (mapcar #'(lambda (x)
+                                 (buffer-name (car x)))
+                             (ibuffer-current-state-list))))
+          (when (null table)
+            (error "No buffers!"))
+          (when (interactive-p)
+            (setq name (completing-read "Jump to buffer: "
+                                        table nil t))))
+      (when (interactive-p)
+        (setq name (read-buffer "Jump to buffer: " nil t))))
+    (when (not (string= "" name))
+      (let (buf-point)
+        ;; Blindly search for our buffer: it is very likely that it is
+        ;; not in a hidden filter group.
+        (ibuffer-map-lines #'(lambda (buf marks)
+                               (when (string= (buffer-name buf) name)
+                                 (setq buf-point (point))
+                                 nil))
+                           t nil)
+        (when (and
+               (null buf-point)
+               (not (null ibuffer-hidden-filter-groups)))
+          ;; We did not find our buffer.  It must be in a hidden filter
+          ;; group, so go through all hidden filter groups to find it.
+          (catch 'found
+            (dolist (group ibuffer-hidden-filter-groups)
+              (ibuffer-jump-to-filter-group group)
+              (ibuffer-toggle-filter-group)
+              (ibuffer-map-lines #'(lambda (buf marks)
+                                     (when (string= (buffer-name buf) name)
+                                       (setq buf-point (point))
+                                       nil))
+                                 t group)
+              (if buf-point
+                  (throw 'found nil)
+                (ibuffer-toggle-filter-group)))))
+        (if (null buf-point)
+            ;; Still not found even though we expanded all hidden filter
+            ;; groups: that must be because it's hidden by predicate:
+            ;; we won't bother trying to display it.
+            (error "No buffer with name %s" name)
+          (goto-char buf-point))))))
 
 ;;;###autoload
 (defun ibuffer-diff-with-file ()
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index ab8290cfae8..fef9b7f811d 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1,6 +1,6 @@
 ;;; ibuffer.el --- operate on buffers like dired
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@ -268,6 +268,12 @@ This variable takes precedence over filtering, and even
                  (const :tag "Always except minibuffer" :value :nomini))
   :group 'ibuffer)
 
+(defcustom ibuffer-jump-offer-only-visible-buffers nil
+  "If non-nil, only offer buffers visible in the Ibuffer buffer
+in completion lists of the `ibuffer-jump-to-buffer' command."
+  :type 'boolean
+  :group 'ibuffer)
+
 (defcustom ibuffer-use-header-line (boundp 'header-line-format)
   "If non-nil, display a header line containing current filters."
   :type 'boolean
@@ -357,6 +363,7 @@ directory, like `default-directory'."
     (define-key map (kbd "u") 'ibuffer-unmark-forward)
     (define-key map (kbd "=") 'ibuffer-diff-with-file)
     (define-key map (kbd "j") 'ibuffer-jump-to-buffer)
+    (define-key map (kbd "M-g") 'ibuffer-jump-to-buffer)
     (define-key map (kbd "DEL") 'ibuffer-unmark-backward)
     (define-key map (kbd "M-DEL") 'ibuffer-unmark-all)
     (define-key map (kbd "* *") 'ibuffer-unmark-all)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index de9d3ef8e2c..c4c7be3a225 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -592,11 +592,9 @@ character code range.  Thus FUNC should iterate over [START, END]."
                  (make-char charset (+ i start) start)
                  (make-char charset (+ i start) (+ start chars -1)))))))
 
-(defun register-char-codings (coding-system safe-chars)
-  "This is an obsolete function.
-It exists just for backward compatibility, and it does nothing.")
+(defalias 'register-char-codings 'ignore "")
 (make-obsolete 'register-char-codings
-               "Unnecessary function.  Calling it has no effect."
+               "it exists just for backward compatibility, and does nothing."
                "21.3")
 
 (defconst char-coding-system-table nil
@@ -1401,7 +1399,7 @@ Each element must be one of the names listed in the variable
               (let* ((M (char-after (+ pos 4)))
                      (L (char-after (+ pos 5)))
                      (encoding (match-string 2))
-                     (encoding-info (assoc-string 
+                     (encoding-info (assoc-string
                                      encoding
                                      ctext-non-standard-encodings-alist t))
                      (coding (if encoding-info
@@ -1445,7 +1443,7 @@ Each element must be one of the names listed in the variable
                    (dolist (elt charset)
                      (aset table (make-char elt) slot)))
                   ((char-table-p charset)
-                   (map-char-table #'(lambda (k v) 
+                   (map-char-table #'(lambda (k v)
                                    (if (and v (> k 128)) (aset table k slot)))
                                    charset))))))
     table))
@@ -1501,7 +1499,7 @@ text, and convert it in the temporary buffer.  Otherwise, convert in-place."
                                     (- (point) last-pos)))
                        (save-excursion
                          (goto-char last-pos)
-                         (insert (string-to-multibyte 
+                         (insert (string-to-multibyte
                                   (format "\e%%/%d%c%c%s"
                                           noctets
                                           (+ (/ len 128) 128)
@@ -1668,7 +1666,7 @@ function by default."
           (goto-char tail-start)
           (re-search-forward "[\r\n]\^L" nil t)
           (if (re-search-forward
-               "[\r\n]\\([^[\r\n]*\\)[ \t]*Local Variables:[ \t]*\\([^\r\n]*\\)[\r\n]" 
+               "[\r\n]\\([^[\r\n]*\\)[ \t]*Local Variables:[ \t]*\\([^\r\n]*\\)[\r\n]"
                tail-end t)
               ;; The prefix is what comes before "local variables:" in its
               ;; line.  The suffix is what comes after "local variables:"
@@ -1688,7 +1686,7 @@ function by default."
                        "[ \t]*unibyte[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*"
                        suffix "[\r\n]"))
                      (re-end
-                      (concat "[\r\n]" prefix "[ \t]*End *:[ \t]*" suffix 
+                      (concat "[\r\n]" prefix "[ \t]*End *:[ \t]*" suffix
                               "[\r\n]?"))
                      (pos (1- (point))))
                 (forward-char -1)       ; skip back \r or \n.
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 10bf38f945f..908b77aab33 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -1,6 +1,6 @@
 ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable
 ;;
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience
@@ -36,7 +36,7 @@
 ;;; Code:
 
 (defvar minibuffer-default-in-prompt-regexps
-  '(("\\( (default\\>.*)\\):? \\'" . 1))
+  '(("\\( (default\\>.*)\\):? \\'" . 1) ("\\( \\[.*\\]\\):? *\\'" . 1))
   "*A list of regexps matching the parts of minibuffer prompts showing defaults.
 When `minibuffer-electric-default-mode' is active, these regexps are
 used to identify the portions of prompts to elide.
@@ -157,5 +157,5 @@ Returns non-nil if the new state is enabled."
 
 (provide 'minibuf-eldef)
 
-;;; arch-tag: 7e421fae-c275-4729-b0da-7836af377d3d
+;; arch-tag: 7e421fae-c275-4729-b0da-7836af377d3d
 ;;; minibuf-eldef.el ends here
diff --git a/lisp/subr.el b/lisp/subr.el
index cd52efcebde..747f1925ad5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -851,9 +851,11 @@ and `event-end' functions."
 (make-obsolete 'dot-min 'point-min      "before 19.15")
 (make-obsolete 'dot-marker 'point-marker "before 19.15")
 (make-obsolete 'buffer-flush-undo 'buffer-disable-undo "before 19.15")
-(make-obsolete 'baud-rate "use the baud-rate variable instead." "before 19.15")
+(make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
 (make-obsolete 'compiled-function-p 'byte-code-function-p "before 19.15")
 (make-obsolete 'define-function 'defalias "20.1")
+(make-obsolete 'focus-frame "it does nothing." "19.32")
+(make-obsolete 'unfocus-frame "it does nothing." "19.32")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
@@ -870,8 +872,8 @@ is converted into a string by expressing it in decimal."
   "Return the value of the `baud-rate' variable."
   baud-rate)
 
-(defalias 'focus-frame 'ignore)
-(defalias 'unfocus-frame 'ignore)
+(defalias 'focus-frame 'ignore "")
+(defalias 'unfocus-frame 'ignore "")
 
 
 ;;;; Obsolescence declarations for variables.
@@ -1186,7 +1188,7 @@ Optional args SENTINEL and FILTER specify the sentinel and filter
 ;; compatibility
 
 (make-obsolete 'process-kill-without-query
-               "use `process-query-on-exit-flag'\nor `set-process-query-on-exit-flag'."
+               "use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'."
                "21.5")
 (defun process-kill-without-query (process &optional flag)
   "Say no query needed if PROCESS is running when Emacs is exited.
@@ -1333,9 +1335,11 @@ Optional DEFAULT is a default password to use instead of empty input."
   (let ((n nil))
     (when default
       (setq prompt
-            (if (string-match "\\(\\):[^:]*" prompt)
-                (replace-match (format " [%s]" default) t t prompt 1)
-              (concat prompt (format " [%s] " default)))))
+            (if (string-match "\\(\\):[ \t]*\\'" prompt)
+                (replace-match (format " (default %s)" default) t t prompt 1)
+              (replace-regexp-in-string "[ \t]*\\'"
+                                        (format " (default %s) " default)
+                                        prompt t t)))) 
     (while
         (progn
           (let ((str (read-from-minibuffer prompt nil nil nil nil
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 99e693abb94..15348205c51 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1793,7 +1793,7 @@ Formats current entry according to variable `bibtex-entry-format'."
         (goto-char (point-min))
         (let* ((fields-alist (bibtex-parse-entry))
                (case-fold-search t)
-               (field (bibtex-assoc-regexp "\\(OPT\\)?crossref\\>"
+               (field (bibtex-assoc-regexp "\\`\\(OPT\\)?crossref\\'"
                                            fields-alist)))
           (setq crossref-key (and field
                                   (not (string-match bibtex-empty-field-re
@@ -1807,7 +1807,7 @@ Formats current entry according to variable `bibtex-entry-format'."
             (when (nth 3 rfield) ; we should have an alternative
               (setq alternatives-there t
                     field (bibtex-assoc-regexp
-                           (concat "\\(ALT\\)?" (car rfield) "\\>")
+                           (concat "\\`\\(ALT\\)?" (car rfield) "\\'")
                            fields-alist))
               (if (and field
                        (not (string-match bibtex-empty-field-re
@@ -2317,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-string key strings t))
+            (if (not (assoc key strings))
                 (push (cons key (bibtex-text-in-string bounds t))
                       strings))
             (goto-char (bibtex-end-of-text-in-string bounds)))
@@ -2722,24 +2722,27 @@ according to `bibtex-entry-field-alist', but are not yet present."
     (let* ((fields-alist (bibtex-parse-entry))
            (field-list (bibtex-field-list
                         (substring (cdr (assoc "=type=" fields-alist))
-                                   1)))) ; don't want @
+                                   1))) ; don't want @
+           (case-fold-search t))
       (dolist (field (car field-list))
-        (unless (assoc-string (car field) fields-alist t)
+        (unless (bibtex-assoc-regexp (concat "\\`\\(ALT\\)?" (car field) "\\'")
+                                     fields-alist)
           (bibtex-make-field field)))
       (dolist (field (cdr field-list))
-        (unless (assoc-string (car field) fields-alist t)
+        (unless (bibtex-assoc-regexp (concat "\\`\\(OPT\\)?" (car field) "\\'")
+                                     fields-alist)
           (bibtex-make-optional-field field))))))
 
 (defun bibtex-parse-entry ()
   "Parse entry at point, return an alist.
 The alist elements have the form (FIELD . TEXT), where FIELD can also be
-the special strings \"=type=\" and \"=key=\".
-Move point to the end of the last field."
+the special strings \"=type=\" and \"=key=\". For the FIELD \"=key=\"
+TEXT may be nil. Move point to the end of the last field."
   (let (alist bounds)
-    (when (looking-at bibtex-entry-head)
+    (when (looking-at bibtex-entry-maybe-empty-head)
       (push (cons "=type=" (match-string bibtex-type-in-head)) alist)
       (push (cons "=key=" (match-string bibtex-key-in-head)) alist)
-      (goto-char (match-end bibtex-key-in-head))
+      (goto-char (match-end 0))
       (while (setq bounds (bibtex-parse-field bibtex-field-name))
         (push (cons (bibtex-name-in-field bounds)
                     (bibtex-text-in-field-bounds bounds))
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 6c67581a5a8..a439174556e 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -272,7 +272,7 @@ Return non-nil if FILE is unchanged."
                 ;; Buh?  Unexpected format.
                 'edited
               (let ((ats (file-attributes file)))
-                (if (and (= (nth 7 ats) (string-to-number (match-string 2)))
+                (if (and (eq (nth 7 ats) (string-to-number (match-string 2)))
                          (equal (format-time-string "%s" (nth 5 ats))
                                 (match-string 1)))
                     'up-to-date