Merged in changes from CVS trunk.

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328
   Update from CVS: src/.gdbinit (xsymbol): Fix last change.

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


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

14 files changed, 177 insertions, 134 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e2b74d5b60..81da604aea5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,18 +1,61 @@
+2004-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (do-auto-fill): Remove unused vars `bol' and `opoint'.
+        (completion-setup-function): Use with-current-buffer.
+        Properly save excursion.  Simplify.
+        Don't assume there is necessarily a `mouse-face' property somewhere.
+
+        * progmodes/gud.el (gud-reset): Use unless & with-current-buffer.
+
+        * progmodes/gdb-ui.el (gdb-reset): Use unless.  Fix regexp.
+
+        * emacs-lisp/bytecomp.el (byte-compile-log): Use backquotes.
+        (byte-compile-log-1): Don't call (byte-goto-log-buffer).
+        Use with-current-buffer.
+        (byte-goto-log-buffer): Delete.
+        (byte-compile-log-file): Call compilation-forget-errors.
+
+2004-05-19  Takaaki Ota  <Takaaki.Ota@am.sony.com>  (tiny change)
+
+        * net/ldap.el (ldap-search-internal): Avoid mixing standard error
+        output messages into the search result.
+
+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>.
+
+2004-05-19  Kenichi Handa  <handa@m17n.org>
+
+        * international/characters.el: Fix syntax (open/close) of CJK chars.
+
+2004-05-18  Karl Chen  <quarl@hkn.eecs.berkeley.edu>  (tiny change)
+
+        * help-mode.el (help-go-back): Don't depend on position of back button.
+
+2004-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (auto-save-file-name-transforms): Make sure ange-ftp temp
+        files files don't contain an accidental additional /.
+
+        * textmodes/tex-mode.el (tex-compilation-parse-errors): Save excursion
+        in source buffer.
+
 2004-05-18  Masatake YAMATO  <jet@gyve.org>
 
         * wid-edit.el (widget-radio-button-notify): Don't pass `widget'
-        to widget-apply. :action method assumes 2 arguments, not 3.
+        to widget-apply.  :action method assumes 2 arguments, not 3.
 
 2004-05-17  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
-        * progmodes/f90.el (f90-end-block-re, f90-start-block-re): New
-        constants.
+        * progmodes/f90.el (f90-end-block-re, f90-start-block-re):
+        New constants.
         (hs-special-modes-alist): Add an f90-mode entry.
 
 2004-05-17  Sam Steingold  <sds@gnu.org>
 
-        * emacs-lisp/cl-indent.el (common-lisp-indent-function-1): Indent
-        "without-" forms just like "with-" and "do-".  Use regexp-opt.
+        * emacs-lisp/cl-indent.el (common-lisp-indent-function-1):
+        Indent "without-" forms just like "with-" and "do-".  Use regexp-opt.
 
 2004-05-16  Kim F. Storm  <storm@cua.dk>
 
@@ -20,15 +63,14 @@
 
 2004-05-15  John Wiegley  <johnw@newartisans.com>
 
-        * eshell/esh-io.el (eshell-get-target): whitespace changes.
+        * eshell/esh-io.el (eshell-get-target): Whitespace changes.
         (eshell-output-object-to-target): Improve output speed 20% by not
-        calling `eshell-stringify' if something is already known to be a
-        string.
+        calling `eshell-stringify' if something is already known to be a string.
 
 2004-05-15  Alex Ott  <ott@jet.msk.su>
 
-        * textmodes/ispell.el (ispell-local-dictionary-alist): Add
-        windows-1251 to the choice of coding systems.
+        * textmodes/ispell.el (ispell-local-dictionary-alist):
+        Add windows-1251 to the choice of coding systems.
         (ispell-dictionary-alist-6): Add support for "russianw.aff",
         encoded in cp1251.
 
@@ -75,7 +117,7 @@
 
 2004-05-13  Marcelo Toledo  <marcelo@marcelotoledo.org>
 
-        * language/european.el ("Brazilian Portuguese"): Added support for
+        * language/european.el ("Brazilian Portuguese"): Add support for
         Brazilian Portuguese.
 
 2004-05-13  John Wiegley  <johnw@newartisans.com>
@@ -84,8 +126,7 @@
         `recentf-mode' if this variable has been customized to t.
 
         * eshell/esh-test.el (eshell-test): Call the function
-        `emacs-version' rather than trying to build a custom version
-        string.
+        `emacs-version' rather than trying to build a custom version string.
 
 2004-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -775,18 +816,17 @@
         * progmodes/fortran.el (fortran-fill): Use local var `bol' rather
         than duplicate call to `line-beginning-position'.
 
-        * progmodes/f90.el (f90-get-present-comment-type): Return
-        whitespace, as well as comment chars, for consistent filling
+        * progmodes/f90.el (f90-get-present-comment-type):
+        Return whitespace, as well as comment chars, for consistent filling
         of comment blocks.  Use `match-string-no-properties'.
-        (f90-break-line): Do not leave trailing whitespace when filling
-        comments.
+        (f90-break-line): Trim trailing whitespace when filling comments.
 
 2004-04-30  Dave Love  <fx@gnu.org>
 
         * calendar/diary-lib.el (diary-outlook-formats): New variable.
         (diary-from-outlook-internal, diary-from-outlook)
-        (diary-from-outlook-gnus, diary-from-outlook-rmail): New
-        functions to import diary entries from Outlook-format
+        (diary-from-outlook-gnus, diary-from-outlook-rmail):
+        New functions to import diary entries from Outlook-format
         appointments in mail messages.
 
 2004-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -814,8 +854,7 @@
 
         * progmodes/sql.el (sql-product-alist): Rename variable
         `sql-product-support'.  Add Postgres login parameters.
-        (sql-set-product, sql-product-feature): Update with renamed
-        variable.
+        (sql-set-product, sql-product-feature): Update with renamed variable.
         (sql-connect-postgres): Add username prompt.
         (sql-imenu-generic-expression, sql-mode-font-lock-object-name):
         Make patterns less product specific.
@@ -837,8 +876,7 @@
         (sql-mode-sqlite-font-lock-keywords)
         (sql-mode-db2-font-lock-keywords): Default to nil.
         (sql-product-font-lock): Always highlight ANSI keywords.
-        (sql-add-product-keywords): Made similar to
-        `font-lock-add-keywords'.
+        (sql-add-product-keywords): Made similar to `font-lock-add-keywords'.
         (sql-send-string): Add function.
 
 2004-04-29  Dave Love  <fx@gnu.org>
@@ -7391,7 +7429,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 02, 04  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f6e2946aa8b..8e20925c70d 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -832,24 +832,22 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
 
 ;; Log something that isn't a warning.
 (defmacro byte-compile-log (format-string &rest args)
-  (list 'and
-        'byte-optimize
-        '(memq byte-optimize-log '(t source))
-        (list 'let '((print-escape-newlines t)
-                     (print-level 4)
-                     (print-length 4))
-              (list 'byte-compile-log-1
-                    (cons 'format
-                      (cons format-string
-                        (mapcar
-                         (lambda (x)
-                           (if (symbolp x) (list 'prin1-to-string x) x))
-                         args)))))))
+  `(and
+    byte-optimize
+    (memq byte-optimize-log '(t source))
+    (let ((print-escape-newlines t)
+          (print-level 4)
+          (print-length 4))
+      (byte-compile-log-1
+       (format
+        ,format-string
+        ,@(mapcar
+           (lambda (x) (if (symbolp x) (list 'prin1-to-string x) x))
+           args))))))
 
 ;; Log something that isn't a warning.
 (defun byte-compile-log-1 (string)
-  (save-excursion
-    (byte-goto-log-buffer)
+  (with-current-buffer "*Compile-Log*"
     (goto-char (point-max))
     (byte-compile-warning-prefix nil nil)
     (cond (noninteractive
@@ -903,11 +901,6 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
 (defvar byte-compile-last-warned-form nil)
 (defvar byte-compile-last-logged-file nil)
 
-(defun byte-goto-log-buffer ()
-  (set-buffer (get-buffer-create "*Compile-Log*"))
-  (unless (eq major-mode 'compilation-mode)
-    (compilation-mode)))
-
 ;; This is used as warning-prefix for the compiler.
 ;; It is always called with the warnings buffer current.
 (defun byte-compile-warning-prefix (level entry)
@@ -983,6 +976,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
            ;; Do this after setting default-directory.
            (unless (eq major-mode 'compilation-mode)
              (compilation-mode))
+           (compilation-forget-errors)
            pt))))
 
 ;; Log a message STRING in *Compile-Log*.
diff --git a/lisp/files.el b/lisp/files.el
index 91da8a4c2c7..99cad16cf5b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -293,7 +293,7 @@ Normally auto-save files are written under other names."
   :group 'auto-save)
 
 (defcustom auto-save-file-name-transforms
-  `(("\\`/[^/]*:\\(.+/\\)*\\(.*\\)"
+  `(("\\`/[^/]*:\\([^/]*/\\)*\\([^/]*\\)\\'"
      ;; Don't put "\\2" inside expand-file-name, since it will be
      ;; transformed to "/2" on DOS/Windows.
      ,(concat temporary-file-directory "\\2") t))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 00a2634ee8c..68df8d0941e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * mm-view.el (mm-insert-inline): Make it work in read-only buffer.
+
         * gnus-win.el (gnus-all-windows-visible-p): Don't consider
         non-visible windows.
 
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index f7dfdb60f02..69cbd3d8a1d 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 01, 2004  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -197,7 +197,8 @@
 
 (defun mm-insert-inline (handle text)
   "Insert TEXT inline from HANDLE."
-  (let ((b (point)))
+  (let ((b (point))
+        (inhibit-read-only t))
     (insert text)
     (mm-handle-set-undisplayer
      handle
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 1f1b529c8ef..11656ec368c 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -577,12 +577,11 @@ help buffer."
         (goto-char position)))))
 
 (defun help-go-back ()
-  "Invoke the [back] button (if any) in the Help mode buffer."
+  "Go back to previous topic in this help buffer."
   (interactive)
-  (let ((back-button (button-at (1- (point-max)))))
-    (if back-button
-        (button-activate back-button)
-      (error "No [back] button"))))
+  (if help-xref-stack
+      (help-xref-go-back (current-buffer))
+    (error "No previous help buffer.")))
 
 (defun help-do-xref (pos function args)
   "Call the help cross-reference function FUNCTION with args ARGS.
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 7af456d1878..ebf2a3af27d 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -229,6 +229,14 @@
     (modify-category-entry generic-char ?|)
     (setq cns-list (cdr cns-list))))
 
+(let ((parens "$(G!>!?!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_!`!a!b!c(B")
+      open close)
+  (dotimes (i (/ (length parens) 2))
+    (setq open (aref parens (* i 2))
+          close (aref parens (1+ (* i 2))))
+    (modify-syntax-entry open (format "(%c" close))
+    (modify-syntax-entry close (format ")%c" open))))
+
 ;; Cyrillic character set (ISO-8859-5)
 
 (modify-category-entry (make-char 'cyrillic-iso8859-5) ?y)
@@ -584,16 +592,13 @@
   (while chars
     (modify-syntax-entry (car chars) "w")
     (setq chars (cdr chars))))
-(modify-syntax-entry ?\$B!J(B "($B!K(B")
-(modify-syntax-entry ?\$B!N(B "($B!O(B")
-(modify-syntax-entry ?\$B!P(B "($B!Q(B")
-(modify-syntax-entry ?\$B!V(B "($B!W(B")
-(modify-syntax-entry ?\$B!X(B "($B!Y(B")
-(modify-syntax-entry ?\$B!K(B ")$B!J(B")
-(modify-syntax-entry ?\$B!O(B ")$B!N(B")
-(modify-syntax-entry ?\$B!Q(B ")$B!P(B")
-(modify-syntax-entry ?\$B!W(B ")$B!V(B")
-(modify-syntax-entry ?\$B!Y(B ")$B!X(B")
+(let ((parens "$B!J!K!L!M!N!O!P!Q!R!S!T!U!V!W!X!Y!Z![(B" )
+      open close)
+  (dotimes (i (/ (length parens) 2))
+    (setq open (aref parens (* i 2))
+          close (aref parens (1+ (* i 2))))
+    (modify-syntax-entry open (format "(%c" close))
+    (modify-syntax-entry close (format ")%c" open))))
 
 (modify-category-entry (make-char 'japanese-jisx0208 35) ?A)
 (modify-category-entry (make-char 'japanese-jisx0208 36) ?H)
@@ -652,6 +657,14 @@
 (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" )
+      open close)
+  (dotimes (i (/ (length parens) 2))
+    (setq open (aref parens (* i 2))
+          close (aref parens (1+ (* i 2))))
+    (modify-syntax-entry open (format "(%c" close))
+    (modify-syntax-entry close (format ")%c" open))))
+
 ;; Latin character set (latin-1,2,3,4,5,8,9)
 
 (modify-category-entry (make-char 'latin-iso8859-1) ?l)
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 55af47e6a87..f093fb1cbcc 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -554,7 +554,7 @@ an alist of attribute/value pairs."
           (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
       (eval `(call-process ldap-ldapsearch-prog
                            nil
-                           buf
+                           `(,buf nil)
                            nil
                            ,@arglist
                            ,@ldap-ldapsearch-args
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 8cb21828d69..9e518d791ec 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -764,7 +764,7 @@ before calling the real function `" (symbol-name fun-1) "'.\n")
              (interactive)
              (cvs-mode! ',fun-1)))))
 
-     (t (error "unknown style %s in `defun-cvs-mode'" style)))))
+     (t (error "Unknown style %s in `defun-cvs-mode'" style)))))
 
 (defun-cvs-mode cvs-mode-kill-process ()
   "Kill the temporary buffer and associated process."
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 19c57979130..1fa6f8f2645 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1728,15 +1728,15 @@ This arrangement depends on the value of `gdb-many-windows'."
   "Exit a debugging session cleanly by killing the gdb buffers and resetting
  the source buffers."
   (dolist (buffer (buffer-list))
-    (if (not (eq buffer gud-comint-buffer))
-        (with-current-buffer buffer
-          (if (memq gud-minor-mode '(gdba pdb))
-              (if (string-match "^\*.+*$" (buffer-name))
-                  (kill-buffer nil)
-                (gdb-remove-breakpoint-icons (point-min) (point-max) t)
-                (setq gud-minor-mode nil)
-                (kill-local-variable 'tool-bar-map)
-                (setq gud-running nil))))))
+    (unless (eq buffer gud-comint-buffer)
+      (with-current-buffer buffer
+        (if (memq gud-minor-mode '(gdba pdb))
+            (if (string-match "\\`\\*.+\\*\\'" (buffer-name))
+                (kill-buffer nil)
+              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
+              (setq gud-minor-mode nil)
+              (kill-local-variable 'tool-bar-map)
+              (setq gud-running nil))))))
   (when (markerp gdb-overlay-arrow-position)
     (move-marker gdb-overlay-arrow-position nil)
     (setq gdb-overlay-arrow-position nil))
@@ -2013,5 +2013,5 @@ BUFFER nil or omitted means use the current buffer."
 
 (provide 'gdb-ui)
 
-;;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
+;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
 ;;; gdb-ui.el ends here
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 84dec78d895..eb0b887bdf3 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2554,12 +2554,11 @@ It is saved for when this flag is not set.")
 
 (defun gud-reset ()
   (dolist (buffer (buffer-list))
-    (if (not (eq buffer gud-comint-buffer))
-        (save-excursion
-          (set-buffer buffer)
-          (when gud-minor-mode
-            (setq gud-minor-mode nil)
-            (kill-local-variable 'tool-bar-map))))))
+    (unless (eq buffer gud-comint-buffer)
+      (with-current-buffer buffer
+        (when gud-minor-mode
+          (setq gud-minor-mode nil)
+          (kill-local-variable 'tool-bar-map))))))
 
 (defun gud-display-frame ()
   "Find and obey the last filename-and-line marker from the debugger.
diff --git a/lisp/simple.el b/lisp/simple.el
index 95e3ab0580d..fc8553cb133 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3396,15 +3396,14 @@ Setting this variable automatically makes it local to the current buffer.")
 ;; (Actually some major modes use a different auto-fill function,
 ;; but this one is the default one.)
 (defun do-auto-fill ()
-  (let (fc justify bol give-up
+  (let (fc justify give-up
            (fill-prefix fill-prefix))
     (if (or (not (setq justify (current-justification)))
             (null (setq fc (current-fill-column)))
             (and (eq justify 'left)
                  (<= (current-column) fc))
-            (save-excursion (beginning-of-line)
-                            (setq bol (point))
-                            (and auto-fill-inhibit-regexp
+            (and auto-fill-inhibit-regexp
+                 (save-excursion (beginning-of-line)
                                  (looking-at auto-fill-inhibit-regexp))))
         nil ;; Auto-filling not required
       (if (memq justify '(full center right))
@@ -3427,16 +3426,15 @@ Setting this variable automatically makes it local to the current buffer.")
         ;; Determine where to split the line.
         (let* (after-prefix
                (fill-point
-                (let ((opoint (point)))
-                  (save-excursion
-                    (beginning-of-line)
-                    (setq after-prefix (point))
-                    (and fill-prefix
-                         (looking-at (regexp-quote fill-prefix))
-                         (setq after-prefix (match-end 0)))
-                    (move-to-column (1+ fc))
-                    (fill-move-to-break-point after-prefix)
-                    (point)))))
+                (save-excursion
+                  (beginning-of-line)
+                  (setq after-prefix (point))
+                  (and fill-prefix
+                       (looking-at (regexp-quote fill-prefix))
+                       (setq after-prefix (match-end 0)))
+                  (move-to-column (1+ fc))
+                  (fill-move-to-break-point after-prefix)
+                  (point))))
 
           ;; See whether the place we found is any good.
           (if (save-excursion
@@ -4269,16 +4267,15 @@ of the differing parts is, by contrast, slightly highlighted."
   :group 'completion)
 
 (defun completion-setup-function ()
-  (save-excursion
-    (let ((mainbuf (current-buffer))
-          (mbuf-contents (minibuffer-contents)))
-      ;; When reading a file name in the minibuffer,
-      ;; set default-directory in the minibuffer
-      ;; so it will get copied into the completion list buffer.
-      (if minibuffer-completing-file-name
-          (with-current-buffer mainbuf
-            (setq default-directory (file-name-directory mbuf-contents))))
-      (set-buffer standard-output)
+  (let ((mainbuf (current-buffer))
+        (mbuf-contents (minibuffer-contents)))
+    ;; When reading a file name in the minibuffer,
+    ;; set default-directory in the minibuffer
+    ;; so it will get copied into the completion list buffer.
+    (if minibuffer-completing-file-name
+        (with-current-buffer mainbuf
+          (setq default-directory (file-name-directory mbuf-contents))))
+    (with-current-buffer standard-output
       (completion-list-mode)
       (make-local-variable 'completion-reference-buffer)
       (setq completion-reference-buffer mainbuf)
@@ -4287,24 +4284,23 @@ of the differing parts is, by contrast, slightly highlighted."
           ;; use the number of chars before the start of the
           ;; last file name component.
           (setq completion-base-size
-                (save-excursion
-                  (set-buffer mainbuf)
-                  (goto-char (point-max))
-                  (skip-chars-backward "^/")
-                  (- (point) (minibuffer-prompt-end))))
+                (with-current-buffer mainbuf
+                  (save-excursion
+                    (goto-char (point-max))
+                    (skip-chars-backward "^/")
+                    (- (point) (minibuffer-prompt-end)))))
         ;; Otherwise, in minibuffer, the whole input is being completed.
-        (save-match-data
-          (if (minibufferp mainbuf)
-              (setq completion-base-size 0))))
-       ;; Put faces on first uncommon characters and common parts.
+        (if (minibufferp mainbuf)
+            (setq completion-base-size 0)))
+      ;; Put faces on first uncommon characters and common parts.
       (when completion-base-size
-        (let* ((common-string-length (length
-                                      (substring mbuf-contents
-                                                 completion-base-size)))
+        (let* ((common-string-length
+                (- (length mbuf-contents) completion-base-size))
                (element-start (next-single-property-change
                                (point-min)
                                'mouse-face))
-               (element-common-end (+ element-start common-string-length))
+               (element-common-end
+                (+ (or element-start nil) common-string-length))
                (maxp (point-max)))
           (while (and element-start (< element-common-end maxp))
             (when (and (get-char-property element-start 'mouse-face)
@@ -4768,5 +4764,5 @@ works by saving the value of `buffer-invisibility-spec' and setting it to nil."
 
 (provide 'simple)
 
-;;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd
+;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd
 ;;; simple.el ends here
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 6e129987ec1..28bf9f6cf28 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1944,21 +1944,22 @@ for the error messages."
               (or (null last-filename)
                   (not (string-equal last-filename filename))))
              (error-location
-              (save-excursion
-                (if (equal filename (concat tex-zap-file ".tex"))
-                    (set-buffer tex-last-buffer-texed)
-                  (set-buffer (find-file-noselect filename)))
-                (if new-file
-                    (progn (goto-line linenum) (setq last-position nil))
-                  (goto-char last-position)
-                  (forward-line (- linenum last-linenum)))
-                ;; first try a forward search for the error text,
-                ;; then a backward search limited by the last error.
-                (let ((starting-point (point)))
-                  (or (re-search-forward error-text nil t)
-                      (re-search-backward error-text last-position t)
-                      (goto-char starting-point)))
-                (point-marker))))
+              (with-current-buffer
+                  (if (equal filename (concat tex-zap-file ".tex"))
+                      tex-last-buffer-texed
+                    (find-file-noselect filename))
+                (save-excursion
+                  (if new-file
+                      (progn (goto-line linenum) (setq last-position nil))
+                    (goto-char last-position)
+                    (forward-line (- linenum last-linenum)))
+                  ;; first try a forward search for the error text,
+                  ;; then a backward search limited by the last error.
+                  (let ((starting-point (point)))
+                    (or (re-search-forward error-text nil t)
+                        (re-search-backward error-text last-position t)
+                        (goto-char starting-point)))
+                  (point-marker)))))
         (goto-char this-error)
         (if (and compilation-error-list
                  (or (and find-at-least
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b1a89e4fbef..33f1f06ba9a 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2294,7 +2294,7 @@ Return an alist of (TYPE MATCH)."
 
 (defun widget-radio-button-notify (widget child &optional event)
   ;; Tell daddy.
-  (widget-apply (widget-get widget :parent) :action event))
+  (widget-apply (widget-get widget :parent) :action widget event))
 
 ;;; The `radio-button-choice' Widget.