Merged from miles@gnu.org--gnu-2005 (patch 34-36, 142-158)

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-145
   (make-text-button): Default button type if not specified

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-146
   quick-install-emacs: Use mkdir --verbose only when requested

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
   Add info/dir to arch branch

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-35
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-36
   Update from CVS

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

21 files changed, 464 insertions, 167 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c3842ea3a5..d65a446a376 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,147 @@
+2005-03-05  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * simple.el (goto-line): Remove unbalanced final parenthesis.
+
+2005-03-05  Richard M. Stallman  <rms@gnu.org>
+
+        * simple.el (goto-line): Use a number at point as the default.
+        With C-u as arg, switch buffers.
+
+2005-03-05  Juri Linkov  <juri@jurta.org>
+
+        * frame.el (blink-cursor-mode): Replace `emacs-quick-startup'
+        with `no-blinking-cursor'.
+
+        * startup.el (no-blinking-cursor): New defvar.
+        (command-line): Add `--no-blinking-cursor' to longopts.
+        Set `no-blinking-cursor' to t for command line arguments
+        -Q, -nbc, --no-blinking-cursor.  Replace `emacs-quick-startup'
+        with `no-blinking-cursor' in the condition for calling
+        `blink-cursor-mode'.
+
+2005-03-04  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * menu-bar.el (menu-bar-make-mm-toggle): Doc fix.
+        (menu-bar-options-save): Add blink-cursor-mode.
+        (menu-bar-options-menu): Add blink-cursor-mode.
+
+2005-03-04  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar/icalendar.el (icalendar-version): Increase to 0.11.
+        (icalendar-export-file, icalendar-export-region)
+        (icalendar-import-file, icalendar-import-buffer): Add autoload
+        cookies.
+        (icalendar--convert-ical-to-diary): Fix problem with DURATION.
+
+2005-03-04  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/debug.el (debugger-step-after-exit): Make it a
+        defvar.
+        (debug-function-list): Ditto.
+
+2005-03-04  Robert J. Chassell  <bob@rattlesnake.com>
+
+        * textmodes/texinfmt.el (texinfo-append-refill):
+        Redefine the types of line to which @refill
+        is not appended by replacing a search for `@refill\\|@bye' with
+        `@refill\\|^[ \t]*@'.  The intent is to solve both the `@end
+        itemize@refill' bug and the unfilled long lines bug.
+        (texinfmt-version): update number and date.
+
+2005-03-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * international/code-pages.el (windows-1250, windows-125[2-8])
+        (iso-8859-10, -13, -16, georgian-ps): Add autoload cookies.
+
+2005-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * frame.el (blink-cursor-mode): `emacs-quick-startup' may not be
+        bound yet.
+
+2005-03-02  Romain Francoise  <romain@orebokech.com>
+
+        * ibuf-ext.el (ibuffer-filter-disable): Move back to the current
+        buffer after removing limits.
+        (ibuffer-pop-filter): Ditto.
+        Update copyright.
+
+2005-03-02  Miles Bader  <miles@gnu.org>
+
+        * button.el (make-text-button): If the user doesn't specify a
+        type, use the default.  Rewrite to use `add-text-properties' and
+        plist functions.
+
+2005-03-01  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/debug.el (inhibit-debug-on-entry): Add docstring.
+        (debugger-jumping-flag): New var.
+        (debug-entry-code): Use it.
+        (debugger-jump): Use debugger-jumping-flag and add
+        debugger-reenable to post-command-hook.
+        (debugger-reenable): Use debugger-jumping-flag and remove itself
+        from post-command-hook.
+        (debug, debug-on-entry, cancel-debug-on-entry): Remove call to
+        debugger-reenable.
+
+2005-03-01  Robert J. Chassell  <bob@rattlesnake.com>
+
+        * textmodes/texinfmt.el (texinfo-no-refill-regexp): Comment out
+        inclusion of "itemize\\|", which may be unnecessary, is certainly
+        inelegant, and stops refilling in itemize lists when formatting
+        Japanese Texinfo files to Info.
+        Update copyright to 2005.
+
+2005-03-01  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-get-location): Use a warning instead
+        of an error if GDB can't find the source file.
+
+2005-03-01  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+        * calendar/calendar.el (redraw-calendar): Work from any buffer,
+        not just the calendar.
+
+        * calendar/diary-lib.el (mark-diary-entries): Remove any old marks
+        first.
+        (diary-redraw-calendar): New function.
+        (make-diary-entry): Add diary-redraw-calendar to local
+        write-contents-functions.  Turn off selective display before
+        inserting in diary.
+
+2005-03-01  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/copyright.el (copyright-fix-years): New command.
+
+2005-03-01  Lute Kamstra  <lute@gnu.org>
+
+        * emacs-lisp/debug.el (debug-on-entry-1): Reimplement to make sure
+        that debug-entry-code can be safely removed from a function while
+        this code is being evaluated.  Revert the 2005-02-27 change as the
+        new implementation no longer requires it.  Make sure that a
+        function body containing just a string is not mistaken for a
+        docstring.
+        (debug): Skip one more frame in case of debug on entry.
+        (debugger-setup-buffer): Delete one more frame line in case of
+        debug on entry.
+        (debugger-frame-number): Update to use the new text introduced by
+        the 1999-11-03 change.  Skip one more frame in case of debug on entry.
+
+2005-02-28  Kim F. Storm  <storm@cua.dk>
+
+        * double.el (double-translate-key): Call force-window-update after
+        read-event to avoid crash in redisplay.
+
+2005-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (inhibit-debug-on-entry): New var.
+        (debug): Use it.  Move the inhibit-trace earlier.
+        (debug-entry-code): New const.
+        (debug-on-entry-1): Use it.
+
 2005-02-28  Chong Yidong" <cyd@stupidchicken.com> (tiny change)
 
-        * international/utf-16.el (ccl-encode-mule-utf-16le): Fix
-        BUFFER_MAGNIFICATION to 2.
+        * international/utf-16.el (ccl-encode-mule-utf-16le):
+        Fix BUFFER_MAGNIFICATION to 2.
         (ccl-encode-mule-utf-16be): Likewise.
 
 2005-02-28  Kenichi Handa  <handa@m17n.org>
diff --git a/lisp/button.el b/lisp/button.el
index 5f9b5094e6c..78008f06db2 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -1,6 +1,6 @@
 ;;; button.el --- clickable buttons
 ;;
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: extensions
@@ -298,24 +298,23 @@ large numbers of buttons can also be somewhat faster using
 `make-text-button'.
 
 Also see `insert-text-button'."
-  (let (prop val)
-    (while properties
-      (setq prop (pop properties))
-      (setq val (pop properties))
-      ;; Note that all the following code is basically equivalent to
-      ;; `button-put', but we can do it much more efficiently since we
-      ;; already have BEG and END.
-      (cond ((memq prop '(type :type))
-             ;; We translate a `type' property into a `category'
-             ;; property, since that's what's actually used by
-             ;; text-properties for inheritance.
-             (setq prop 'category)
-             (setq val (button-category-symbol val)))
-            ((eq prop 'category)
-             ;; Disallow setting the `category' property directly.
-             (error "Button `category' property may not be set directly")))
-      ;; Add the property.
-      (put-text-property beg end prop val)))
+  (let ((type-entry
+         (or (plist-member properties 'type)
+             (plist-member properties :type))))
+    ;; Disallow setting the `category' property directly.
+    (when (plist-get properties 'category)
+      (error "Button `category' property may not be set directly"))
+    (if (null type-entry)
+        ;; The user didn't specify a `type' property, use the default.
+        (setq properties (cons 'category (cons 'default-button properties)))
+      ;; The user did specify a `type' property.  Translate it into a
+      ;; `category' property, which is what's actually used by
+      ;; text-properties for inheritance.
+      (setcar type-entry 'category)
+      (setcar (cdr type-entry)
+              (button-category-symbol (car (cdr type-entry))))))
+  ;; Now add all the text properties at once
+  (add-text-properties beg end properties)
   ;; Return something that can be used to get at the button.
   beg)
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 291452db080..66ee1875a23 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2169,11 +2169,13 @@ the inserted text.  Value is always t."
   t)
 
 (defun redraw-calendar ()
-  "Redraw the calendar display."
+  "Redraw the calendar display, if `calendar-buffer' is live."
   (interactive)
-  (let ((cursor-date (calendar-cursor-to-nearest-date)))
-    (generate-calendar-window displayed-month displayed-year)
-    (calendar-cursor-to-visible-date cursor-date)))
+  (if (get-buffer calendar-buffer)
+      (with-current-buffer calendar-buffer
+        (let ((cursor-date (calendar-cursor-to-nearest-date)))
+          (generate-calendar-window displayed-month displayed-year)
+          (calendar-cursor-to-visible-date cursor-date)))))
 
 (defcustom calendar-debug-sexp nil
   "*Turn debugging on when evaluating a sexp in the diary or holiday list."
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 5fbae2500d7..97dc1dd0a71 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1,6 +1,6 @@
 ;;; diary-lib.el --- diary functions
 
-;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2003, 2004
+;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2003, 2004, 2005
 ;;           Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -841,6 +841,10 @@ Each entry in the diary file visible in the calendar window is marked.
 After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
 `mark-diary-entries-hook' are run."
   (interactive)
+  ;; To remove any deleted diary entries.
+  (when mark-diary-entries-in-calendar
+    (setq mark-diary-entries-in-calendar nil)
+    (redraw-calendar))
   (let ((marking-diary-entries t)
         file-glob-attrs marks)
     (save-excursion
@@ -1647,11 +1651,26 @@ Do nothing if DATE or STRING is nil."
           (append diary-entries-list
                   (list (list date string specifier marker globcolor))))))
 
+(defun diary-redraw-calendar ()
+  "If `calendar-buffer' is live and diary entries are marked, redraw it."
+  (and mark-diary-entries-in-calendar
+       (redraw-calendar))
+  ;; Return value suitable for `write-contents-functions'.
+  nil)
+
 (defun make-diary-entry (string &optional nonmarking file)
   "Insert a diary entry STRING which may be NONMARKING in FILE.
-If omitted, NONMARKING defaults to nil and FILE defaults to `diary-file'."
+If omitted, NONMARKING defaults to nil and FILE defaults to
+`diary-file'.  Adds `diary-redraw-calendar' to
+`write-contents-functions' for FILE, so that the calendar will be
+redrawn with the new entry marked, if necessary."
   (let ((pop-up-frames (window-dedicated-p (selected-window))))
     (find-file-other-window (substitute-in-file-name (or file diary-file))))
+  (add-hook 'write-contents-functions 'diary-redraw-calendar nil t)
+  (when selective-display
+    (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
+    (setq selective-display nil)
+    (kill-local-variable 'mode-line-format))
   (widen)
   (goto-char (point-max))
   (when (let ((case-fold-search t))
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index fe127be3990..320a6aa0f72 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -90,7 +90,7 @@
 
 ;;; Code:
 
-(defconst icalendar-version 0.10
+(defconst icalendar-version 0.11
   "Version number of icalendar.el.")
 
 ;; ======================================================================
@@ -415,8 +415,10 @@ FIXME: multiple comma-separated values should be allowed!"
   "Return ISODURATIONSTRING in format like `decode-time'.
 Converts from ISO-8601 to Emacs representation.  If ISODURATIONSTRING
 specifies UTC time (trailing letter Z) the decoded time is given in
-the local time zone! FIXME: TZID-attributes are ignored....! FIXME:
-multiple comma-separated values should be allowed!"
+the local time zone!
+
+FIXME: TZID-attributes are ignored....!
+FIXME: multiple comma-separated values should be allowed!"
   (if isodurationstring
       (save-match-data
         (string-match
@@ -672,7 +674,7 @@ would be \"pm\"."
 ;; Export -- convert emacs-diary to icalendar
 ;; ======================================================================
 
-;; User function
+;;;###autoload
 (defun icalendar-export-file (diary-filename ical-filename)
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
@@ -686,7 +688,7 @@ Finto iCalendar file: ")
 (defalias 'icalendar-convert-diary-to-ical 'icalendar-export-file)
 (make-obsolete 'icalendar-convert-diary-to-ical 'icalendar-export-file)
 
-;; User function
+;;;###autoload
 (defun icalendar-export-region (min max ical-filename)
   "Export region in diary file to iCalendar format.
 All diary entries in the region from MIN to MAX in the current buffer are
@@ -1112,7 +1114,7 @@ FExport diary data into iCalendar file: ")
 ;; Import -- convert icalendar to emacs-diary
 ;; ======================================================================
 
-;; User function
+;;;###autoload
 (defun icalendar-import-file (ical-filename diary-filename
                                             &optional non-marking)
   "Import a iCalendar file and append to a diary file.
@@ -1129,7 +1131,7 @@ p")
     (set-buffer (find-file ical-filename))
     (icalendar-import-buffer diary-filename t non-marking)))
 
-;; User function
+;;;###autoload
 (defun icalendar-import-buffer (&optional diary-file do-not-ask
                                           non-marking)
   "Extract iCalendar events from current buffer.
@@ -1423,10 +1425,7 @@ written into the buffer ` *icalendar-errors*'."
              ((not (string= start-d end-d))
               (icalendar--dmsg "non-recurring event")
               (let ((ds (icalendar--datetime-to-diary-date dtstart))
-                    (de (icalendar--datetime-to-diary-date
-                         (icalendar--decode-isodatetime
-                          (icalendar--get-event-property e 'DTEND)
-                          -1))))
+                    (de (icalendar--datetime-to-diary-date dtend)))
                 (setq diary-string
                       (format "%%%%(and (diary-block %s %s))"
                               ds de)))
diff --git a/lisp/double.el b/lisp/double.el
index fc931992bd1..c9c27203344 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -116,6 +116,7 @@ but not `C-u X' or `ESC X' since the X is not the prefix key."
            ;; End of generated event.  See if he will repeat it...
            (let ((new (double-read-event prompt))
                  (entry (assoc double-last-event double-map)))
+             (force-window-update (selected-window))
              (if (eq new double-last-event)
                  (progn
                    (setq unread-command-events
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 3d160f54606..0be9d139fd2 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -1,6 +1,6 @@
 ;;; copyright.el --- update the copyright notice in current buffer
 
-;; Copyright (C) 1991, 92, 93, 94, 95, 1998, 2001, 2003, 2004
+;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2003, 2004, 2005
 ;;           Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
@@ -178,6 +178,41 @@ version \\([0-9]+\\), or (at"
 
 
 ;;;###autoload
+(defun copyright-fix-years ()
+  "Convert 2 digit years to 4 digit years.
+Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
+  (interactive)
+  (widen)
+  (goto-char (point-min))
+  (if (re-search-forward copyright-regexp (+ (point) copyright-limit) t)
+      (let ((s (match-beginning 2)) (e (make-marker))
+            last)
+        (set-marker e (1+ (match-end 2)))
+        (goto-char s)
+        (while (and (< (point) (marker-position e))
+                    (re-search-forward "\\([^0-9]\\)\\([0-9]+\\)[^0-9]"
+                                       (marker-position e) t))
+          (let ((p (point))
+                (sep (match-string 1))
+                (year (string-to-number (match-string 2))))
+            (goto-char (1+ (match-beginning 0)))
+            (unless (= (char-syntax (string-to-char sep)) ?\s)
+              (insert " "))
+            (if (< year 100)
+                (insert (if (>= year 50) "19" "20")))
+            (goto-char p)
+            (setq last p)))
+        (when last
+          (goto-char last)
+          (let ((fill-prefix "     "))
+            (fill-region s last))
+          )
+        (set-marker e nil)
+        (copyright-update nil t))
+    (message "No copyright message")
+    (goto-char (point-min))))
+
+;;;###autoload
 (define-skeleton copyright
   "Insert a copyright by $ORGANIZATION notice at cursor."
   "Company: "
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 58fb3b4a1b8..ab197e8e119 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 
-;; This is a major mode documented in the Emacs manual.
+;; This is a major mode documented in the Emacs Lisp manual.
 
 ;;; Code:
 
@@ -51,15 +51,11 @@ the middle is discarded, and just the beginning and end are displayed."
   :group 'debugger
   :version "21.1")
 
-(defcustom debug-function-list nil
-  "List of functions currently set for debug on entry."
-  :type '(repeat function)
-  :group 'debugger)
+(defvar debug-function-list nil
+  "List of functions currently set for debug on entry.")
 
-(defcustom debugger-step-after-exit nil
-  "Non-nil means \"single-step\" after the debugger exits."
-  :type 'boolean
-  :group 'debugger)
+(defvar debugger-step-after-exit nil
+  "Non-nil means \"single-step\" after the debugger exits.")
 
 (defvar debugger-value nil
   "This is the value for the debugger to return, when it returns.")
@@ -93,6 +89,21 @@ This is to optimize `debugger-make-xrefs'.")
 (defvar debugger-outer-inhibit-redisplay)
 (defvar debugger-outer-cursor-in-echo-area)
 
+(defvar inhibit-debug-on-entry nil
+  "Non-nil means that debug-on-entry is disabled.")
+
+(defvar debugger-jumping-flag nil
+  "Non-nil means that debug-on-entry is disabled.
+This variable is used by `debugger-jump' and `debugger-reenable'.")
+
+;; When you change this, you may also need to change the number of
+;; frames that the debugger skips.
+(defconst debug-entry-code
+  '(if (or inhibit-debug-on-entry debugger-jumping-flag)
+       nil
+     (debug 'debug))
+  "Code added to a function to cause it to call the debugger upon entry.")
+
 ;;;###autoload
 (setq debugger 'debug)
 ;;;###autoload
@@ -147,6 +158,8 @@ first will be printed into the backtrace buffer."
       (setq overriding-terminal-local-map nil)
       ;; Don't let these magic variables affect the debugger itself.
       (let ((last-command nil) this-command track-mouse
+            (inhibit-trace t)
+            (inhibit-debug-on-entry t)
             unread-command-events
             unread-post-input-method-events
             last-input-event last-command-event last-nonmenu-event
@@ -185,12 +198,11 @@ first will be printed into the backtrace buffer."
                   (message "%s" (buffer-string))
                   (kill-emacs))
                 (if (eq (car debugger-args) 'debug)
-                    ;; Skip the frames for backtrace-debug, byte-code, and debug.
-                    (backtrace-debug 3 t))
-                (debugger-reenable)
+                    ;; Skip the frames for backtrace-debug, byte-code,
+                    ;; and debug-entry-code.
+                    (backtrace-debug 4 t))
                 (message "")
-                (let ((inhibit-trace t)
-                      (standard-output nil)
+                (let ((standard-output nil)
                       (buffer-read-only t))
                   (message "")
                   ;; Make sure we unbind buffer-read-only in the right buffer.
@@ -250,7 +262,9 @@ That buffer should be current already."
   (delete-region (point)
                  (progn
                    (search-forward "\n  debug(")
-                   (forward-line 1)
+                   (forward-line (if (eq (car debugger-args) 'debug)
+                                     2  ; Remove debug-entry-code frame.
+                                   1))
                    (point)))
   (insert "Debugger entered")
   ;; lambda is for debug-on-call when a function call is next.
@@ -395,25 +409,17 @@ will be used, such as in a debug on exit from a frame."
   "Continue to exit from this frame, with all debug-on-entry suspended."
   (interactive)
   (debugger-frame)
-  ;; Turn off all debug-on-entry functions
-  ;; but leave them in the list.
-  (let ((list debug-function-list))
-    (while list
-      (fset (car list)
-            (debug-on-entry-1 (car list) (symbol-function (car list)) nil))
-      (setq list (cdr list))))
+  (setq debugger-jumping-flag t)
+  (add-hook 'post-command-hook 'debugger-reenable)
   (message "Continuing through this frame")
   (exit-recursive-edit))
 
 (defun debugger-reenable ()
-  "Turn all debug-on-entry functions back on."
-  (let ((list debug-function-list))
-    (while list
-      (or (consp (symbol-function (car list)))
-          (debug-convert-byte-code (car list)))
-      (fset (car list)
-            (debug-on-entry-1 (car list) (symbol-function (car list)) t))
-      (setq list (cdr list)))))
+  "Turn all debug-on-entry functions back on.
+This function is put on `post-command-hook' by `debugger-jump' and
+removes itself from that hook."
+  (setq debugger-jumping-flag nil)
+  (remove-hook 'post-command-hook 'debugger-reenable))
 
 (defun debugger-frame-number ()
   "Return number of frames in backtrace before the one point points at."
@@ -423,14 +429,13 @@ will be used, such as in a debug on exit from a frame."
           (count 0))
       (while (not (eq (cadr (backtrace-frame count)) 'debug))
         (setq count (1+ count)))
+      ;; Skip debug-entry-code frame.
+      (when (member '(debug (quote debug)) (cdr (backtrace-frame (1+ count))))
+        (setq count (1+ count)))
       (goto-char (point-min))
-      (if (or (equal (buffer-substring (point) (+ (point) 6))
-                     "Signal")
-              (equal (buffer-substring (point) (+ (point) 6))
-                     "Return"))
-          (progn
-            (search-forward ":")
-            (forward-sexp 1)))
+      (when (looking-at "Debugger entered--\\(Lisp error\\|returning value\\):")
+        (goto-char (match-end 0))
+        (forward-sexp 1))
       (forward-line 1)
       (while (progn
                (forward-char 2)
@@ -476,8 +481,6 @@ Applies to the frame whose line point is on in the backtrace."
         (insert ? )))
   (beginning-of-line))
 
-
-
 (put 'debugger-env-macro 'lisp-indent-function 0)
 (defmacro debugger-env-macro (&rest body)
   "Run BODY in original environment."
@@ -626,7 +629,6 @@ which must be written in Lisp, not predefined.
 Use \\[cancel-debug-on-entry] to cancel the effect of this command.
 Redefining FUNCTION also cancels it."
   (interactive "aDebug on entry (to function): ")
-  (debugger-reenable)
   ;; Handle a function that has been aliased to some other function.
   (if (and (subrp (symbol-function function))
            (eq (cdr (subr-arity (symbol-function function))) 'unevalled))
@@ -657,7 +659,6 @@ If argument is nil or an empty string, cancel for all functions."
                                  (mapcar 'symbol-name debug-function-list)
                                  nil t nil)))
            (if name (intern name)))))
-  (debugger-reenable)
   (if (and function (not (string= function "")))
       (progn
         (let ((f (debug-on-entry-1 function (symbol-function function) nil)))
@@ -698,22 +699,18 @@ If argument is nil or an empty string, cancel for all functions."
         (debug-on-entry-1 function (cdr defn) flag)
       (or (eq (car defn) 'lambda)
           (error "%s not user-defined Lisp function" function))
-      (let ((tail (cddr defn)))
+      (let ((tail (cdr defn)))
         ;; Skip the docstring.
-        (if (stringp (car tail)) (setq tail (cdr tail)))
+        (when (and (stringp (cadr tail)) (cddr tail))
+          (setq tail (cdr tail)))
         ;; Skip the interactive form.
-        (if (eq 'interactive (car-safe (car tail))) (setq tail (cdr tail)))
-        (unless (eq flag (equal (car tail) '(debug 'debug)))
-          ;; If the function has no body, add nil as a body element.
-          (when (null tail)
-            (setq tail (list nil))
-            (nconc defn tail))
+        (when (eq 'interactive (car-safe (cadr tail)))
+          (setq tail (cdr tail)))
+        (unless (eq flag (equal (cadr tail) debug-entry-code))
           ;; Add/remove debug statement as needed.
-          (if (not flag)
-              (progn (setcar tail (cadr tail))
-                     (setcdr tail (cddr tail)))
-            (setcdr tail (cons (car tail) (cdr tail)))
-            (setcar tail '(debug 'debug))))
+          (if flag
+              (setcdr tail (cons debug-entry-code (cdr tail)))
+            (setcdr tail (cddr tail))))
         defn))))
 
 (defun debugger-list-functions ()
diff --git a/lisp/frame.el b/lisp/frame.el
index 0fa10babf12..25cc5aa38c8 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1341,7 +1341,7 @@ Note that this command is effective only when Emacs
 displays through a window system, because then Emacs does its own
 cursor display.  On a text-only terminal, this is not implemented."
   :init-value (not (or noninteractive
-                       emacs-quick-startup
+                       (if (boundp 'no-blinking-cursor) no-blinking-cursor)
                        (eq system-type 'ms-dos)
                        (not (memq initial-window-system '(x w32)))))
   :group 'cursor
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7ade8548764..76d4cb419cb 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,11 +1,37 @@
+2005-03-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * message.el: Don't autoload former message-utils variables.
+        (message-strip-subject-trailing-was): Changed doc string.
+
+        * nnweb.el: Fixes for `gnus-group-make-web-group'.
+        (nnweb-type-definition): Don't add "hl=en" in `address'.  Added
+        `base'.
+        (nnweb-google-search): Add "hl=en" here.
+        (nnweb-google-parse-1, nnweb-google-create-mapping): Don't
+        hardcode URL.
+
+2005-03-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * message.el (message-get-reply-headers, message-followup):
+        Mention related variables `message-use-followup-to' and
+        `message-use-mail-followup-to', in the information buffer.
+
+        * nnweb.el (nnweb-type-definition): Use groups.google.de instead
+        of broken groups(-beta).google.com.
+
+2005-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gnus-sum.el (gnus-summary-exit): Undo last change and fix it in
+        a more conservative way.
+
 2005-02-27  Arne J,Ax(Brgensen  <arne@arnested.dk>
 
         * mm-decode.el (mm-dissect-buffer): Pass the from field on to
         `mm-dissect-multipart' and receive the from field as an (optional)
         argument from `mm-dissect-multipart'.
         (mm-dissect-multipart): Receive the from field as an argument and
-        pass it on when we call `mm-dissect-buffer' on MIME parts. Fixes
-        verification/decryption of signed/encrypted MIME parts.
+        pass it on when we call `mm-dissect-buffer' on MIME parts.
+        Fixes verification/decryption of signed/encrypted MIME parts.
 
 2005-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 73ac963bd3b..ea8f7e063fe 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6680,11 +6680,13 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (set-buffer gnus-group-buffer)
       (if quit-config
           (gnus-handle-ephemeral-exit quit-config)
+        (goto-char group-point)
+        ;; If gnus-group-buffer is already displayed, make sure we also move
+        ;; the cursor in the window that displays it.
+        (let ((win (get-buffer-window (current-buffer) 0)))
+          (if win (set-window-point win (point))))
         (unless leave-hidden
-          (gnus-configure-windows 'group 'force))
-        ;; Move point after calling gnus-configure-windows to make sure it
-        ;; moves the window's point as well.
-        (goto-char group-point))
+          (gnus-configure-windows 'group 'force)))
       ;; Clear the current group name.
       (unless quit-config
         (setq gnus-newsgroup-name nil)))))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index e30e9a6b123..e579084474e 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -335,11 +335,8 @@ few false positives here."
   :link '(custom-manual "(message)Message Headers")
   :type 'regexp)
 
-;; Fixme: Why are all these things autoloaded?
-
 ;;; marking inserted text
 
-;;;###autoload
 (defcustom message-mark-insert-begin
   "--8<---------------cut here---------------start------------->8---\n"
   "How to mark the beginning of some inserted text."
@@ -348,7 +345,6 @@ few false positives here."
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-various)
 
-;;;###autoload
 (defcustom message-mark-insert-end
   "--8<---------------cut here---------------end--------------->8---\n"
   "How to mark the end of some inserted text."
@@ -357,9 +353,7 @@ few false positives here."
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-various)
 
-;;;###autoload
-(defcustom message-archive-header
-  "X-No-Archive: Yes\n"
+(defcustom message-archive-header "X-No-Archive: Yes\n"
   "Header to insert when you don't want your article to be archived.
 Archives \(such as groups.google.com\) respect this header."
   :version "22.1"
@@ -367,7 +361,6 @@ Archives \(such as groups.google.com\) respect this header."
   :link '(custom-manual "(message)Header Commands")
   :group 'message-various)
 
-;;;###autoload
 (defcustom message-archive-note
   "X-No-Archive: Yes - save http://groups.google.com/"
   "Note to insert why you wouldn't want this posting archived.
@@ -385,7 +378,6 @@ If nil, don't insert any text in the body."
   "Old target for cross-posts or follow-ups.")
 (make-variable-buffer-local 'message-cross-post-old-target)
 
-;;;###autoload
 (defcustom message-cross-post-default t
   "When non-nil `message-cross-post-followup-to' will perform a crosspost.
 If nil, `message-cross-post-followup-to' will only do a followup.  Note that
@@ -395,25 +387,19 @@ you can explicitly override this setting by calling
   :type 'boolean
   :group 'message-various)
 
-;;;###autoload
-(defcustom message-cross-post-note
-  "Crosspost & Followup-To: "
+(defcustom message-cross-post-note "Crosspost & Followup-To: "
   "Note to insert before signature to notify of cross-post and follow-up."
   :version "22.1"
   :type 'string
   :group 'message-various)
 
-;;;###autoload
-(defcustom message-followup-to-note
-  "Followup-To: "
+(defcustom message-followup-to-note "Followup-To: "
   "Note to insert before signature to notify of follow-up only."
   :version "22.1"
   :type 'string
   :group 'message-various)
 
-;;;###autoload
-(defcustom message-cross-post-note-function
-  'message-cross-post-insert-note
+(defcustom message-cross-post-note-function 'message-cross-post-insert-note
   "Function to use to insert note about Crosspost or Followup-To.
 The function will be called with four arguments.  The function should not only
 insert a note, but also ensure old notes are deleted.  See the documentation
@@ -1766,7 +1752,7 @@ see `message-narrow-to-headers-or-head'."
 ;;; Start of functions adopted from `message-utils.el'.
 
 (defun message-strip-subject-trailing-was (subject)
-  "Remove trailing \"(Was: <old subject>)\" from SUBJECT lines.
+  "Remove trailing \"(was: <old subject>)\" from SUBJECT lines.
 Leading \"Re: \" is not stripped by this function.  Use the function
 `message-strip-subject-re' for this."
   (let* ((query message-subject-trailing-was-query)
@@ -5675,7 +5661,10 @@ because discussions that are spread over several lists tend to be
 fragmented and very difficult to follow.
 
 Also, some source/announcement lists are not intended for discussion;
-responses here are directed to other addresses.")))
+responses here are directed to other addresses.
+
+You may customize the variable `message-use-mail-followup-to', if you
+want to get rid of this query permanently.")))
         (setq recipients (concat ", " mft)))
        (to-address
         (setq recipients (concat ", " to-address))
@@ -5871,7 +5860,10 @@ You should normally obey the Followup-To: header.
 `Followup-To: poster' sends your response via e-mail instead of news.
 
 A typical situation where `Followup-To: poster' is used is when the poster
-does not read the newsgroup, so he wouldn't see any replies sent to it."))
+does not read the newsgroup, so he wouldn't see any replies sent to it.
+
+You may customize the variable `message-use-followup-to', if you
+want to get rid of this query permanently."))
                   (progn
                     (setq message-this-is-news nil)
                     (cons 'To (or mrt reply-to from "")))
@@ -5894,7 +5886,10 @@ because discussions that are spread over several newsgroup tend to
 be fragmented and very difficult to follow.
 
 Also, some source/announcement newsgroups are not intended for discussion;
-responses here are directed to other newsgroups."))
+responses here are directed to other newsgroups.
+
+You may customize the variable `message-use-followup-to', if you
+want to get rid of this query permanently."))
                   (cons 'Newsgroups followup-to)
                 (cons 'Newsgroups newsgroups))))))
           (posted-to
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 063a1c8f376..89a4a739792 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -54,11 +54,12 @@ Valid types include `google', `dejanews', and `gmane'.")
 (defvar nnweb-type-definition
   '((google
      (article . ignore)
-     (id . "http://groups.google.com/groups?selm=%s&output=gplain")
+     (id . "http://groups.google.de/groups?selm=%s&output=gplain")
      (reference . identity)
      (map . nnweb-google-create-mapping)
      (search . nnweb-google-search)
-     (address . "http://groups.google.com/groups")
+     (address . "http://groups.google.de/groups")
+     (base    . "http://groups.google.de")
      (identifier . nnweb-google-identity))
     (dejanews ;; alias of google
      (article . ignore)
@@ -67,6 +68,7 @@ Valid types include `google', `dejanews', and `gmane'.")
      (map . nnweb-google-create-mapping)
      (search . nnweb-google-search)
      (address . "http://groups.google.com/groups")
+     (base    . "http://groups.google.com")
      (identifier . nnweb-google-identity))
     (gmane
      (article . nnweb-gmane-wash-article)
@@ -349,7 +351,7 @@ Valid types include `google', `dejanews', and `gmane'.")
             "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t)
       (setq mid (match-string 2)
             url (format
-                 "http://groups.google.com/groups?selm=%s&output=gplain" mid))
+                 (nnweb-definition 'id) mid))
       (narrow-to-region (search-forward ">" nil t)
                         (search-forward "</a>" nil t))
       (mm-url-remove-markup)
@@ -420,7 +422,7 @@ Valid types include `google', `dejanews', and `gmane'.")
                     (>= i nnweb-max-hits))
                 (setq more nil)
               ;; Yup, there are more articles
-              (setq more (concat "http://groups.google.com" (match-string 1)))
+              (setq more (concat (nnweb-definition 'base) (match-string 1)))
             (when more
               (erase-buffer)
               (mm-url-insert more))))
@@ -435,9 +437,9 @@ Valid types include `google', `dejanews', and `gmane'.")
     "?"
     (mm-url-encode-www-form-urlencoded
      `(("q" . ,search)
-       ("num". "100")
+       ("num" . "100")
        ("hq" . "")
-       ("hl" . "")
+       ("hl" . "en")
        ("lr" . "")
        ("safe" . "off")
        ("sites" . "groups")))))
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index bed4330d0c2..e2e5d251371 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, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@ -753,7 +753,10 @@ of replacing the current filters."
   "Disable all filters currently in effect in this buffer."
   (interactive)
   (setq ibuffer-filtering-qualifiers nil)
-  (ibuffer-update nil t))
+  (let ((buf (ibuffer-current-buffer)))
+    (ibuffer-update nil t)
+    (when buf
+      (ibuffer-jump-to-buffer (buffer-name buf)))))
 
 ;;;###autoload
 (defun ibuffer-pop-filter ()
@@ -762,7 +765,10 @@ of replacing the current filters."
   (when (null ibuffer-filtering-qualifiers)
     (error "No filters in effect"))
   (pop ibuffer-filtering-qualifiers)
-  (ibuffer-update nil t))
+  (let ((buf (ibuffer-current-buffer)))
+    (ibuffer-update nil t)
+    (when buf
+      (ibuffer-jump-to-buffer (buffer-name buf)))))
 
 (defun ibuffer-push-filter (qualifier)
   "Add QUALIFIER to `ibuffer-filtering-qualifiers'."
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 0f8cdbf5713..cc4e1766145 100644
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -1,6 +1,6 @@
 ;;; code-pages.el --- coding systems for assorted codepages  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
@@ -2440,6 +2440,7 @@ Return an updated `non-iso-charset-alist'."
   nil
   nil])
 
+;;;###autoload(autoload-coding-system 'windows-1250 '(require 'code-pages))
 (cp-make-coding-system
  windows-1250
  [?\€
@@ -2571,6 +2572,7 @@ Return an updated `non-iso-charset-alist'."
   ?\ţ
   ?\˙])
 
+;;;###autoload(autoload-coding-system 'windows-1253 '(require 'code-pages))
 (cp-make-coding-system
  windows-1253
  [?\€
@@ -2703,6 +2705,7 @@ Return an updated `non-iso-charset-alist'."
   nil]
  nil ?g) ;; Greek
 
+;;;###autoload(autoload-coding-system 'windows-1254 '(require 'code-pages))
 (cp-make-coding-system
  windows-1254
  [?\€
@@ -2835,6 +2838,7 @@ Return an updated `non-iso-charset-alist'."
   ?\ÿ])
 
 ;; yi_US
+;;;###autoload(autoload-coding-system 'windows-1255 '(require 'code-pages))
 (cp-make-coding-system
  windows-1255
  [?\€
@@ -2967,6 +2971,7 @@ Return an updated `non-iso-charset-alist'."
   nil]
  nil ?h) ;; Hebrew
 
+;;;###autoload(autoload-coding-system 'windows-1256 '(require 'code-pages))
 (cp-make-coding-system
  windows-1256
  [?\€
@@ -3099,6 +3104,7 @@ Return an updated `non-iso-charset-alist'."
   ?\ے]
  nil ?a) ;; Arabic
 
+;;;###autoload(autoload-coding-system 'windows-1257 '(require 'code-pages))
 (cp-make-coding-system
  windows-1257
  [?\€
@@ -3230,6 +3236,7 @@ Return an updated `non-iso-charset-alist'."
   ?\ž
   nil])
 
+;;;###autoload(autoload-coding-system 'windows-1258 '(require 'code-pages))
 (cp-make-coding-system
  windows-1258
  [?\€
@@ -3652,6 +3659,7 @@ Return an updated `non-iso-charset-alist'."
 ;;   ISO 8859-16 was primarily designed for single-byte encoding the Romanian
 ;;   language. The UTF-8 charset is the preferred and in today's MIME software
 ;;   more widely implemented encoding suitable for Romanian.
+;;;###autoload(autoload-coding-system 'iso-8859-16 '(require 'code-pages))
 (cp-make-coding-system
  iso-latin-10                           ; consistent with, e.g. Latin-1
  [nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
@@ -3823,6 +3831,7 @@ Return an updated `non-iso-charset-alist'."
  ?6)
 (define-coding-system-alias 'arabic-iso-8bit 'iso-8859-6)
 
+;;;###autoload(autoload-coding-system 'iso-8859-10 '(require 'code-pages))
 (cp-make-coding-system
  iso-latin-6
  [nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
@@ -3929,6 +3938,7 @@ Return an updated `non-iso-charset-alist'."
 (define-coding-system-alias 'latin-6 'iso-latin-6)
 
 ;; used by lt_LT, lv_LV, mi_NZ
+;;;###autoload(autoload-coding-system 'iso-8859-13 '(require 'code-pages))
 (cp-make-coding-system
  iso-latin-7
  [nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
@@ -4039,6 +4049,7 @@ Return an updated `non-iso-charset-alist'."
 ;; Fixme: check on the C1 characters which libiconv includes.  They
 ;; are reproduced below, but are probably wrong.  I can't find an
 ;; official definition of georgian-ps.
+;;;###autoload(autoload-coding-system 'georgian-ps '(require 'code-pages))
 (cp-make-coding-system
  georgian-ps                            ; used by glibc for ka_GE
  [?\€
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1c95e54dc5c..093969d5725 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -590,7 +590,7 @@ Do the same for the keys of the same name."
 (defmacro menu-bar-make-mm-toggle (fname doc help &optional props)
   "Make a menu-item for a global minor mode toggle.
 FNAME is the minor mode's name (variable and function).
-DOC is the text to use the menu entry.
+DOC is the text to use for the menu entry.
 HELP is the text to use for the tooltip.
 PROPS are additional properties."
   `'(menu-item ,doc ,fname
@@ -637,7 +637,8 @@ by \"Save Options\" in Custom buffers.")
     ;; These are set with menu-bar-make-mm-toggle, which does not
     ;; put on a customized-value property.
     (dolist (elt '(line-number-mode column-number-mode cua-mode show-paren-mode
-                   transient-mark-mode global-font-lock-mode))
+                   transient-mark-mode global-font-lock-mode
+                   blink-cursor-mode))
       (and (customize-mark-to-save elt)
            (setq need-save t)))
     ;; These are set with `customize-set-variable'.
@@ -959,6 +960,14 @@ by \"Save Options\" in Custom buffers.")
                         "Enter Lisp debugger when an error is signaled"))
 (define-key menu-bar-options-menu [debugger-separator]
   '("--"))
+
+(define-key menu-bar-options-menu [blink-cursor-mode]
+  (menu-bar-make-mm-toggle blink-cursor-mode
+                           "Blinking Cursor"
+                           "Whether the cursor blinks (Blink Cursor mode)"))
+(define-key menu-bar-options-menu [cursor-separator]
+  '("--"))
+
 (define-key menu-bar-options-menu [toggle-auto-compression]
   '(menu-item "Automatic File De/compression"
               auto-compression-mode
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 79a6b4b43be..457177d7c4c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -514,6 +514,10 @@ Faces `compilation-error-face', `compilation-warning-face',
       (and (cdr type) (match-end (cdr type)) compilation-info-face)
       compilation-error-face))
 
+;; Internal function for calculating the text properties of a directory
+;; change message.  The directory property is important, because it is
+;; the stack of nested enter-messages.  Relative filenames on the following
+;; lines are relative to the top of the stack.
 (defun compilation-directory-properties (idx leave)
   (if leave (setq leave (match-end leave)))
   ;; find previous stack, and push onto it, or if `leave' pop it
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 5fdf77c29d8..00da2e70dd7 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -880,8 +880,7 @@ sink to `user' in `gdb-stopping', that is fine."
   "An annotation handler for `post-prompt'.
 This begins the collection of output from the current command if that
 happens to be appropriate."
-  (if (not gdb-pending-triggers)
-      (progn
+  (unless gdb-pending-triggers
         (gdb-get-current-frame)
         (gdb-invalidate-frames)
         (gdb-invalidate-breakpoints)
@@ -897,7 +896,7 @@ happens to be appropriate."
             (setq gdb-var-changed t)    ; force update
             (dolist (var gdb-var-list)
               (setcar (nthcdr 5 var) nil))
-            (gdb-var-update)))))
+            (gdb-var-update))))
   (let ((sink gdb-output-sink))
     (cond
      ((eq sink 'user) t)
@@ -1211,14 +1210,13 @@ static char *magick[] = {
                                   (goto-line (string-to-number line))
                                   (gdb-put-breakpoint-icon (eq flag ?y) bptno)))
                             (gdb-enqueue-input
-                             (list (concat gdb-server-prefix "list "
+                             (list (concat "list "
                                            (match-string-no-properties 1) ":1\n")
                                    'ignore))
                             (gdb-enqueue-input
-                             (list (concat gdb-server-prefix "info source\n")
-                                   `(lambda ()
-                                      (gdb-get-location
-                                       ,bptno ,line ,flag)))))))))))
+                             (list "info source\n"
+                                   `(lambda () (gdb-get-location
+                                                ,bptno ,line ,flag)))))))))))
           (end-of-line)))))
   (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
 
@@ -2108,22 +2106,29 @@ buffers."
   "Find the directory containing the relevant source file.
 Put in buffer and place breakpoint icon."
   (goto-char (point-min))
-  (if (search-forward "Located in " nil t)
-      (if (looking-at "\\S-*")
-          (push (cons bptno (match-string 0)) gdb-location-list))
-    (gdb-resync)
-    (push (cons bptno "File not found") gdb-location-list)
-    (error "Cannot find source file for breakpoint location.
+  (catch 'file-not-found
+    (if (search-forward "Located in " nil t)
+        (if (looking-at "\\S-*")
+            (push (cons bptno (match-string 0)) gdb-location-list))
+      (gdb-resync)
+      (push (cons bptno "File not found") gdb-location-list)
+      (if (eq window-system 'x)
+          (x-popup-dialog
+           t '("Cannot find source file for breakpoint location.\n\
+Add directory to search path for source files using the GDB command, dir."
+               ("Ok" . nil)))
+        (message "Cannot find source file for breakpoint location.\n\
 Add directory to search path for source files using the GDB command, dir."))
-  (with-current-buffer
-      (find-file-noselect (match-string 0))
-    (save-current-buffer
-      (set (make-local-variable 'gud-minor-mode) 'gdba)
-      (set (make-local-variable 'tool-bar-map) gud-tool-bar-map))
-    ;; only want one breakpoint icon at each location
-    (save-excursion
-      (goto-line (string-to-number line))
-      (gdb-put-breakpoint-icon (eq flag ?y) bptno))))
+      (throw 'file-not-found nil))
+    (with-current-buffer
+        (find-file-noselect (match-string 0))
+      (save-current-buffer
+        (set (make-local-variable 'gud-minor-mode) 'gdba)
+        (set (make-local-variable 'tool-bar-map) gud-tool-bar-map))
+      ;; only want one breakpoint icon at each location
+      (save-excursion
+        (goto-line (string-to-number line))
+        (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))
 
 (add-hook 'find-file-hook 'gdb-find-file-hook)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index be9bded5382..0b40d53b756 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -733,10 +733,48 @@ that uses or sets the mark."
 
 ;; Counting lines, one way or another.
 
-(defun goto-line (arg)
-  "Goto line ARG, counting from line 1 at beginning of buffer."
-  (interactive "NGoto line: ")
-  (setq arg (prefix-numeric-value arg))
+(defun goto-line (arg &optional buffer)
+  "Goto line ARG, counting from line 1 at beginning of buffer.
+Normally, move point in the curren buffer.
+With just C-u as argument, move point in the most recently displayed
+other buffer, and switch to it.
+
+If there's a number in the buffer at point, it is the default for ARG."
+  (interactive
+   (if (and current-prefix-arg (not (consp current-prefix-arg)))
+       (list (prefix-numeric-value current-prefix-arg))
+     ;; Look for a default, a number in the buffer at point.
+     (let* ((default
+              (save-excursion
+                (skip-chars-backward "0-9")
+                (if (looking-at "[0-9]")
+                    (buffer-substring-no-properties
+                     (point)
+                     (progn (skip-chars-forward "0-9")
+                            (point))))))
+            ;; Decide if we're switching buffers.
+            (buffer
+             (if (consp current-prefix-arg)
+                 (other-buffer (current-buffer) t)))
+            (buffer-prompt
+             (if buffer
+                 (concat " in " (buffer-name buffer))
+               "")))
+       ;; Read the argument, offering that number (if any) as default.
+       (list (read-from-minibuffer (format (if default "Goto line%s (%s): "
+                                             "Goto line%s: ")
+                                           buffer-prompt
+                                           default)
+                                   nil nil t
+                                   'minibuffer-history
+                                   default)
+             buffer))))
+  ;; Switch to the desired buffer, one way or another.
+  (if buffer
+      (let ((window (get-buffer-window buffer)))
+        (if window (select-window window)
+          (switch-to-buffer-other-window buffer))))
+  ;; Move to the specified line number in that buffer.
   (save-restriction
     (widen)
     (goto-char 1)
diff --git a/lisp/startup.el b/lisp/startup.el
index b66ceb38ea1..b16cfdeb0c9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -290,6 +290,8 @@ from being initialized."
 
 (defvar normal-top-level-add-subdirs-inode-list nil)
 
+(defvar no-blinking-cursor nil)
+
 (defvar pure-space-overflow nil
   "Non-nil if building Emacs overflowed pure space.")
 
@@ -674,7 +676,8 @@ opening the first frame (e.g. open a connection to the server).")
     ;; does things.
     (while (and (not done) args)
       (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
-                         ("--debug-init") ("--iconic") ("--icon-type")))
+                         ("--debug-init") ("--iconic") ("--icon-type")
+                         ("--no-blinking-cursor")))
              (argi (pop args))
              (orig-argi argi)
              argval)
@@ -697,6 +700,7 @@ opening the first frame (e.g. open a connection to the server).")
          ((equal argi "-Q")
           (setq init-file-user nil
                 site-run-file nil
+                no-blinking-cursor t
                 emacs-quick-startup t)
           (push '(vertical-scroll-bars . nil) initial-frame-alist))
          ((member argi '("-q" "-no-init-file"))
@@ -712,6 +716,8 @@ opening the first frame (e.g. open a connection to the server).")
           (push '(visibility . icon) initial-frame-alist))
          ((member argi '("-icon-type" "-i" "-itype"))
           (push '(icon-type . t) default-frame-alist))
+         ((member argi '("-nbc" "-no-blinking-cursor"))
+          (setq no-blinking-cursor t))
          ;; Push the popped arg back on the list of arguments.
          (t
           (push argi args)
@@ -747,7 +753,7 @@ opening the first frame (e.g. open a connection to the server).")
   ;; you should also change the corresponding expression in the
   ;; defcustom in frame.el, or Custom will be badly confused.
   (unless (or noninteractive
-              emacs-quick-startup
+              no-blinking-cursor
               (eq system-type 'ms-dos)
               (not (memq initial-window-system '(x w32))))
     (blink-cursor-mode 1))
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 470f4d4a1bd..e478169c250 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -1,7 +1,7 @@
 ;;; texinfmt.el --- format Texinfo files into Info files
 
 ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
-;;               1994, 1995, 1996, 1997, 1998, 2000, 2001
+;;               1994, 1995, 1996, 1997, 1998, 2000, 2001, 2005
 ;;    Free Software Foundation, Inc.
 
 ;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
@@ -37,7 +37,7 @@
     (defmacro defcustom (var value doc &rest ignore)
       `(defvar ,var ,value ,doc)))
 
-(defvar texinfmt-version "2.40 of  6 Dec 2002")
+(defvar texinfmt-version "2.41 of  1 Mar 2005")
 
 (defun texinfmt-version (&optional here)
   "Show the version of texinfmt.el in the minibuffer.
@@ -486,7 +486,8 @@ if large.  You can use Info-split to do this manually."
    ;;     I don't know if this causes other problems.
    ;;     I suspect itemized lists don't get filled properly and a
    ;;     more precise fix is required.  Bob
-   "itemize\\|"
+   ;; commented out on 2005 Feb 28 by Bob
+   ;; "itemize\\|"
    "direntry\\|"
    "lisp\\|"
    "smalllisp\\|"
@@ -636,7 +637,7 @@ Do not append @refill to paragraphs containing @w{TEXT} or @*."
             (forward-char 1)
             (unless (re-search-backward "@c[ \t\n]\\|@comment[ \t\n]" line-beg t)
               (forward-char -1))
-            (unless (re-search-backward "@refill\\|@bye" line-beg t)
+            (unless (re-search-backward "@refill\\|^[ \t]*@" line-beg t)
               (insert "@refill")))
           (forward-line 1))))))